Date: Wed, 8 Apr 2015 06:57:20 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383556 - head/Mk Message-ID: <201504080657.t386vKNT034265@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Apr 8 06:57:20 2015 New Revision: 383556 URL: https://svnweb.freebsd.org/changeset/ports/383556 Log: pkg sets the defaults owner and group already, no need to specify it via COPYTREE_* anymore (which also helps creating packages as non root) Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Apr 8 06:13:43 2015 (r383555) +++ head/Mk/bsd.port.mk Wed Apr 8 06:57:20 2015 (r383556) @@ -2177,27 +2177,14 @@ MAKE_ENV+= ${INSTALL_MACROS} SCRIPTS_ENV+= ${INSTALL_MACROS} # Macro for copying entire directory tree with correct permissions -.if ${UID} == 0 COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ 2>&1) && \ - ${CHOWN} -Rh ${BINOWN}:${BINGRP} $$1 && \ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \ ${FIND} -d $$0 $$2 -type f -exec chmod ${BINMODE} $$1/{} \;' -- COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ 2>&1) && \ - ${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} $$1 && \ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \ ${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' -- -.else -COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ - 2>&1) && \ - ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \ - ${FIND} -d $$0 $$2 -type f -exec chmod ${BINMODE} $$1/{} \;' -- -COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ - 2>&1) && \ - ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \ - ${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' -- -.endif # The user can override the NO_PACKAGE by specifying this from # the make command line
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504080657.t386vKNT034265>