diff options
| author | abs <abs> | 2002-03-10 23:23:40 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-03-10 23:23:40 +0000 |
| commit | bfce5ae492c9021a594bc358ba8e1dea000339a3 (patch) | |
| tree | 251e3c3d9066fe13a853a0d617b2c838b29f17bb /pkgtools | |
| parent | 1323e33127fd849467d26548112fec1d619cc3cf (diff) | |
| download | pkgsrc-bfce5ae492c9021a594bc358ba8e1dea000339a3.tar.gz | |
Updated pkgchk to 1.24
Handle updated format of +BUILD_VERSION - sometimes patches are recorded
with paths, sometimes not. Ideally we would have a show-build-version
target in bsd.pkg.mk which could be sued by us, but that doesn't help
checking against existing installations where nothing has changed except
the way +BUILD_VERSION is formatted.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgchk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgchk/files/pkgchk.sh | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile index 9c4ed13c93f..75beea14641 100644 --- a/pkgtools/pkgchk/Makefile +++ b/pkgtools/pkgchk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2001/12/31 13:58:29 abs Exp $ +# $NetBSD: Makefile,v 1.25 2002/03/10 23:23:40 abs Exp $ -DISTNAME= pkgchk-1.23 +DISTNAME= pkgchk-1.24 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh index 2635dfb67e2..be54cc74b01 100755 --- a/pkgtools/pkgchk/files/pkgchk.sh +++ b/pkgtools/pkgchk/files/pkgchk.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# $Id: pkgchk.sh,v 1.26 2001/12/31 13:58:29 abs Exp $ +# $Id: pkgchk.sh,v 1.27 2002/03/10 23:23:40 abs Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -52,7 +52,7 @@ check_packages_installed() else if [ -n "$opt_B" ];then current_build_ver=`get_build_ver` - installed_build_ver=`cat /var/db/pkg/$PKGNAME/+BUILD_VERSION | sed "s:^.*/pkgsrc/::"` + installed_build_ver=`sed "s|^[^:]*/[^:]*:||" /var/db/pkg/$PKGNAME/+BUILD_VERSION` if [ x"$current_build_ver" != x"$installed_build_ver" ];then echo "$PKGNAME: build version information mismatch" MISMATCH_TODO="$MISMATCH_TODO $PKGNAME" @@ -118,7 +118,7 @@ extract_variables() get_build_ver() { files="" - for f in `pwd`/Makefile ${FILESDIR}/* ${PKGDIR}/*; do + for f in ${FILESDIR}/* ${PKGDIR}/*; do if [ -f $f ];then files="$files $f" fi @@ -139,7 +139,7 @@ get_build_ver() esac done fi - ${GREP} '\$NetBSD' $files | ${SED} -e "s|^${real_pkgsrcdir}/||" + cat $files | ${GREP} '\$NetBSD' } pkg_install() |