Attachment #167993 for bug #207879




LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
		libnotify.so:${PORTSDIR}/devel/libnotify

NO_WRKSUBDIR=	yes # for USES=dos2unix
BUILD_WRKSRC=	${WRKSRC}/FreeFileSync/Source

USES=		compiler:c++14-lang dos2unix gmake pkgconfig zip
USE_LDCONFIG=	yes


post-patch:
	@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \
		-e 's,g++,$${CXX},' ${BUILD_WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's|<sys/vfs.h>|<sys/mount.h>|' \
		${WRKSRC}/zen/file_access.cpp
	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKSRC}/zen/shell_execute.h
	@${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \
		${WRKSRC}/zen/tick_count.h

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)sysutils/freefilesync/files/patch-Makefile (-2 / +2 lines)
1	--- Makefile.orig 2016-03-09 22:42:49.363968000 +0800	1	--- FreeFileSync/Source/Makefile.orig 2015-11-02 10:29:48 UTC
2	+++ Makefile 2016-03-09 22:51:51.270475000 +0800	2	+++ FreeFileSync/Source/Makefile
3	@@ -1,14 +1,14 @@	3	@@ -1,14 +1,14 @@
4	APPNAME = FreeFileSync	4	APPNAME = FreeFileSync
5	-prefix = /usr	5	-prefix = /usr

Lines 1-5 Link Here

(-)sysutils/freefilesync/files/patch-fs_native.cpp (-2 / +2 lines)
1	--- fs/native.cpp.orig 2016-03-09 02:07:44 UTC	1	--- FreeFileSync/Source/fs/native.cpp.orig 2015-11-05 09:15:34 UTC
2	+++ fs/native.cpp	2	+++ FreeFileSync/Source/fs/native.cpp
3	@@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand	3	@@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand
4		4
5	#elif defined ZEN_LINUX	5	#elif defined ZEN_LINUX

Lines 1-5 Link Here

(-)sysutils/freefilesync/files/patch-ui_version__check.cpp (-2 / +2 lines)
1	--- ui/version_check.cpp.orig 2016-03-09 02:07:44 UTC	1	--- FreeFileSync/Source/ui/version_check.cpp.orig 2016-02-01 22:59:14 UTC
2	+++ ui/version_check.cpp	2	+++ FreeFileSync/Source/ui/version_check.cpp
3	@@ -112,17 +112,10 @@ std::string geHttpPostParameters() //mus	3	@@ -112,17 +112,10 @@ std::string geHttpPostParameters() //mus
4	const auto osvMinor = getOsVersion().minor;	4	const auto osvMinor = getOsVersion().minor;
5		5




--- zen/file_access.cpp.orig	2016-01-11 12:13:10 UTC
+++ zen/file_access.cpp
@@ -877,6 +877,11 @@ void setFileTimeRaw(const Zstring& fileP
     //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/
     newTimes[1] = modTime; //modification time
 
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#if __FreeBSD_version < 1002506 || (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056)
+    throw ErrorLinuxFallbackToUtimes(L"");
+#else
     //=> using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"!
     if (procSl == ProcSymlink::FOLLOW)
     {
@@ -898,6 +903,8 @@ void setFileTimeRaw(const Zstring& fileP
         if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0)
             THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(filePath)), L"utimensat");
     }
+#endif
+#endif
 }
 
 

Return to bug 207879

Lines 16-22 BUILD_DEPENDS= ${LOCALBASE}/include/zenxml/xml.h:${PORTSDIR}/textproc/zenxml Link Here

(-)sysutils/freefilesync/Makefile (-5 / +6 lines)
16	LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \	16	LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
17	libnotify.so:${PORTSDIR}/devel/libnotify	17	libnotify.so:${PORTSDIR}/devel/libnotify
18		18
19	WRKSRC= ${WRKDIR}/FreeFileSync/Source	19	NO_WRKSUBDIR= yes # for USES=dos2unix
		20	BUILD_WRKSRC= ${WRKSRC}/FreeFileSync/Source
20		21
21	USES= compiler:c++14-lang dos2unix gmake pkgconfig zip	22	USES= compiler:c++14-lang dos2unix gmake pkgconfig zip
22	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
Lines 24-34 USE_WX= 3.0+ Link Here
24		25
25	post-patch:	26	post-patch:
26	@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \	27	@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \
27	-e 's,g++,$${CXX},' ${WRKSRC}/Makefile	28	-e 's,g++,$${CXX},' ${BUILD_WRKSRC}/Makefile
28	@${REINPLACE_CMD} -e 's\|<sys/vfs.h>\|<sys/mount.h>\|' \	29	@${REINPLACE_CMD} -e 's\|<sys/vfs.h>\|<sys/mount.h>\|' \
29	${WRKDIR}/zen/file_access.cpp	30	${WRKSRC}/zen/file_access.cpp
30	@${REINPLACE_CMD} -e 's\|WEXITSTATUS\|\|' ${WRKDIR}/zen/shell_execute.h	31	@${REINPLACE_CMD} -e 's\|WEXITSTATUS\|\|' ${WRKSRC}/zen/shell_execute.h
31	@${REINPLACE_CMD} -e 's\|CLOCK_MONOTONIC_RAW\|CLOCK_MONOTONIC\|' \	32	@${REINPLACE_CMD} -e 's\|CLOCK_MONOTONIC_RAW\|CLOCK_MONOTONIC\|' \
32	${WRKDIR}/zen/tick_count.h	33	${WRKSRC}/zen/tick_count.h
33		34
34	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Added Link Here

(-)sysutils/freefilesync/files/patch-zen_file__access.cpp (+23 lines)
1	--- zen/file_access.cpp.orig 2016-01-11 12:13:10 UTC
2	+++ zen/file_access.cpp
3	@@ -877,6 +877,11 @@ void setFileTimeRaw(const Zstring& fileP
4	//https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/
5	newTimes[1] = modTime; //modification time
6
7	+#if defined(__FreeBSD__)
8	+#include <osreldate.h>
9	+#if __FreeBSD_version < 1002506 \|\| (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056)
10	+ throw ErrorLinuxFallbackToUtimes(L"");
11	+#else
12	//=> using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"!
13	if (procSl == ProcSymlink::FOLLOW)
14	{
15	@@ -898,6 +903,8 @@ void setFileTimeRaw(const Zstring& fileP
16	if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0)
17	THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(filePath)), L"utimensat");
18	}
19	+#endif
20	+#endif
21	}
22
23