From owner-svn-ports-all@freebsd.org Fri Mar 11 11:26:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53F41ACCA8D; Fri, 11 Mar 2016 11:26:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0713EAA0; Fri, 11 Mar 2016 11:26:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BBQqbb083309; Fri, 11 Mar 2016 11:26:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BBQqgO083308; Fri, 11 Mar 2016 11:26:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603111126.u2BBQqgO083308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 11 Mar 2016 11:26:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410824 - head/sysutils/freefilesync/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 11:26:53 -0000 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 -+#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 }