From owner-svn-ports-all@freebsd.org Thu Mar 16 13:10:02 2017 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 BB7EBD0C937; Thu, 16 Mar 2017 13:10:02 +0000 (UTC) (envelope-from mat@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 8B0841F15; Thu, 16 Mar 2017 13:10:02 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2GDA137045209; Thu, 16 Mar 2017 13:10:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2GDA1Eq045208; Thu, 16 Mar 2017 13:10:01 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201703161310.v2GDA1Eq045208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 16 Mar 2017 13:10:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436276 - head/Mk 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.23 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: Thu, 16 Mar 2017 13:10:02 -0000 Author: mat Date: Thu Mar 16 13:10:01 2017 New Revision: 436276 URL: https://svnweb.freebsd.org/changeset/ports/436276 Log: COPYTREE_SHARE should also be using _SHAREMODE and not SHAREMODE. SHAREMODE defaults to 444, and gives us endless grief because one cannot modify a file that is not writable. So use _SHAREMODE that is 644, so that we can avoid all those CHMOD +w in so many Makefiles. Exp-run: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D7623 Modified: head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Mar 16 13:04:32 2017 (r436275) +++ head/Mk/bsd.port.mk Thu Mar 16 13:10:01 2017 (r436276) @@ -2075,7 +2075,7 @@ _SHAREMODE?= 0644 # A few aliases for *-install targets INSTALL_PROGRAM= ${INSTALL} ${COPY} ${STRIP} -m ${BINMODE} INSTALL_KLD= ${INSTALL} ${COPY} -m ${BINMODE} -INSTALL_LIB= ${INSTALL} ${COPY} ${STRIP} -m ${SHAREMODE} +INSTALL_LIB= ${INSTALL} ${COPY} ${STRIP} -m ${_SHAREMODE} INSTALL_SCRIPT= ${INSTALL} ${COPY} -m ${BINMODE} INSTALL_DATA= ${INSTALL} ${COPY} -m ${_SHAREMODE} INSTALL_MAN= ${INSTALL} ${COPY} -m ${MANMODE} @@ -2097,7 +2097,7 @@ COPYTREE_BIN= ${SH} -c '(${FIND} -Ed $$0 -o -type f -exec ${SH} -c '\''cd '\''$$1'\'' && chmod ${BINMODE} "$$@"'\'' -- . {} + \)' -- COPYTREE_SHARE= ${SH} -c '(${FIND} -Ed $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null 2>&1) && \ ${FIND} -Ed $$0 $$2 \( -type d -exec ${SH} -c '\''cd '\''$$1'\'' && chmod 755 "$$@"'\'' -- . {} + \ - -o -type f -exec ${SH} -c '\''cd '\''$$1'\'' && chmod ${SHAREMODE} "$$@"'\'' -- . {} + \)' -- + -o -type f -exec ${SH} -c '\''cd '\''$$1'\'' && chmod ${_SHAREMODE} "$$@"'\'' -- . {} + \)' -- # The user can override the NO_PACKAGE by specifying this from # the make command line