svn commit: r368333 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Tue Sep 16 16:02:50 2014
New Revision: 368333
URL: http://svnweb.freebsd.org/changeset/ports/368333
QAT: https://qat.redports.org/buildarchive/r368333/

Log:
  - Continue to define PKGNG_ORIGIN.
    - This is used by portupgrade and poudriere bulk/testport -i for
      install-package.
    - The change is not backwards compatible; setting PKGNG_ORIGIN was never
      intended. It is only for reading.
  
  With hat:	portmgr
  Discussed with:	bapt

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Sep 16 15:57:48 2014	(r368332)
+++ head/Mk/bsd.port.mk	Tue Sep 16 16:02:50 2014	(r368333)
@@ -1664,8 +1664,9 @@ LIB32DIR=	lib
 .endif
 PLIST_SUB+=	LIB32DIR=${LIB32DIR}
 
+# Keep PKGNG_ORIGIN/WITH_PKGNG for compat with scripts which are looking for it
 PKG_ORIGIN?=	ports-mgmt/pkg
-# Keep WITH_PKGNG for compat with scripts which are looking for it
+PKGNG_ORIGIN=	${PKG_ORIGIN}
 WITH_PKGNG?=	yes
 WITH_PKG?=	${WITH_PKGNG}
 
@@ -3657,8 +3658,8 @@ delete-package-list:
 	@${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} -f ${PKGFILE})"
 .endif
 
-# Used if !defined(NO_STAGE) during install, or manually to install package
-# from local repository.
+# Used by scripts and users to install a package from local repository.
+# Poudriere -i uses this, please keep.
 .if !target(install-package)
 .if defined(FORCE_PKG_REGISTER)
 _INSTALL_PKG_ARGS=	-f