Index: head/Mk/bsd.commands.mk =================================================================== --- head/Mk/bsd.commands.mk +++ head/Mk/bsd.commands.mk @@ -123,7 +123,7 @@ .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 Index: head/Mk/bsd.port.mk =================================================================== --- head/Mk/bsd.port.mk +++ head/Mk/bsd.port.mk @@ -4587,9 +4587,9 @@ @${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 Index: head/ports-mgmt/pkg-devel/Makefile =================================================================== --- head/ports-mgmt/pkg-devel/Makefile +++ head/ports-mgmt/pkg-devel/Makefile @@ -23,7 +23,7 @@ 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