View | Details | Raw Unified | Return to bug 226276
Collapse All | Expand All

(-)freefilesync/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1469892304
1
TIMESTAMP = 1519893735
2
SHA256 (FreeFileSync_8.3_Source.zip) = bbde3eaa345d20a088746b14dc6e0721984d316a6f3dbbe54be646b84d60e7a6
2
SHA256 (FreeFileSync_9.8_Source.zip) = 77a59586284a518d6df6c0cc934c3efa434f247acce70452ab9fe37e7747b96d
3
SIZE (FreeFileSync_8.3_Source.zip) = 3020292
3
SIZE (FreeFileSync_9.8_Source.zip) = 2866149
(-)freefilesync/files/patch-fs_native.cpp (-12 lines)
Lines 1-12 Link Here
1
--- fs/native.cpp.orig	2016-03-09 02:07:44 UTC
2
+++ fs/native.cpp
3
@@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand
4
 
5
 #elif defined ZEN_LINUX
6
     //don't use potentially inefficient ::posix_fallocate!
7
-    const int rv = ::fallocate(fh,          //int fd,
8
-                               0,           //int mode,
9
+    const int rv = ::posix_fallocate(fh,          //int fd,
10
                                0,           //off_t offset
11
                                streamSize); //off_t len
12
     if (rv != 0)
(-)freefilesync/files/patch-lib_dir__lock.h (+10 lines)
Line 0 Link Here
1
--- lib/dir_lock.h.orig	2018-03-01 11:58:36.149588000 +0200
2
+++ lib/dir_lock.h	2018-03-01 11:59:55.216303000 +0200
3
@@ -11,6 +11,7 @@
4
 #include <chrono>
5
 #include <functional>
6
 #include <zen/file_error.h>
7
+#include <zen/warn_static.h>
8
 
9
 
10
 namespace fff
(-)freefilesync/files/patch-Makefile (-9 / +8 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2016-04-21 22:53:00.000000000 +0800
1
--- Makefile.orig	2018-03-01 10:59:10.564548000 +0200
2
+++ Makefile	2016-06-30 13:33:16.633078000 +0800
2
+++ Makefile	2018-03-01 11:03:31.206781000 +0200
3
@@ -1,14 +1,14 @@
3
@@ -1,13 +1,13 @@
4
 APPNAME     = FreeFileSync
4
 APPNAME     = FreeFileSync
5
-prefix      = /usr
5
-prefix      = /usr
6
+prefix      = $(PREFIX)
6
+prefix      = $(PREFIX)
Lines 9-24 Link Here
9
 APPSHAREDIR = $(SHAREDIR)/$(APPNAME)
9
 APPSHAREDIR = $(SHAREDIR)/$(APPNAME)
10
 DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME)
10
 DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME)
11
 
11
 
12
 CXXFLAGS  = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \
12
-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
13
--O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread
13
+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
14
+-O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -pthread
15
 
14
 
16
-LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
15
-LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
17
+LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
16
+LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
18
 
17
 
19
 #Gtk - support recycler/icon loading/no button border/grid scrolling
18
 #Gtk - support recycler/icon loading/no button border/grid scrolling
20
 CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
19
 CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
21
@@ -97,10 +97,10 @@
20
@@ -99,10 +99,10 @@
22
 
21
 
23
 ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp
22
 ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp
24
 	mkdir -p $(dir $@)
23
 	mkdir -p $(dir $@)
Lines 31-37 Link Here
31
 
30
 
32
 clean:
31
 clean:
33
 	rm -rf ../Obj/FFS_GCC_Make_Release
32
 	rm -rf ../Obj/FFS_GCC_Make_Release
34
@@ -109,7 +109,7 @@
33
@@ -111,7 +111,7 @@
35
 
34
 
36
 install:
35
 install:
37
 	mkdir -p $(BINDIR)
36
 	mkdir -p $(BINDIR)
Lines 40-46 Link Here
40
 
39
 
41
 	mkdir -p $(APPSHAREDIR)
40
 	mkdir -p $(APPSHAREDIR)
42
 	cp -R ../Build/Languages/ \
41
 	cp -R ../Build/Languages/ \
43
@@ -120,6 +120,3 @@
42
@@ -122,6 +122,3 @@
44
 	../Build/Resources.zip \
43
 	../Build/Resources.zip \
45
 	$(APPSHAREDIR)
44
 	$(APPSHAREDIR)
46
 
45
 
(-)freefilesync/files/patch-ui_main__dlg.cpp (+10 lines)
Line 0 Link Here
1
--- ui/main_dlg.cpp.orig	2018-03-01 12:39:08.892347000 +0200
2
+++ ui/main_dlg.cpp	2018-03-01 12:39:32.048027000 +0200
3
@@ -28,6 +28,7 @@
4
 #include <wx+/image_resources.h>
5
 #include "cfg_grid.h"
6
 #include "version_check.h"
7
+#include "version_check_impl.h"
8
 #include "gui_status_handler.h"
