summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2001-11-21 23:01:56 +0000
committerabs <abs@pkgsrc.org>2001-11-21 23:01:56 +0000
commit233a3ac207a71790a920c64114cda2859d16de7b (patch)
tree869a9c08e863a687e51c59d6404a243a6f70f749 /pkgtools
parente07cfe8a404a91761f8c87c47fbe935281649a99 (diff)
downloadpkgsrc-233a3ac207a71790a920c64114cda2859d16de7b.tar.gz
Update pkgchk to 1.19
Allow package directories to be skipped by listing under -U eg: pkg_chk -us -U databases/jdbc-postgresql
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgchk/Makefile4
-rw-r--r--pkgtools/pkgchk/files/pkgchk.84
-rwxr-xr-xpkgtools/pkgchk/files/pkgchk.sh8
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile
index 7ef25fcc3e4..6e663a5f201 100644
--- a/pkgtools/pkgchk/Makefile
+++ b/pkgtools/pkgchk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2001/10/10 09:55:31 abs Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/21 23:01:56 abs Exp $
-DISTNAME= pkgchk-1.18
+DISTNAME= pkgchk-1.19
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkgchk/files/pkgchk.8 b/pkgtools/pkgchk/files/pkgchk.8
index 84680ed38bb..84a6301f7c8 100644
--- a/pkgtools/pkgchk/files/pkgchk.8
+++ b/pkgtools/pkgchk/files/pkgchk.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkgchk.8,v 1.7 2001/10/10 09:55:32 abs Exp $
+.\" $NetBSD: pkgchk.8,v 1.8 2001/11/21 23:01:56 abs Exp $
.\"
.\" Copyright (c) 2001 by David Brownlee (abs@netbsd.org)
.\" Absolutely no warranty.
@@ -37,6 +37,8 @@ pkgchk.conf. Also includes
Remove the comma separated list of tags from those checked when
parsing pkgchk.conf. Also includes
.Ev PKGCHK_NOTAGS .
+Package directories can also be skipped by listing them under
+.Fl U
.It Fl a
Automatically add any missing packages. If a binary package exists
in
diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh
index 7e7c9e5b3d4..f5d5035809a 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.21 2001/10/10 09:55:32 abs Exp $
+# $Id: pkgchk.sh,v 1.22 2001/11/21 23:01:56 abs Exp $
#
# TODO: Handle updates with dependencies via binary packages
@@ -258,13 +258,13 @@ if [ -n "$opt_c" ];then
PKGDIRLIST="$PKGDIRLIST "`${AWK} -v alreadyset="$PKGDIRLIST" -v setlist=$TAGS -v unsetlist=$opt_U '
BEGIN {
split(alreadyset, tmp, " ");
- for (tag in tmp) { alreadyset[tmp[tag]] = 1; }
+ for (tag in tmp) { skip[tmp[tag]] = 1; }
split(setlist, tmp, ",");
for (tag in tmp) { taglist[tmp[tag]] = 1; }
split(unsetlist, tmp, ",");
- for (tag in tmp) { delete taglist[tmp[tag]] }
+ for (tag in tmp) { skip[tmp[tag]] = 1; delete taglist[tmp[tag]] }
taglist["*"] = "*"
}
@@ -278,7 +278,7 @@ if [ -n "$opt_c" ];then
}
{
sub("#.*", "");
- if (alreadyset[$1])
+ if (skip[$1])
{ next; }
need = 0;
for (f = 1 ; f<=NF ; ++f) { # For each word on the line