summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabs <abs>2006-01-03 19:00:09 +0000
committerabs <abs>2006-01-03 19:00:09 +0000
commit2878b178f75bf14450632e514db448cf1bb32b04 (patch)
tree108c1549dd75c225a5eb303eee0bedc4411fe0ab
parent9904850b172294625626d0ba7b481a1e34eb3082 (diff)
downloadpkgsrc-2878b178f75bf14450632e514db448cf1bb32b04.tar.gz
update pkg_chk to 1.64
- Allow -U of filenames on the commandline
-rw-r--r--doc/CHANGES3
-rw-r--r--pkgtools/pkg_chk/Makefile4
-rwxr-xr-xpkgtools/pkg_chk/files/pkg_chk.sh7
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 915c998614b..b08ad9f8209 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.12342 2006/01/03 18:39:27 wiz Exp $
+$NetBSD: CHANGES,v 1.12343 2006/01/03 19:00:52 abs Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -80,3 +80,4 @@ Changes to the packages collection and infrastructure in 2006:
Updated mail/p5-MIME-tools to 5.419 [wiz 2006-01-03]
Updated misc/p5-Locale-Maketext-Lexicon to 0.53 [wiz 2006-01-03]
Updated textproc/p5-XML-LibXSLT to 1.57 [wiz 2006-01-03]
+ Updated pkgtools/pkg_chk to 1.64 [abs 2006-01-03]
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index 4ffd6a1acf4..4181298a026 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/12/13 15:26:05 dillo Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/03 19:00:09 abs Exp $
-DISTNAME= pkg_chk-1.63.1
+DISTNAME= pkg_chk-1.64
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 84657cdb683..d6afe01a501 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.23 2005/12/13 15:26:05 dillo Exp $
+# $Id: pkg_chk.sh,v 1.24 2006/01/03 19:00:09 abs Exp $
#
# TODO: Make -g check dependencies and tsort
# TODO: Variation of -g which only lists top level packages
@@ -347,7 +347,8 @@ pkgdirs_from_conf()
for (tag in tmp) { taglist[tmp[tag]] = 1; }
split(unsetlist, tmp, ",");
- for (tag in tmp) { skip[tmp[tag]] = 1; delete taglist[tmp[tag]] }
+ for (tag in tmp) { skip[tmp[tag]] = 1; nofile[tmp[tag]] = 1 ;
+ delete taglist[tmp[tag]] }
taglist["*"] = "*"
}
@@ -355,7 +356,7 @@ pkgdirs_from_conf()
split(expr,ary,/\+/);
r = 1;
for (i in ary) {
- if (ary[i] ~ /^\//) {
+ if (ary[i] ~ /^\// && ! nofile[ary[i]]) {
if (getline d < ary[i] == -1)
{ r = 0; break ;}
}