Index: head/sysutils/freefilesync/Makefile =================================================================== --- head/sysutils/freefilesync/Makefile (revision 410687) +++ head/sysutils/freefilesync/Makefile (revision 410688) @@ -1,30 +1,35 @@ # $FreeBSD$ PORTNAME= freefilesync PORTVERSION= 7.9 CATEGORIES= sysutils MASTER_SITES= http://www.freefilesync.org/download/2o5osm21vcjbobv/ \ http://www.freefilesync.org/archive/ DISTNAME= FreeFileSync_${PORTVERSION}_Source MAINTAINER= kevlo@FreeBSD.org COMMENT= Backup software to synchronize files and folders LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/zenxml/xml.h:${PORTSDIR}/textproc/zenxml LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libnotify.so:${PORTSDIR}/devel/libnotify WRKSRC= ${WRKDIR}/FreeFileSync/Source USES= dos2unix gmake pkgconfig zip USE_LDCONFIG= yes USE_WX= 3.0+ WX_UNICODE= yes 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|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \ + ${WRKDIR}/zen/tick_count.h .include Index: head/sysutils/freefilesync/files/patch-zen_tick__count.h =================================================================== --- head/sysutils/freefilesync/files/patch-zen_tick__count.h (revision 410687) +++ head/sysutils/freefilesync/files/patch-zen_tick__count.h (nonexistent) @@ -1,11 +0,0 @@ ---- ../../zen/tick_count.h.orig 2016-03-07 17:18:11.038986000 +0800 -+++ ../../zen/tick_count.h 2016-03-07 17:20:01.674266000 +0800 -@@ -128,7 +128,7 @@ - #elif defined ZEN_LINUX - //gettimeofday() seems fine but is deprecated - timespec now = {}; -- if (::clock_gettime(CLOCK_MONOTONIC_RAW, &now) != 0) //CLOCK_MONOTONIC measures time reliably across processors! -+ if (::clock_gettime(CLOCK_MONOTONIC, &now) != 0) //CLOCK_MONOTONIC measures time reliably across processors! - return TickVal(); - - #elif defined ZEN_MAC Property changes on: head/sysutils/freefilesync/files/patch-zen_tick__count.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-zen_file__access.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-zen_file__access.cpp (revision 410687) +++ head/sysutils/freefilesync/files/patch-zen_file__access.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ../../zen/file_access.cpp.orig 2016-03-07 22:01:11.201619000 +0800 -+++ ../../zen/file_access.cpp 2016-03-07 22:01:27.906454000 +0800 -@@ -25,7 +25,7 @@ - #endif - - #elif defined ZEN_LINUX -- #include //statfs -+ #include //statfs - #include //lutimes - #ifdef HAVE_SELINUX - #include Property changes on: head/sysutils/freefilesync/files/patch-zen_file__access.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_shell__execute.h =================================================================== --- head/sysutils/freefilesync/files/patch-zen_shell__execute.h (revision 410687) +++ head/sysutils/freefilesync/files/patch-zen_shell__execute.h (nonexistent) @@ -1,11 +0,0 @@ ---- ../../zen/shell_execute.h.orig 2016-03-08 10:01:14.347569000 +0800 -+++ ../../zen/shell_execute.h 2016-03-08 10:01:42.930783000 +0800 -@@ -120,7 +120,7 @@ - { - //Posix::system - execute a shell command - int rv = ::system(command.c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect... -- if (rv == -1 || WEXITSTATUS(rv) == 127) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" -+ if (rv == -1 ) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" - throw FileError(_("Incorrect command line:") + L"\n" + utfCvrtTo(command)); - } - else Property changes on: head/sysutils/freefilesync/files/patch-zen_shell__execute.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