From 867a7377dcc622910ff7f4e7ff10fa24e63b1443 Mon Sep 17 00:00:00 2001 From: abs Date: Wed, 7 Jun 2006 16:27:14 +0000 Subject: Update pkg_chk to 1.74 1.73 was completely broken.. but only after checking in. ahh... Unwanted expansion of RCS tags, I know ye well... --- pkgtools/pkg_chk/Makefile | 4 ++-- pkgtools/pkg_chk/files/pkg_chk.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index e16d6e41d9b..b59e25f9fa1 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2006/06/07 13:52:39 abs Exp $ +# $NetBSD: Makefile,v 1.34 2006/06/07 16:27:14 abs Exp $ -DISTNAME= pkg_chk-1.73 +DISTNAME= pkg_chk-1.74 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index a19821ea1bc..b80606a34ca 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.34 2006/06/07 13:52:39 abs Exp $ +# $Id: pkg_chk.sh,v 1.35 2006/06/07 16:27:14 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -66,8 +66,8 @@ check_packages_installed() else if [ -n "$opt_B" ];then # sort here temporarily to handle older +BUILD_VERSION - current_build_ver=$(get_build_ver | ${SED} "s|.*\$NetBSD: pkg_chk.sh,v 1.34 2006/06/07 13:52:39 abs Exp ${SORT} -u) - installed_build_ver=$(${SED} "s|.*\$NetBSD: pkg_chk.sh,v 1.34 2006/06/07 13:52:39 abs Exp $PKG_DBDIR/$PKGNAME/+BUILD_VERSION | ${SORT} -u) + current_build_ver=$(get_build_ver | ${SED} 's|.*\$NetBSD\: ||' | ${SORT} -u) + installed_build_ver=$(${SED} 's|.*\$NetBSD\: ||' $PKG_DBDIR/$PKGNAME/+BUILD_VERSION | ${SORT} -u) if [ x"$current_build_ver" != x"$installed_build_ver" ];then msg "$PKGNAME: build-version mismatch" verbose "--current--" -- cgit v1.2.3