From b1f3435e7d559d3cde44be9da831e8e46ac9bac4 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 18 Jun 2013 09:45:58 +0000
Subject: [PATCH] Remove the last remnants of PKGINSTALLVER. It hasn't been
 used since r231958 and the definition in bsd.port.subdir.mk generates a
 warning with bmake, pkgng and no pkg_info.

Approved by:	erwin
---
 Mk/bsd.port.subdir.mk       | 10 ----------
 Tools/scripts/chkversion.pl |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 46ce0f894f6d..1dfe5b20d8f7 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -140,15 +140,6 @@ _JAVA_PORTS_INSTALLED!=		${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSD
 UID!=	${ID} -u
 .endif
 
-.if exists(${LOCALBASE}/sbin/pkg_info)
-PKG_INFO?=	${LOCALBASE}/sbin/pkg_info
-.else
-PKG_INFO?=	/usr/sbin/pkg_info
-.endif
-.if !defined(PKGINSTALLVER)
-PKGINSTALLVER!=	${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
-.endif
-
 .endif
 
 INDEXDIR?=	${PORTSDIR}
@@ -374,7 +365,6 @@ README.html:
 	OSREL="${OSREL:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \
 	OSVERSION="${OSVERSION:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \
 	UID="${UID:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \
-	PKGINSTALLVER="${PKGINSTALLVER:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \
 	HAVE_COMPAT_IA32_KERN="${HAVE_COMPAT_IA32_KERN}" \
 	CONFIGURE_MAX_CMD_LEN="${CONFIGURE_MAX_CMD_LEN}" \
 	PYTHON_DEFAULT_VERSION="${PYTHON_DEFAULT_VERSION}" \
diff --git a/Tools/scripts/chkversion.pl b/Tools/scripts/chkversion.pl
index b56b9f48b340..c15dcb4eae89 100755
--- a/Tools/scripts/chkversion.pl
+++ b/Tools/scripts/chkversion.pl
@@ -123,7 +123,7 @@ sub readfrom {
     return wantarray ? @childout : $childout[0];
 }
 
-foreach (qw(ARCH OPSYS OSREL OSVERSION PKGINSTALLVER UID)) {
+foreach (qw(ARCH OPSYS OSREL OSVERSION UID)) {
     my @cachedenv = readfrom $portsdir, $make, "-V$_";
     $ENV{$_} = $cachedenv[0];
 }