svn commit: r375740 - head/Mk
Baptiste Daroussin
bapt at FreeBSD.org
Sun Dec 28 19:01:43 UTC 2014
Author: bapt
Date: Sun Dec 28 19:01:42 2014
New Revision: 375740
URL: https://svnweb.freebsd.org/changeset/ports/375740
QAT: https://qat.redports.org/buildarchive/r375740/
Log:
Simplify a bit the rmconfig target
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Sun Dec 28 19:00:38 2014 (r375739)
+++ head/Mk/bsd.port.mk Sun Dec 28 19:01:42 2014 (r375740)
@@ -5578,7 +5578,7 @@ showconfig-recursive:
rmconfig:
.if exists(${OPTIONSFILE})
-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
- optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
+ optionsdir=${OPTIONSFILE:H}; \
if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONSFILE}" ]; then \
${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \
${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \
@@ -5591,7 +5591,7 @@ rmconfig:
.endif
.if exists(${OPTIONS_FILE})
-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
- optionsdir=${OPTIONS_FILE}; optionsdir=$${optionsdir%/*}; \
+ optionsdir=${OPTIONS_FILE:H}; \
if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONS_FILE}" ]; then \
${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONS_FILE} and $${optionsdir}"; \
${SU_CMD} "${RM} -f ${OPTIONS_FILE} ; \
More information about the svn-ports-head
mailing list