diff options
| author | abs <abs> | 2006-07-10 23:47:18 +0000 |
|---|---|---|
| committer | abs <abs> | 2006-07-10 23:47:18 +0000 |
| commit | 9fe3689ca0b959712dc58dbb271603edd1cbb5b7 (patch) | |
| tree | e501a5d0884501da869e6441fdf7092640df844d /pkgtools | |
| parent | 7fd04c2d697a38cf4109746e272bd0be03a1e3d5 (diff) | |
| download | pkgsrc-9fe3689ca0b959712dc58dbb271603edd1cbb5b7.tar.gz | |
Update pkg_tools/pkg_chk to 1.76 - output the pkgdir rather than pkgname at the start of each line
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index d38592a342b..efc27fdec8b 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2006/07/10 22:46:15 salo Exp $ +# $NetBSD: Makefile,v 1.38 2006/07/10 23:47:18 abs Exp $ -DISTNAME= pkg_chk-1.75 -PKGREVISION= 1 +DISTNAME= pkg_chk-1.76 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 20f40db6f9f..6cb00b62673 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.36 2006/06/09 16:43:33 abs Exp $ +# $Id: pkg_chk.sh,v 1.37 2006/07/10 23:47:18 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -48,15 +48,15 @@ check_packages_installed() continue fi if [ ! -d $PKG_DBDIR/$PKGNAME ];then - msg_n "$PKGNAME: " + msg_n "$pkgdir - " pkg=$(echo $PKGNAME | ${SED} 's/-[0-9].*//') pkginstalled=$(sh -c "${PKG_INFO} -e $pkg" || true) INSTALL= if [ -n "$pkginstalled" ];then - msg_n "version mismatch - $pkginstalled" + msg_n "$pkginstalled < $PKGNAME" MISMATCH_TODO="$MISMATCH_TODO $pkginstalled" else - msg_n "missing" + msg_n "$PKGNAME missing" MISSING_TODO="$MISSING_TODO $PKGNAME $pkgdir" fi if is_binary_available $PKGNAME ;then @@ -69,7 +69,7 @@ check_packages_installed() 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" + msg "$pkgdir - $PKGNAME build_version mismatch" verbose "--current--" verbose "$current_build_ver" verbose "--installed--" |