diff options
| author | bapt <bapt@FreeBSD.org> | 2015-05-04 16:53:20 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-05-04 16:53:20 +0800 |
| commit | 50c1b0316ddeef706690248d39cfe0f39e7e08ed (patch) | |
| tree | c6ae8f61b23dfd9c9a0b152975f07d583a4f5635 /Mk | |
| parent | 6e7ef1de647bc3d038a951d461f9a94d8af938c2 (diff) | |
| download | freebsd-ports-gnome-50c1b0316ddeef706690248d39cfe0f39e7e08ed.tar.gz freebsd-ports-gnome-50c1b0316ddeef706690248d39cfe0f39e7e08ed.tar.zst freebsd-ports-gnome-50c1b0316ddeef706690248d39cfe0f39e7e08ed.zip | |
Mark NEED_ROOT as deprecated, It was a wrong idea as people are abusing it.
There is now USES=fakeroot for complicated cases if needed.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 25 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 3 |
2 files changed, 9 insertions, 19 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4b3456b3a691..2979f2f6bd4e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2146,32 +2146,21 @@ 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} ${_BINOWNGRP} -m ${BINMODE} + ${INSTALL} ${COPY} ${STRIP} -m ${BINMODE} INSTALL_KLD= \ - ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} + ${INSTALL} ${COPY} -m ${BINMODE} INSTALL_LIB= \ - ${INSTALL} ${COPY} ${STRIP} ${_SHROWNGRP} -m ${SHAREMODE} + ${INSTALL} ${COPY} ${STRIP} -m ${SHAREMODE} INSTALL_SCRIPT= \ - ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} + ${INSTALL} ${COPY} -m ${BINMODE} INSTALL_DATA= \ - ${INSTALL} ${COPY} ${_SHROWNGRP} -m ${_SHAREMODE} + ${INSTALL} ${COPY} -m ${_SHAREMODE} INSTALL_MAN= \ - ${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE} + ${INSTALL} ${COPY} -m ${MANMODE} INSTALL_MACROS= BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ BSD_INSTALL_LIB="${INSTALL_LIB}" \ @@ -3403,7 +3392,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 ${_BINOWNGRP}" \ + INSTALL="/usr/bin/install -c " \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_LIB="${INSTALL_LIB}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 17e16f959324..167c14796c83 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -156,7 +156,7 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS NEED_ROOT USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes USE_OPENAL_ALT= USES=openal @@ -182,6 +182,7 @@ USE_DRUPAL_ALT= USES=drupal USE_PYDISTUTILS_ALT= USE_PYTHON=distutils USE_PGSQL_ALT= USES=pgsql INSTALLS_SHLIB_ALT= USE_LDCONFIG +NEED_ROOT_ALT= USES=fakeroot or USES=uidfix PYTHON_CONCURRENT_INSTALL_ALT= USE_PYTHON=concurrent PYDISTUTILS_AUTOPLIST_ALT= USE_PYTHON=autoplist PYTHON_PY3K_PLIST_HACK_ALT= USE_PYTHON=py3kplist |