svn commit: r321177 - in head: Mk Tools/scripts

[Tijl Coosemans]

Author: tijl
Date: Tue Jun 18 09:45:58 2013
New Revision: 321177
URL: http://svnweb.freebsd.org/changeset/ports/321177

Log:
  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

Modified:
  head/Mk/bsd.port.subdir.mk
  head/Tools/scripts/chkversion.pl

Modified: head/Mk/bsd.port.subdir.mk
==============================================================================
--- head/Mk/bsd.port.subdir.mk	Tue Jun 18 09:15:51 2013	(r321176)
+++ head/Mk/bsd.port.subdir.mk	Tue Jun 18 09:45:58 2013	(r321177)
@@ -140,15 +140,6 @@ _JAVA_PORTS_INSTALLED!=		${MAKE} -V _JAV
 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}" \

Modified: head/Tools/scripts/chkversion.pl
==============================================================================
--- head/Tools/scripts/chkversion.pl	Tue Jun 18 09:15:51 2013	(r321176)
+++ head/Tools/scripts/chkversion.pl	Tue Jun 18 09:45:58 2013	(r321177)
@@ -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];
 }