From 4246d2eace25c100af1e70842bcc7f9ff2e573c2 Mon Sep 17 00:00:00 2001 From: abs Date: Sat, 1 Sep 2012 17:52:09 +0000 Subject: [PATCH] Updated pkgtools/pkg_chk to 2.0.6 Set "USE_TOOLS+= bzcat:run" so pkg_chk can read .bz2 pkg_summary files --- pkgtools/pkg_chk/Makefile | 6 +++--- pkgtools/pkg_chk/files/pkg_chk.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index c1102bdcaea4..630acb6e4720 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.80 2012/08/28 12:12:26 abs Exp $ +# $NetBSD: Makefile,v 1.81 2012/09/01 17:52:09 abs Exp $ -DISTNAME= pkg_chk-2.0.5 +DISTNAME= pkg_chk-2.0.6 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -18,9 +18,9 @@ USE_LANGUAGES= # empty USE_TOOLS+= mktemp:run USE_TOOLS+= gzcat:run USE_TOOLS+= gzip:run +USE_TOOLS+= bzcat:run NO_BUILD= yes - CONFLICTS= pkgchk-[0-9]* INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 3b3e81b8eacb..09e342a63fb5 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.70 2012/08/28 12:12:26 abs Exp $ +# $Id: pkg_chk.sh,v 1.71 2012/09/01 17:52:09 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Make -g list user-installed packages first, followed by commented @@ -276,13 +276,13 @@ extract_variables() fatal() { - msg "*** $@" >&2 + msg "** $@" >&2 cleanup_and_exit 1 } fatal_later() { - msg "*** $@" >&2 + msg "** $@" >&2 fatal_later=1 } @@ -321,7 +321,7 @@ get_bin_pkg_info() uncompress_filter $summary_file < $PACKAGES/$summary_file return; fi - echo "*** Ignoring $summary_file as newer pkgs in $PACKAGES" >&2 + msg "** Ignoring $summary_file as newer pkgs in $PACKAGES" fi done msg_progress Scan $PACKAGES