Index: head/sysutils/freefilesync/Makefile =================================================================== --- head/sysutils/freefilesync/Makefile (revision 410809) +++ head/sysutils/freefilesync/Makefile (revision 410810) @@ -1,34 +1,39 @@ # $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= compiler:c++11-lang dos2unix gmake pkgconfig zip +USES= compiler:c++14-lang dos2unix gmake pkgconfig zip USE_LDCONFIG= yes USE_WX= 3.0+ + +pre-patch: +# XXX Pretend USES=dos2unix supports DOS2UNIX_WRKSRC=${WRKDIR} + @${SED} 's/^+++ //; /^\.\./!d; s,^,${PATCH_WRKSRC}/,' \ + ${PATCHDIR}/patch-* | ${XARGS} ${REINPLACE_CMD} 's/ $$//' 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_file__access.cpp =================================================================== --- head/sysutils/freefilesync/files/patch-zen_file__access.cpp (nonexistent) +++ head/sysutils/freefilesync/files/patch-zen_file__access.cpp (revision 410810) @@ -0,0 +1,23 @@ +--- ../../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 ++#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 + } + + Property changes on: head/sysutils/freefilesync/files/patch-zen_file__access.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