From owner-svn-ports-head@FreeBSD.ORG  Tue Sep 16 16:02:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 726CBD9D;
 Tue, 16 Sep 2014 16:02:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C77D2C9;
 Tue, 16 Sep 2014 16:02:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8GG2pTF044613;
 Tue, 16 Sep 2014 16:02:51 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8GG2pcC044612;
 Tue, 16 Sep 2014 16:02:51 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201409161602.s8GG2pcC044612@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 16 Sep 2014 16:02:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368333 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Sep 2014 16:02:51 -0000

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