From owner-svn-ports-head@freebsd.org  Thu Dec  1 21:29:05 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF76BC618AB;
 Thu,  1 Dec 2016 21:29:05 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A694E1E70;
 Thu,  1 Dec 2016 21:29:05 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB1LT45B034285;
 Thu, 1 Dec 2016 21:29:04 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB1LT4PE034282;
 Thu, 1 Dec 2016 21:29:04 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201612012129.uB1LT4PE034282@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 1 Dec 2016 21:29:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r427523 - in head: Mk ports-mgmt/pkg-devel
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Dec 2016 21:29:06 -0000

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