cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the last remnants of PKGINSTALLVER. It hasn't been used since

Browse Source 
r231958 and the definition in bsd.port.subdir.mk generates a warning with
bmake, pkgng and no pkg_info.

Approved by:	erwin
This commit is contained in:
Tijl Coosemans 2013-06-18 09:45:58 +00:00
parent 4284a4c163
commit b1f3435e7d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=321177
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mk/bsd.port.subdir.mk
View File

@ -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}" \

2
Tools/scripts/chkversion.pl
View File

@ -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];
}