svn commit: r385385 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Mon May  4 08:55:04 2015
New Revision: 385385
URL: https://svnweb.freebsd.org/changeset/ports/385385

Log:
  Remove unintended change from r385384 those will come later

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon May  4 08:53:20 2015	(r385384)
+++ head/Mk/bsd.port.mk	Mon May  4 08:55:04 2015	(r385385)
@@ -2146,21 +2146,32 @@ MTREE_ARGS?=	-U ${MTREE_FOLLOWS_SYMLINKS
 
 READLINK_CMD?=	/usr/bin/readlink
 
+# Determine whether or not we can use rootly owner/group functions.
+.if ${UID} == 0
+_BINOWNGRP=	-o ${BINOWN} -g ${BINGRP}
+_SHROWNGRP=	-o ${SHAREOWN} -g ${SHAREGRP}
+_MANOWNGRP=	-o ${MANOWN} -g ${MANGRP}
+.else
+_BINOWNGRP=
+_SHROWNGRP=
+_MANOWNGRP=
+.endif
+
 _SHAREMODE?=	0644
 
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
-	${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}
+	${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m ${BINMODE}
 INSTALL_KLD= \
-	${INSTALL} ${COPY} -m ${BINMODE}
+	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
 INSTALL_LIB= \
-	${INSTALL} ${COPY} ${STRIP} -m ${SHAREMODE}
+	${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE}
 INSTALL_SCRIPT= \
-	${INSTALL} ${COPY} -m ${BINMODE}
+	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
 INSTALL_DATA= \
-	${INSTALL} ${COPY} -m ${_SHAREMODE}
+	${INSTALL} ${COPY} ${_SHROWNGRP} -m ${_SHAREMODE}
 INSTALL_MAN= \
-	${INSTALL} ${COPY} -m ${MANMODE}
+	${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE}
 
 INSTALL_MACROS=	BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			BSD_INSTALL_LIB="${INSTALL_LIB}" \
@@ -3392,7 +3403,7 @@ do-configure:
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
-	    INSTALL="/usr/bin/install -c " \
+	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
 	    INSTALL_LIB="${INSTALL_LIB}" \
 	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \