diff options
| author | bapt <bapt@FreeBSD.org> | 2015-05-04 16:55:04 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-05-04 16:55:04 +0800 |
| commit | 2db81851e62fe6d4d685a698c8175e38cde5ed6d (patch) | |
| tree | 1c7f50baebad8c06ce0754127b49793c277b309c /Mk | |
| parent | 50c1b0316ddeef706690248d39cfe0f39e7e08ed (diff) | |
| download | freebsd-ports-gnome-2db81851e62fe6d4d685a698c8175e38cde5ed6d.tar.gz freebsd-ports-gnome-2db81851e62fe6d4d685a698c8175e38cde5ed6d.tar.zst freebsd-ports-gnome-2db81851e62fe6d4d685a698c8175e38cde5ed6d.zip | |
Remove unintended change from r385384 those will come later
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 2979f2f6bd4e..4b3456b3a691 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2146,21 +2146,32 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p 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}" \ |