Index: head/sysutils/freefilesync/Makefile =================================================================== --- head/sysutils/freefilesync/Makefile (revision 463382) +++ head/sysutils/freefilesync/Makefile (revision 463383) @@ -1,44 +1,43 @@ # Created by: Kevin Lo # $FreeBSD$ PORTNAME= freefilesync -PORTVERSION= 8.3 -PORTREVISION= 9 +DISTVERSION= 9.8 CATEGORIES= sysutils MASTER_SITES= https://www.freefilesync.org/download/ \ https://www.freefilesync.org/archive/ DISTNAME= FreeFileSync_${PORTVERSION}_Source MAINTAINER= ports@FreeBSD.org COMMENT= Backup software to synchronize files and folders LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKDIR}/License.txt -BROKEN= fails to build +IGNORE_FreeBSD_10= "FreeBSD 10.0 doesn't have _cxa_thread_atexit() implemeneted in libc, it has been implemented since 11 BUILD_DEPENDS= ${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libnotify.so:devel/libnotify FETCH_ARGS= --user-agent=firefox WRKSRC= ${WRKDIR}/FreeFileSync/Source -DOS2UNIX_WRKSRC=${WRKDIR} -DOS2UNIX_GLOB= *.cpp *.h USES= compiler:c++14-lang dos2unix gmake pkgconfig zip -USE_LDCONFIG= yes USE_WX= 3.0+ +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango +DOS2UNIX_WRKSRC= ${WRKDIR} +DOS2UNIX_GLOB= *.cpp *.h post-patch: @${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \ -e 's,g++,$${CXX},' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|||' \ ${WRKDIR}/zen/file_access.cpp @${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h @${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h - @${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \ - ${WRKDIR}/zen/tick_count.h .include Index: head/sysutils/freefilesync/distinfo =================================================================== --- head/sysutils/freefilesync/distinfo (revision 463382) +++ head/sysutils/freefilesync/distinfo (revision 463383) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469892304 -SHA256 (FreeFileSync_8.3_Source.zip) = bbde3eaa345d20a088746b14dc6e0721984d316a6f3dbbe54be646b84d60e7a6 -SIZE (FreeFileSync_8.3_Source.zip) = 3020292 +TIMESTAMP = 1519893735 +SHA256 (FreeFileSync_9.8_Source.zip) = 77a59586284a518d6df6c0cc934c3efa434f247acce70452ab9fe37e7747b96d +SIZE (FreeFileSync_9.8_Source.zip) = 2866149 Index: head/sysutils/freefilesync/files/patch-fs_native.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-fs_native.cpp (revision 463382) +++ head/sysutils/freefilesync/files/patch-fs_native.cpp (nonexistent) @@ -1,12 +0,0 @@ ---- fs/native.cpp.orig 2016-03-09 02:07:44 UTC -+++ fs/native.cpp -@@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand - - #elif defined ZEN_LINUX - //don't use potentially inefficient ::posix_fallocate! -- const int rv = ::fallocate(fh, //int fd, -- 0, //int mode, -+ const int rv = ::posix_fallocate(fh, //int fd, - 0, //off_t offset - streamSize); //off_t len - if (rv != 0) Property changes on: head/sysutils/freefilesync/files/patch-fs_native.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/freefilesync/files/patch-zen_scope__guard.h =================================================================== --- head/sysutils/freefilesync/files/patch-zen_scope__guard.h (revision 463382) +++ head/sysutils/freefilesync/files/patch-zen_scope__guard.h (nonexistent) @@ -1,11 +0,0 @@ ---- ../../zen/scope_guard.h.orig 2016-03-31 20:08:04 UTC -+++ ../../zen/scope_guard.h -@@ -14,7 +14,7 @@ - //best of Zen, Loki and C++17 - - --#ifdef ZEN_WIN -+#if defined(ZEN_WIN) || (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3700) - inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); } - - #elif defined ZEN_LINUX || defined ZEN_MAC Property changes on: head/sysutils/freefilesync/files/patch-zen_scope__guard.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/freefilesync/files/patch-Makefile =================================================================== --- head/sysutils/freefilesync/files/patch-Makefile (revision 463382) +++ head/sysutils/freefilesync/files/patch-Makefile (revision 463383) @@ -1,49 +1,48 @@ ---- Makefile.orig 2016-04-21 22:53:00.000000000 +0800 -+++ Makefile 2016-06-30 13:33:16.633078000 +0800 -@@ -1,14 +1,14 @@ +--- Makefile.orig 2018-02-06 16:36:07 UTC ++++ Makefile +@@ -1,13 +1,13 @@ APPNAME = FreeFileSync -prefix = /usr +prefix = $(PREFIX) BINDIR = $(DESTDIR)$(prefix)/bin SHAREDIR = $(DESTDIR)$(prefix)/share APPSHAREDIR = $(SHAREDIR)/$(APPNAME) DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) - CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \ ---O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread -+-O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -pthread +-CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread ++CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -pthread -LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread +LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread #Gtk - support recycler/icon loading/no button border/grid scrolling CXXFLAGS += `pkg-config --cflags gtk+-2.0` -@@ -97,10 +97,10 @@ +@@ -99,10 +99,10 @@ launchpad: FreeFileSync ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp mkdir -p $(dir $@) - g++ $(CXXFLAGS) -c $< -o $@ + ${CXX} $(CXXFLAGS) -c $< -o $@ FreeFileSync: $(OBJECT_LIST) - g++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) + ${CXX} -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: rm -rf ../Obj/FFS_GCC_Make_Release -@@ -109,7 +109,7 @@ +@@ -111,7 +111,7 @@ clean: install: mkdir -p $(BINDIR) - cp ../Build/$(APPNAME) $(BINDIR) + cp ../Build/$(APPNAME) $(BINDIR)/freefilesync mkdir -p $(APPSHAREDIR) cp -R ../Build/Languages/ \ -@@ -120,6 +120,3 @@ +@@ -122,6 +122,3 @@ install: ../Build/Resources.zip \ $(APPSHAREDIR) - mkdir -p $(DOCSHAREDIR) - cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog - gzip $(DOCSHAREDIR)/changelog Index: head/sysutils/freefilesync/files/patch-lib_dir__lock.h =================================================================== --- head/sysutils/freefilesync/files/patch-lib_dir__lock.h (nonexistent) +++ head/sysutils/freefilesync/files/patch-lib_dir__lock.h (revision 463383) @@ -0,0 +1,10 @@ +--- lib/dir_lock.h.orig 2018-03-02 05:46:44 UTC ++++ lib/dir_lock.h +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + + namespace fff Property changes on: head/sysutils/freefilesync/files/patch-lib_dir__lock.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/freefilesync/files/patch-ui_main__dlg.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-ui_main__dlg.cpp (nonexistent) +++ head/sysutils/freefilesync/files/patch-ui_main__dlg.cpp (revision 463383) @@ -0,0 +1,10 @@ +--- ui/main_dlg.cpp.orig 2018-03-02 05:46:44 UTC ++++ ui/main_dlg.cpp +@@ -28,6 +28,7 @@ + #include + #include "cfg_grid.h" + #include "version_check.h" ++#include "version_check_impl.h" + #include "gui_status_handler.h" + #include "small_dlgs.h" + #include "progress_indicator.h" Property changes on: head/sysutils/freefilesync/files/patch-ui_main__dlg.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/freefilesync/files/patch-ui_version__check.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-ui_version__check.cpp (revision 463382) +++ head/sysutils/freefilesync/files/patch-ui_version__check.cpp (revision 463383) @@ -1,22 +1,22 @@ ---- ui/version_check.cpp.orig 2016-06-30 13:33:44.614966000 +0800 -+++ ui/version_check.cpp 2016-06-30 13:36:17.540454000 +0800 -@@ -104,16 +104,10 @@ - const auto osvMinor = getOsVersion().minor; +--- ui/version_check.cpp.orig 2018-03-02 05:46:44 UTC ++++ ui/version_check.cpp +@@ -70,16 +70,10 @@ std::vector digits = split(distribInfo.Release, L'.'); //e.g. "15.04" +- std::vector digits = split(distribInfo.Release, L'.', SplitType::ALLOW_EMPTY); //e.g. "15.04" - digits.resize(2); - //distribInfo.Id //e.g. "Ubuntu" -- ++ params.emplace_back("os_name", "FreeBSD"); + - const int osvMajor = stringTo(digits[0]); - const int osvMinor = stringTo(digits[1]); + const int osvMajor = 0; + const int osvMinor = 0; - #elif defined ZEN_MAC - params.emplace_back("os_name", "Mac"); + params.emplace_back("os_version", numberTo(osvMajor) + "." + numberTo(osvMinor)); + Index: head/sysutils/freefilesync/files/patch-zen_file__io.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-zen_file__io.cpp (nonexistent) +++ head/sysutils/freefilesync/files/patch-zen_file__io.cpp (revision 463383) @@ -0,0 +1,12 @@ +--- ../../zen/file_io.cpp.orig 2018-03-01 11:10:56.764684000 +0200 ++++ ../../zen/file_io.cpp 2018-03-01 11:12:35.599889000 +0200 +@@ -305,8 +305,7 @@ + { + const FileHandle fh = getHandle(); + //don't use potentially inefficient ::posix_fallocate! +- const int rv = ::fallocate(fh, //int fd, +- 0, //int mode, ++ const int rv = ::posix_fallocate(fh, //int fd, + 0, //off_t offset + expectedSize); //off_t len + if (rv != 0) Property changes on: head/sysutils/freefilesync/files/patch-zen_file__io.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/freefilesync/files/patch-zen_thread.h =================================================================== --- head/sysutils/freefilesync/files/patch-zen_thread.h (nonexistent) +++ head/sysutils/freefilesync/files/patch-zen_thread.h (revision 463383) @@ -0,0 +1,21 @@ +--- ../../zen/thread.h.orig 2018-03-01 11:48:04.473377000 +0200 ++++ ../../zen/thread.h 2018-03-01 11:48:51.214192000 +0200 +@@ -12,8 +12,7 @@ + #include "scope_guard.h" + #include "type_traits.h" + #include "optional.h" +- #include +- ++#include + + namespace zen + { +@@ -407,7 +406,7 @@ + inline + void setCurrentThreadName(const char* threadName) + { +- ::prctl(PR_SET_NAME, threadName, 0, 0, 0); ++ pthread_set_name_np(pthread_self(), threadName); + + } + Property changes on: head/sysutils/freefilesync/files/patch-zen_thread.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/freefilesync/pkg-plist =================================================================== --- head/sysutils/freefilesync/pkg-plist (revision 463382) +++ head/sysutils/freefilesync/pkg-plist (revision 463383) @@ -1,106 +1,108 @@ bin/freefilesync share/FreeFileSync/FreeFileSync.hhc share/FreeFileSync/FreeFileSync.hhp share/FreeFileSync/Resources.zip share/FreeFileSync/arabic.lng share/FreeFileSync/bulgarian.lng share/FreeFileSync/chinese_simple.lng share/FreeFileSync/chinese_traditional.lng share/FreeFileSync/croatian.lng share/FreeFileSync/czech.lng share/FreeFileSync/danish.lng share/FreeFileSync/ding.wav share/FreeFileSync/dutch.lng share/FreeFileSync/english_uk.lng share/FreeFileSync/finnish.lng share/FreeFileSync/french.lng share/FreeFileSync/german.lng share/FreeFileSync/gong.wav share/FreeFileSync/greek.lng share/FreeFileSync/harp.wav share/FreeFileSync/hebrew.lng share/FreeFileSync/hindi.lng share/FreeFileSync/html/base.css share/FreeFileSync/html/command-line.html share/FreeFileSync/html/comparison-settings.html share/FreeFileSync/html/daylight-saving-time.html share/FreeFileSync/html/exclude-items.html share/FreeFileSync/html/expert-settings.html share/FreeFileSync/html/external-applications.html share/FreeFileSync/html/freefilesync.html share/FreeFileSync/html/macros.html share/FreeFileSync/html/realtimesync.html share/FreeFileSync/html/run-as-service.html share/FreeFileSync/html/schedule-a-batch-job.html share/FreeFileSync/html/synchronization-settings.html share/FreeFileSync/html/synchronize-with-sftp.html share/FreeFileSync/html/tips-and-tricks.html share/FreeFileSync/html/variable-drive-letters.html share/FreeFileSync/html/versioning.html share/FreeFileSync/html/volume-shadow-copy.html share/FreeFileSync/hungarian.lng share/FreeFileSync/images/add-folder-pair.png share/FreeFileSync/images/automator-file-dropped.png share/FreeFileSync/images/basic-step-choose-folders.png share/FreeFileSync/images/basic-step-compare.png share/FreeFileSync/images/basic-step-start-sync.png share/FreeFileSync/images/basic-step-sync-config.png share/FreeFileSync/images/calendar-job-added.png share/FreeFileSync/images/com-settings-context.png +share/FreeFileSync/images/command-line-syntax.png share/FreeFileSync/images/comparison-settings.png share/FreeFileSync/images/comparison-variant-double-click.png share/FreeFileSync/images/config-double-click.png share/FreeFileSync/images/config-multiple-selection.png share/FreeFileSync/images/copy-alternative-path.png share/FreeFileSync/images/dialog-drag-move.png share/FreeFileSync/images/direct-synchronize.png -share/FreeFileSync/images/donate.png share/FreeFileSync/images/explorer-context.png share/FreeFileSync/images/filter-context.png +share/FreeFileSync/images/filter-zero-file-size.png share/FreeFileSync/images/filter.png share/FreeFileSync/images/freefilesync-logo.png share/FreeFileSync/images/gnome-scheduler.png share/FreeFileSync/images/ignore-time-shift.png share/FreeFileSync/images/launch-automator.png share/FreeFileSync/images/main-window.png share/FreeFileSync/images/new-calendar-alarm.png share/FreeFileSync/images/open-finder-items.png share/FreeFileSync/images/path-by-volume-name.png share/FreeFileSync/images/realtimesync-create-shortcut.png share/FreeFileSync/images/realtimesync-logo.png share/FreeFileSync/images/realtimesync-main-window.png share/FreeFileSync/images/realtimesync-monitor-usb.png share/FreeFileSync/images/realtimesync-schedule.png share/FreeFileSync/images/realtimesync-shortcut-properties.png share/FreeFileSync/images/remove-drop-down-path.png share/FreeFileSync/images/remove-local-settings.png share/FreeFileSync/images/save-automator.png share/FreeFileSync/images/select-time-span.png share/FreeFileSync/images/setup-batch-job.png +share/FreeFileSync/images/sftp-cloud-picker.png share/FreeFileSync/images/sftp-login.png +share/FreeFileSync/images/sftp-performance.png share/FreeFileSync/images/show-thumbnails.png share/FreeFileSync/images/sync-settings-context.png share/FreeFileSync/images/synchronization-settings.png share/FreeFileSync/images/synchronization-variant-double-click.png share/FreeFileSync/images/two-folder-drop.png share/FreeFileSync/images/versioning.png share/FreeFileSync/images/view-filter-default.png share/FreeFileSync/images/windows-scheduler.png share/FreeFileSync/images/xp-scheduler.png share/FreeFileSync/italian.lng share/FreeFileSync/japanese.lng share/FreeFileSync/korean.lng share/FreeFileSync/lithuanian.lng -share/FreeFileSync/outdated/norwegian.lng +share/FreeFileSync/norwegian.lng share/FreeFileSync/polish.lng share/FreeFileSync/portuguese.lng share/FreeFileSync/portuguese_br.lng share/FreeFileSync/romanian.lng share/FreeFileSync/russian.lng -share/FreeFileSync/serbian.lng share/FreeFileSync/slovak.lng share/FreeFileSync/slovenian.lng share/FreeFileSync/spanish.lng share/FreeFileSync/swedish.lng share/FreeFileSync/turkish.lng share/FreeFileSync/ukrainian.lng