svn commit: r427523 - in head: Mk ports-mgmt/pkg-devel
Steve Wills
swills at FreeBSD.org
Thu Dec 1 21:29:06 UTC 2016
Author: swills
Date: Thu Dec 1 21:29:04 2016
New Revision: 427523
URL: https://svnweb.freebsd.org/changeset/ports/427523
Log:
Rename PKG_CMD to PKG_REGISTER
Submitted by: bapt
Differential Revision: https://reviews.freebsd.org/D8677
Modified:
head/Mk/bsd.commands.mk
head/Mk/bsd.port.mk
head/ports-mgmt/pkg-devel/Makefile
Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk Thu Dec 1 21:06:46 2016 (r427522)
+++ head/Mk/bsd.commands.mk Thu Dec 1 21:29:04 2016 (r427523)
@@ -123,7 +123,7 @@ ECHO_MSG?= ${ECHO_CMD}
.elif !defined(_PKGTOOLSDEFINED)
_PKGTOOLSDEFINED= yes
PKG_BIN?= ${LOCALBASE}/sbin/pkg-static
-PKG_CMD?= ${PKG_BIN} register
+PKG_REGISTER?= ${PKG_BIN} register
PKG_DELETE?= ${PKG_BIN} delete -y
PKG_INFO?= ${PKG_BIN} info -g
PKG_VERSION?= ${PKG_BIN} version
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Dec 1 21:06:46 2016 (r427522)
+++ head/Mk/bsd.port.mk Thu Dec 1 21:29:04 2016 (r427523)
@@ -4587,9 +4587,9 @@ fake-pkg: create-manifest
@${ECHO_MSG} "===> Registering installation for ${PKGNAME}"
.endif
.if defined(INSTALLS_DEPENDS)
- @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
+ @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
.else
- @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
+ @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
.endif
@${RM} -r ${METADIR}
.endif
Modified: head/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- head/ports-mgmt/pkg-devel/Makefile Thu Dec 1 21:06:46 2016 (r427522)
+++ head/ports-mgmt/pkg-devel/Makefile Thu Dec 1 21:29:04 2016 (r427523)
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --disable-maintainer-mod
INSTALL_TARGET= install-strip
PORTDOCS= NEWS
-# Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
+# Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
# so that pkg-static is used from the wrkdir
USE_SUBMAKE= yes
More information about the svn-ports-head
mailing list