diff options
| author | abs <abs> | 2001-09-29 08:18:09 +0000 |
|---|---|---|
| committer | abs <abs> | 2001-09-29 08:18:09 +0000 |
| commit | 587e74ce3142d281fdfed50bfb919af7b7b7b8c1 (patch) | |
| tree | 4623c9c3f52dd5ac29c6dd5ec0bd57ef440603b3 /pkgtools | |
| parent | 64d3fbeb6998ab5a2739eea367bfb1881a64a2f9 (diff) | |
| download | pkgsrc-587e74ce3142d281fdfed50bfb919af7b7b7b8c1.tar.gz | |
Update pkgchk to 1.16
Fix awk in pkgchk.conf parsing broken in 1.14
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgchk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgchk/files/pkgchk.sh | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile index 5381f59c003..27a9ed815a8 100644 --- a/pkgtools/pkgchk/Makefile +++ b/pkgtools/pkgchk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2001/09/28 11:30:54 abs Exp $ +# $NetBSD: Makefile,v 1.17 2001/09/29 08:18:09 abs Exp $ -DISTNAME= pkgchk-1.15 +DISTNAME= pkgchk-1.16 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh index 49ed83436c7..b54155705d4 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.17 2001/09/28 11:30:55 abs Exp $ +# $Id: pkgchk.sh,v 1.18 2001/09/29 08:18:09 abs Exp $ # # TODO: Handle and as well as or tags (eg: i386+x11) # TODO: Handle updates with dependencies via binary packages @@ -263,24 +263,25 @@ if [ -n "$opt_c" ];then if (alreadyset[$1]) { next; } need = 0; - for (chk = 1 ; chk<NF ; ++chk) # For each word on the line + for (f = 1 ; f<=NF ; ++f) # For each word on the line { - if (sub("^-", "", $chk)) # If it begins with a '-' + if (sub("^-", "", $f)) # If it begins with a '-' { - if ($chk in taglist) # If match, discard + if ($f in taglist) # If match, discard { next; } } else { - if ($chk in taglist) # If match, note needed + if ($f in taglist) # If match, note needed { need = 1; } } } - if (NF == 1 || need) + if (NF == 2 || need) { print $1 } } ' < $PKGCHK_CONF ` + exit; fi # Check packages are installed |