9
 #include "small_dlgs.h"
10
 #include "progress_indicator.h"
(-)freefilesync/files/patch-ui_version__check.cpp (-8 / +8 lines)
Lines 1-15 Link Here
1
--- ui/version_check.cpp.orig	2016-06-30 13:33:44.614966000 +0800
1
--- ui/version_check.cpp.orig	2018-03-01 11:17:27.107179000 +0200
2
+++ ui/version_check.cpp	2016-06-30 13:36:17.540454000 +0800
2
+++ ui/version_check.cpp	2018-03-01 11:19:43.918031000 +0200
3
@@ -104,16 +104,10 @@
3
@@ -70,16 +70,10 @@
4
     const auto osvMinor = getOsVersion().minor;
4
     params.emplace_back("installation_type", isPortableVersion() ? "Portable" : "Local");
5
 
5
 
6
 
6
 #elif defined ZEN_LINUX
7
-    params.emplace_back("os_name", "Linux");
7
-    params.emplace_back("os_name", "Linux");
8
+    params.emplace_back("os_name", "FreeBSD");
8
+    params.emplace_back("os_name", "FreeBSD");
9
 
9
 
10
-    const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo();
10
-    const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo();
11
-    assert(contains(distribInfo.Release, L'.'));
11
-    assert(contains(distribInfo.Release, L'.'));
12
-    std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.'); //e.g. "15.04"
12
-    std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.', SplitType::ALLOW_EMPTY); //e.g. "15.04"
13
-    digits.resize(2);
13
-    digits.resize(2);
14
-    //distribInfo.Id //e.g. "Ubuntu"
14
-    //distribInfo.Id //e.g. "Ubuntu"
15
-
15
-
Lines 18-22 Link Here
18
+    const int osvMajor = 0;
18
+    const int osvMajor = 0;
19
+    const int osvMinor = 0;
19
+    const int osvMinor = 0;
20
 
20
 
21
 #elif defined ZEN_MAC
21
     params.emplace_back("os_version", numberTo<std::string>(osvMajor) + "." + numberTo<std::string>(osvMinor));
22
     params.emplace_back("os_name", "Mac");
22
 
(-)freefilesync/files/patch-zen_file__io.cpp (+12 lines)
Line 0 Link Here
1
--- ../../zen/file_io.cpp.orig	2018-03-01 11:10:56.764684000 +0200
2
+++ ../../zen/file_io.cpp	2018-03-01 11:12:35.599889000 +0200
3
@@ -305,8 +305,7 @@
4
 {
5
     const FileHandle fh = getHandle();
6
     //don't use potentially inefficient ::posix_fallocate!
7
-    const int rv = ::fallocate(fh,            //int fd,
8
-                               0,             //int mode,
9
+    const int rv = ::posix_fallocate(fh,            //int fd,
10
                                0,             //off_t offset
11
                                expectedSize); //off_t len
12
     if (rv != 0)
(-)freefilesync/files/patch-zen_scope__guard.h (-11 lines)
Lines 1-11 Link Here
1
--- ../../zen/scope_guard.h.orig	2016-03-31 20:08:04 UTC
2
+++ ../../zen/scope_guard.h
3
@@ -14,7 +14,7 @@
4
 //best of Zen, Loki and C++17
5
 
6
 
7
-#ifdef ZEN_WIN
8
+#if defined(ZEN_WIN) || (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3700)
9
 inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); }
10
 
11
 #elif defined ZEN_LINUX || defined ZEN_MAC
(-)freefilesync/files/patch-zen_thread.h (+21 lines)
Line 0 Link Here
1
--- ../../zen/thread.h.orig	2018-03-01 11:48:04.473377000 +0200
2
+++ ../../zen/thread.h	2018-03-01 11:48:51.214192000 +0200
3
@@ -12,8 +12,7 @@
4
 #include "scope_guard.h"
5
 #include "type_traits.h"
6
 #include "optional.h"
7
-    #include <sys/prctl.h>
8
-
9
+#include <pthread_np.h>
10
 
11
 namespace zen
