Date: Fri, 11 Mar 2016 11:26:52 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410824 - head/sysutils/freefilesync/files Message-ID: <201603111126.u2BBQqgO083308@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Mar 11 11:26:51 2016 New Revision: 410824 URL: https://svnweb.freebsd.org/changeset/ports/410824 Log: sysutils/freefilesync: fixup runtime for DragonFly No PORTREVISION bump as DragonFly build is still broken. PR: 207879 Modified: head/sysutils/freefilesync/files/patch-zen_file__access.cpp (contents, props changed) Modified: head/sysutils/freefilesync/files/patch-zen_file__access.cpp ============================================================================== --- head/sysutils/freefilesync/files/patch-zen_file__access.cpp Fri Mar 11 11:02:51 2016 (r410823) +++ head/sysutils/freefilesync/files/patch-zen_file__access.cpp Fri Mar 11 11:26:51 2016 (r410824) @@ -1,23 +1,26 @@ --- ../../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 +@@ -877,6 +877,15 @@ void setFileTimeRaw(const Zstring& fileP //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/ newTimes[1] = modTime; //modification time +#if defined(__FreeBSD__) ++// only defines __FreeBSD_version +#include <osreldate.h> -+#if __FreeBSD_version < 1002506 || (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056) ++#endif ++ ++#if (defined(__FreeBSD__) && (__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 +@@ -898,6 +907,7 @@ 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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603111126.u2BBQqgO083308>