From owner-svn-ports-head@FreeBSD.ORG Tue Jun 18 09:45:58 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BDCC2EFF; Tue, 18 Jun 2013 09:45:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B0F7A1C00; Tue, 18 Jun 2013 09:45:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I9jw0k091649; Tue, 18 Jun 2013 09:45:58 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I9jwjG091647; Tue, 18 Jun 2013 09:45:58 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201306180945.r5I9jwjG091647@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 18 Jun 2013 09:45:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321177 - in head: Mk Tools/scripts 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 09:45:58 -0000 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]; }