12
 {
13
@@ -407,7 +406,7 @@
14
 inline
15
 void setCurrentThreadName(const char* threadName)
16
 {
17
-    ::prctl(PR_SET_NAME, threadName, 0, 0, 0);
18
+    pthread_set_name_np(pthread_self(), threadName);
19
 
20
 }
21
 
(-)freefilesync/Makefile (-5 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/sysutils/freefilesync/Makefile 459315 2018-01-18 04:11:02Z jbeich $
2
# $FreeBSD: head/sysutils/freefilesync/Makefile 459315 2018-01-18 04:11:02Z jbeich $
3
3
4
PORTNAME=	freefilesync
4
PORTNAME=	freefilesync
5
PORTVERSION=	8.3
5
PORTVERSION=	9.8
6
PORTREVISION=	9
7
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
8
MASTER_SITES=	https://www.freefilesync.org/download/ \
7
MASTER_SITES=	https://www.freefilesync.org/download/ \
9
		https://www.freefilesync.org/archive/
8
		https://www.freefilesync.org/archive/
Lines 13-19 Link Here
13
COMMENT=	Backup software to synchronize files and folders
12
COMMENT=	Backup software to synchronize files and folders
14
13
15
LICENSE=	GPLv3
14
LICENSE=	GPLv3
16
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKDIR}/License.txt
17
16
18
BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml
17
BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml
19
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
18
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
Lines 36-42 Link Here
36
		${WRKDIR}/zen/file_access.cpp
35
		${WRKDIR}/zen/file_access.cpp
37
	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h
36
	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h
38
	@${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h
37
	@${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h
39
	@${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \
40
		${WRKDIR}/zen/tick_count.h
41
38
42
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)freefilesync/pkg-plist (-3 / +5 lines)
Lines 47-52 Link Here
47
share/FreeFileSync/images/basic-step-sync-config.png
47
share/FreeFileSync/images/basic-step-sync-config.png
48
share/FreeFileSync/images/calendar-job-added.png
48
share/FreeFileSync/images/calendar-job-added.png
49
share/FreeFileSync/images/com-settings-context.png
49
share/FreeFileSync/images/com-settings-context.png
50
share/FreeFileSync/images/command-line-syntax.png
50
share/FreeFileSync/images/comparison-settings.png
51
share/FreeFileSync/images/comparison-settings.png
51
share/FreeFileSync/images/comparison-variant-double-click.png
52
share/FreeFileSync/images/comparison-variant-double-click.png
52
share/FreeFileSync/images/config-double-click.png
53
share/FreeFileSync/images/config-double-click.png
Lines 54-62 Link Here
54
share/FreeFileSync/images/copy-alternative-path.png
55
share/FreeFileSync/images/copy-alternative-path.png
55
share/FreeFileSync/images/dialog-drag-move.png
56
share/FreeFileSync/images/dialog-drag-move.png
56
share/FreeFileSync/images/direct-synchronize.png
57
share/FreeFileSync/images/direct-synchronize.png
57
share/FreeFileSync/images/donate.png
58
share/FreeFileSync/images/explorer-context.png
58
share/FreeFileSync/images/explorer-context.png
59
share/FreeFileSync/images/filter-context.png
59
share/FreeFileSync/images/filter-context.png
60
share/FreeFileSync/images/filter-zero-file-size.png
60
share/FreeFileSync/images/filter.png
61
share/FreeFileSync/images/filter.png
61
share/FreeFileSync/images/freefilesync-logo.png
62
share/FreeFileSync/images/freefilesync-logo.png
62
share/FreeFileSync/images/gnome-scheduler.png
63
share/FreeFileSync/images/gnome-scheduler.png
Lines 77-83 Link Here
77
share/FreeFileSync/images/save-automator.png
78
share/FreeFileSync/images/save-automator.png
78
share/FreeFileSync/images/select-time-span.png
79
share/FreeFileSync/images/select-time-span.png
79
share/FreeFileSync/images/setup-batch-job.png
80
share/FreeFileSync/images/setup-batch-job.png
81
share/FreeFileSync/images/sftp-cloud-picker.png
80
share/FreeFileSync/images/sftp-login.png
82
share/FreeFileSync/images/sftp-login.png
83
share/FreeFileSync/images/sftp-performance.png
81
share/FreeFileSync/images/show-thumbnails.png
84
share/FreeFileSync/images/show-thumbnails.png
82
share/FreeFileSync/images/sync-settings-context.png
85
share/FreeFileSync/images/sync-settings-context.png
83
share/FreeFileSync/images/synchronization-settings.png
86
share/FreeFileSync/images/synchronization-settings.png
Lines 91-103 Link Here
91
share/FreeFileSync/japanese.lng
94
share/FreeFileSync/japanese.lng
92
share/FreeFileSync/korean.lng
95
share/FreeFileSync/korean.lng
93
share/FreeFileSync/lithuanian.lng
96
share/FreeFileSync/lithuanian.lng
94
share/FreeFileSync/outdated/norwegian.lng
97
share/FreeFileSync/norwegian.lng
95
share/FreeFileSync/polish.lng
98
share/FreeFileSync/polish.lng
96
share/FreeFileSync/portuguese.lng
99
share/FreeFileSync/portuguese.lng
97
share/FreeFileSync/portuguese_br.lng
100
share/FreeFileSync/portuguese_br.lng
98
share/FreeFileSync/romanian.lng
101
share/FreeFileSync/romanian.lng
99
share/FreeFileSync/russian.lng
102
share/FreeFileSync/russian.lng
100
share/FreeFileSync/serbian.lng
101
share/FreeFileSync/slovak.lng
103
share/FreeFileSync/slovak.lng
102
share/FreeFileSync/slovenian.lng
104
share/FreeFileSync/slovenian.lng
103
share/FreeFileSync/spanish.lng
105
share/FreeFileSync/spanish.lng

Return to bug 226276