Date: Thu, 7 Jul 2016 06:51:25 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418164 - in head/sysutils/freefilesync: . files Message-ID: <201607070651.u676pPGd012998@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Thu Jul 7 06:51:25 2016 New Revision: 418164 URL: https://svnweb.freebsd.org/changeset/ports/418164 Log: Update to 8.2 Modified: head/sysutils/freefilesync/Makefile head/sysutils/freefilesync/distinfo head/sysutils/freefilesync/files/patch-Makefile head/sysutils/freefilesync/files/patch-ui_version__check.cpp head/sysutils/freefilesync/pkg-plist Modified: head/sysutils/freefilesync/Makefile ============================================================================== --- head/sysutils/freefilesync/Makefile Thu Jul 7 05:11:59 2016 (r418163) +++ head/sysutils/freefilesync/Makefile Thu Jul 7 06:51:25 2016 (r418164) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= freefilesync -PORTVERSION= 7.9 +PORTVERSION= 8.2 CATEGORIES= sysutils -MASTER_SITES= http://www.freefilesync.org/download/2o5osm21vcjbobv/ \ +MASTER_SITES= http://www.freefilesync.org/download/ \ http://www.freefilesync.org/archive/ DISTNAME= FreeFileSync_${PORTVERSION}_Source @@ -12,6 +12,8 @@ COMMENT= Backup software to synchronize LICENSE= GPLv3 +BROKEN_FreeBSD_9= does not build on FreeBSD < 10.x + BUILD_DEPENDS= ${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libnotify.so:devel/libnotify Modified: head/sysutils/freefilesync/distinfo ============================================================================== --- head/sysutils/freefilesync/distinfo Thu Jul 7 05:11:59 2016 (r418163) +++ head/sysutils/freefilesync/distinfo Thu Jul 7 06:51:25 2016 (r418164) @@ -1,2 +1,3 @@ -SHA256 (FreeFileSync_7.9_Source.zip) = 68a80960b4ac5a0cef94e504a46ac97aa0c2a9be2e012a11b090621d1fd6dec1 -SIZE (FreeFileSync_7.9_Source.zip) = 2991263 +TIMESTAMP = 1467264390 +SHA256 (FreeFileSync_8.2_Source.zip) = 11ab0a8daf529ca43415d8a2cf91ad5f938fbf2674fdc9a82cb06a6e373479fc +SIZE (FreeFileSync_8.2_Source.zip) = 3012924 Modified: head/sysutils/freefilesync/files/patch-Makefile ============================================================================== --- head/sysutils/freefilesync/files/patch-Makefile Thu Jul 7 05:11:59 2016 (r418163) +++ head/sysutils/freefilesync/files/patch-Makefile Thu Jul 7 06:51:25 2016 (r418164) @@ -1,5 +1,5 @@ ---- Makefile.orig 2016-03-09 22:42:49.363968000 +0800 -+++ Makefile 2016-03-09 22:51:51.270475000 +0800 +--- Makefile.orig 2016-04-21 22:53:00.000000000 +0800 ++++ Makefile 2016-06-30 13:33:16.633078000 +0800 @@ -1,14 +1,14 @@ APPNAME = FreeFileSync -prefix = /usr @@ -11,14 +11,14 @@ 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 -+-DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -pthread ++-O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -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` -@@ -96,10 +96,10 @@ +@@ -97,10 +97,10 @@ ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp mkdir -p $(dir $@) @@ -31,7 +31,7 @@ clean: rm -rf ../Obj/FFS_GCC_Make_Release -@@ -108,16 +108,12 @@ +@@ -109,7 +109,7 @@ install: mkdir -p $(BINDIR) @@ -40,10 +40,8 @@ mkdir -p $(APPSHAREDIR) cp -R ../Build/Languages/ \ - ../Build/Help/ \ -- ../Build/Sync_Complete.wav \ +@@ -120,6 +120,3 @@ ../Build/Resources.zip \ - ../Build/styles.gtk_rc \ $(APPSHAREDIR) - mkdir -p $(DOCSHAREDIR) Modified: head/sysutils/freefilesync/files/patch-ui_version__check.cpp ============================================================================== --- head/sysutils/freefilesync/files/patch-ui_version__check.cpp Thu Jul 7 05:11:59 2016 (r418163) +++ head/sysutils/freefilesync/files/patch-ui_version__check.cpp Thu Jul 7 06:51:25 2016 (r418164) @@ -1,23 +1,22 @@ ---- ui/version_check.cpp.orig 2016-03-09 02:07:44 UTC -+++ ui/version_check.cpp -@@ -112,17 +112,10 @@ std::string geHttpPostParameters() //mus +--- 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; #elif defined ZEN_LINUX -- params += "&os_name=Linux"; -- assert(std::this_thread::get_id() == mainThreadId); -- +- params.emplace_back("os_name", "Linux"); ++ params.emplace_back("os_name", "FreeBSD"); + - const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo(); - assert(contains(distribInfo.Release, L'.')); - std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.'); //e.g. "15.04" - digits.resize(2); - //distribInfo.Id //e.g. "Ubuntu" -+ params += "&os_name=FreeBSD"; - +- - const int osvMajor = stringTo<int>(digits[0]); - const int osvMinor = stringTo<int>(digits[1]); + const int osvMajor = 0; + const int osvMinor = 0; #elif defined ZEN_MAC - params += "&os_name=Mac"; + params.emplace_back("os_name", "Mac"); Modified: head/sysutils/freefilesync/pkg-plist ============================================================================== --- head/sysutils/freefilesync/pkg-plist Thu Jul 7 05:11:59 2016 (r418163) +++ head/sysutils/freefilesync/pkg-plist Thu Jul 7 06:51:25 2016 (r418164) @@ -9,12 +9,15 @@ share/FreeFileSync/chinese_traditional.l 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 @@ -29,6 +32,7 @@ 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 @@ -76,8 +80,10 @@ share/FreeFileSync/images/setup-batch-jo share/FreeFileSync/images/sftp-login.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 @@ -86,16 +92,15 @@ share/FreeFileSync/japanese.lng share/FreeFileSync/korean.lng share/FreeFileSync/lithuanian.lng share/FreeFileSync/outdated/norwegian.lng -share/FreeFileSync/outdated/scottish_gaelic.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/styles.gtk_rc share/FreeFileSync/swedish.lng share/FreeFileSync/turkish.lng share/FreeFileSync/ukrainian.lng
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607070651.u676pPGd012998>