svn commit: r388544 - head/Mk
Baptiste Daroussin
bapt at FreeBSD.org
Thu Jun 4 19:32:31 UTC 2015
Author: bapt
Date: Thu Jun 4 19:32:29 2015
New Revision: 388544
URL: https://svnweb.freebsd.org/changeset/ports/388544
Log:
Remove NEED_ROOT, the last customer has been modified to be able to properly
package as a regular user
USES=fakeroot and USES=uidfix does a better job and is less intrusive and allows
to simplify the way we handle the different targets in the framework
Modified:
head/Mk/bsd.port.mk
head/Mk/bsd.sanity.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Jun 4 18:54:16 2015 (r388543)
+++ head/Mk/bsd.port.mk Thu Jun 4 19:32:29 2015 (r388544)
@@ -3921,12 +3921,6 @@ deinstall-all:
.if !target(do-clean)
do-clean:
-.if defined(NEED_ROOT) && ${UID} != 0 && !defined(INSTALL_AS_USER) && exists(${STAGE_COOKIE})
- @${ECHO_MSG} "===> Switching to root credentials for '${.TARGET}' target"
- @cd ${.CURDIR} && \
- ${SU_CMD} "${MAKE} ${.TARGET}"
- @${ECHO_MSG} "===> Returning to user credentials"
-.else
@if [ -d ${WRKDIR} ]; then \
if [ -w ${WRKDIR} ]; then \
${RM} -rf ${WRKDIR}; \
@@ -3935,7 +3929,6 @@ do-clean:
fi; \
fi
.endif
-.endif
.if !target(clean)
clean:
@@ -5923,19 +5916,6 @@ _STAGE_DEP= build
_STAGE_SEQ= stage-message stage-dir run-depends lib-depends apply-slist pre-install generate-plist \
pre-su-install
# ${POST_PLIST} must be after anything that modifies TMPPLIST
-.if defined(NEED_ROOT)
-_STAGE_SUSEQ= create-users-groups do-install \
- kmod-post-install fix-perl-things \
- webplugin-post-install post-install post-install-script \
- move-uniquefiles patch-lafiles post-stage compress-man \
- install-rc-script install-ldconfig-file install-license \
- install-desktop-entries add-plist-info add-plist-docs \
- add-plist-examples add-plist-data add-plist-post \
- move-uniquefiles-plist ${POST_PLIST}
-.if defined(DEVELOPER)
-_STAGE_SUSEQ+= stage-qa
-.endif
-.else
_STAGE_SEQ+= create-users-groups do-install \
kmod-post-install fix-perl-things \
webplugin-post-install post-install post-install-script \
@@ -5947,7 +5927,6 @@ _STAGE_SEQ+= create-users-groups do-inst
.if defined(DEVELOPER)
_STAGE_SEQ+= stage-qa
.endif
-.endif
_INSTALL_DEP= stage
_INSTALL_SEQ= install-message run-depends lib-depends check-already-installed
_INSTALL_SUSEQ= fake-pkg security-check
Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk Thu Jun 4 18:54:16 2015 (r388543)
+++ head/Mk/bsd.sanity.mk Thu Jun 4 19:32:29 2015 (r388544)
@@ -155,8 +155,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM U
USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
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 NEED_ROOT
+ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT
+SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS
USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes
USE_OPENAL_ALT= USES=openal
More information about the svn-ports-head
mailing list