diff options
| -rw-r--r-- | doc/CHANGES-2006 | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006 index 90890446afb..25a45d8f6ae 100644 --- a/doc/CHANGES-2006 +++ b/doc/CHANGES-2006 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2006,v 1.989 2006/08/10 05:57:44 taca Exp $ +$NetBSD: CHANGES-2006,v 1.990 2006/08/10 08:56:21 abs Exp $ Changes to the packages collection and infrastructure in 2006: @@ -3892,3 +3892,4 @@ Changes to the packages collection and infrastructure in 2006: Removed print/teTeX-bin [minskim 2006-08-10] Removed print/teTeX-sharesrc [minskim 2006-08-10] Updated lang/php5 to 5.1.4nb3 [taca 2006-08-10] + Updated pkgtools/pkg_chk to 1.79 [abs 2006-08-10] diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 4d3a61df619..6a0fef3e68e 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2006/08/06 12:21:09 cube Exp $ +# $NetBSD: Makefile,v 1.42 2006/08/10 08:54:44 abs Exp $ -DISTNAME= pkg_chk-1.78 +DISTNAME= pkg_chk-1.79 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -40,6 +40,7 @@ do-build: -e 's#@SORT@#${SORT}#g' \ -e 's#@TSORT@#${TSORT}#g' \ -e 's#@PREFIX@#${PREFIX}#g' \ + -e 's#@PKG_DBDIR@#${PKG_DBDIR}#g' \ ${FILESDIR}/pkg_chk.sh >${WRKSRC}/pkg_chk.sh do-install: diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index c38fd781db1..57a6e6c904a 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,6 +1,6 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.39 2006/08/06 12:21:09 cube Exp $ +# $Id: pkg_chk.sh,v 1.40 2006/08/10 08:54:44 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -544,7 +544,7 @@ usage() echo 'Usage: pkg_chk [opts] -a Add all missing packages (implies -c) -B Check the "Build version" of packages - -b Install binary packages + -b Use binary packages -C conf Use pkgchk.conf file 'conf' -D tags Comma separated list of additional pkgchk.conf tags to set -f Perform a 'make fetch' for all required packages @@ -558,7 +558,7 @@ usage() -P dir Set PACKAGES dir (overrides any other setting) -q Do not display actions or take any action; only list packages -r Recursively remove mismatches (use with care) (implies -i) - -s Install packages by building from source + -s Use source for building packages -U tags Comma separated list of pkgchk.conf tags to unset -u Update all mismatched packages (implies -i) -v Verbose @@ -656,6 +656,7 @@ test -n "$PKG_INFO" || PKG_INFO="@PKG_INFO@" test -n "$SED" || SED="@SED@" test -n "$SORT" || SORT="@SORT@" test -n "$TSORT" || TSORT="@TSORT@" +test -n "$PKG_DBDIR" || PKG_DBDIR="@PKG_DBDIR@" if [ ! -f $MAKECONF ] ; then if [ -f @PREFIX@/etc/mk.conf ] ; then |