Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Mar 2017 13:10:01 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436276 - head/Mk
Message-ID:  <201703161310.v2GDA1Eq045208@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703161310.v2GDA1Eq045208>