[pkgsrc/trunk]: pkgsrc/mk Garbage collect support for old pkg_install versions.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a66b3375297
branches:  trunk
changeset: 572020:5a66b3375297
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Feb 19 14:27:36 2010 +0000

description:
Garbage collect support for old pkg_install versions.

diffstat:

 mk/bsd.pkg.update.mk         |  15 +--------------
 mk/flavor/pkg/flavor-vars.mk |  12 +-----------
 2 files changed, 2 insertions(+), 25 deletions(-)

diffs (64 lines):

diff -r bb443b3f40cc -r 5a66b3375297 mk/bsd.pkg.update.mk
--- a/mk/bsd.pkg.update.mk      Fri Feb 19 14:16:31 2010 +0000
+++ b/mk/bsd.pkg.update.mk      Fri Feb 19 14:27:36 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.18 2009/05/16 01:27:30 joerg Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.19 2010/02/19 14:27:36 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and contains the targets
 # and variables for "make update".
@@ -127,22 +127,9 @@
        ${RUN} pkgs=`${CAT} ${_DLIST}`;                                 \
        if [ "$$pkgs" ]; then ${PKG_INFO} -Q PKGPATH $$pkgs; fi > ${_DDIR}
 
-.if ${PKGTOOLS_VERSION} >= 20090302
 ${_DLIST}: ${WRKDIR}
        if ${PKG_INFO} -qe "${PKGWILDCARD}"; then \
                ${PKG_INFO} -qr "${PKGWILDCARD}" > ${_DLIST}; \
        else \
                ${TOUCH} ${_DLIST}; \
        fi
-.elif ${PKGTOOLS_VERSION} >= 20090225
-${_DLIST}: ${WRKDIR}
-       ${RUN}echo "Please update to pkg_install-20090302 or later" 2>&1
-       ${RUN}exit 1
-.else
-${_DLIST}: ${WRKDIR}
-       ${RUN}                                                          \
-       ${PKG_DELETE} -n "${PKGWILDCARD}" 2>&1                          \
-       | ${GREP} '^    '                                               \
-       | ${AWK} '{ l[NR]=$$0 } END { for (i=NR;i>0;--i) print l[i] }'  \
-       > ${_DLIST}
-.endif
diff -r bb443b3f40cc -r 5a66b3375297 mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Fri Feb 19 14:16:31 2010 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Fri Feb 19 14:27:36 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.14 2010/01/30 20:13:19 joerg Exp $
+# $NetBSD: flavor-vars.mk,v 1.15 2010/02/19 14:27:36 joerg Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -53,22 +53,12 @@
 _PKG_INSTALL_DEPENDS=  yes
 .endif
 
-.if ${PKGTOOLS_VERSION} >= 20090201
 AUDIT_PACKAGES?=       ${PKG_ADMIN}
 _AUDIT_PACKAGES_CMD?=  audit-pkg
 _EXTRACT_PKGVULNDIR=   ${PKG_ADMIN} config-var PKGVULNDIR
 DOWNLOAD_VULN_LIST?=   ${PKG_ADMIN} fetch-pkg-vulnerabilities
 _AUDIT_CONFIG_FILE=    pkg_install.conf
 _AUDIT_CONFIG_OPTION=  IGNORE_URL
-.else
-AUDIT_PACKAGES?=       ${PKG_TOOLS_BIN}/audit-packages
-_AUDIT_PACKAGES_CMD?=  -n
-_EXTRACT_PKGVULNDIR=   ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR
-DOWNLOAD_VULN_LIST?=   ${PKG_TOOLS_BIN}/download-vulnerability-list
-_AUDIT_CONFIG_FILE=    audit-packages.conf
-_AUDIT_CONFIG_OPTION=  IGNORE_URLS
-.endif
-
 
 # The binary pkg_install tools all need to consistently to refer to the
 # correct package database directory.