summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2001-07-05 21:00:54 +0000
committerabs <abs@pkgsrc.org>2001-07-05 21:00:54 +0000
commit730f20bd146a1a1db853c7568c7ef5031eda7d64 (patch)
tree63cf725d643b21090d827a3f6f38ba46a73c2923 /pkgtools
parent9219689f7f7a9898f5de8f9eda0f7ff645c7b668 (diff)
downloadpkgsrc-730f20bd146a1a1db853c7568c7ef5031eda7d64.tar.gz
Updated pkgchk to 1.02 - if extracting the pkgname form a pkgdir fails,
make sure to display the pkgdir name.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgchk/Makefile4
-rw-r--r--pkgtools/pkgchk/files/pkgchk.84
-rwxr-xr-xpkgtools/pkgchk/files/pkgchk.sh10
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile
index 97b9edbb323..710e0622241 100644
--- a/pkgtools/pkgchk/Makefile
+++ b/pkgtools/pkgchk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/07/02 15:28:44 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/07/05 21:00:54 abs Exp $
#
-DISTNAME= pkgchk-1.01
+DISTNAME= pkgchk-1.02
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkgchk/files/pkgchk.8 b/pkgtools/pkgchk/files/pkgchk.8
index 70ae632984c..abb207b34eb 100644
--- a/pkgtools/pkgchk/files/pkgchk.8
+++ b/pkgtools/pkgchk/files/pkgchk.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkgchk.8,v 1.1.1.1 2001/07/02 14:12:30 abs Exp $
+.\" $NetBSD: pkgchk.8,v 1.2 2001/07/05 21:00:54 abs Exp $
.\"
.\" Copyright (c) 2001 by David Brownlee (abs@netbsd.org)
.\" Absolutely no warranty.
@@ -68,7 +68,7 @@ Verbose - list the tags set, and all packages checked.
.Sh FILE FORMAT
.Pp
Each non comment line in pkgsrc.conf should contain a package directory
-(such as sysutils/skill) followed by a list of 'tags'. If a tag starts with
+(such as sysutils/skill) followed by a list of tags. If a tag starts with
a hyphen (-), then any machine matching will be excluded, otherwise if any
tags match the current machine the package will be included. The tag
.Em *
diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh
index 4f8bd5bf9f5..38889295884 100755
--- a/pkgtools/pkgchk/files/pkgchk.sh
+++ b/pkgtools/pkgchk/files/pkgchk.sh
@@ -1,6 +1,8 @@
#!/bin/sh -e
#
-# $Id: pkgchk.sh,v 1.2 2001/07/02 15:28:44 abs Exp $
+# $Id: pkgchk.sh,v 1.3 2001/07/05 21:00:54 abs Exp $
+#
+# TODO: Handle and as well as or tags (eg: i386+x11)
extract_variables()
{
@@ -181,14 +183,14 @@ fi
# Check packages are installed
#
for pkgdir in $PKGDIRLIST ; do
+
cd $PKGSRCDIR/$pkgdir
# Use 'make x' rather than 'make all' to avoid potential licence errors
- pkgname=`printf 'x:\n\t@echo ${PKGNAME}\n'|make -f - -f Makefile x`
+ pkgname=`printf 'x:\n\t@echo ${PKGNAME}\n'|make -f - -f Makefile x` || true
if [ -z "$pkgname" ]; then
echo "Unable to extract PKGNAME for $pkgdir"
exit 1
fi
-
if [ ! -d /var/db/pkg/$pkgname ];then
echo -n "$pkgname: "
pkg=`echo $pkgname | sed 's/-[0-9].*//'`
@@ -212,7 +214,7 @@ for pkgdir in $PKGDIRLIST ; do
if [ -n "$INSTALL" ];then
pkg_install $pkgname $pkgdir $INSTALL
fi
- elif [ -n "$opt_v" ];then
+ elif [ -n "$opt_v" ];then
echo "$pkgname: OK"
fi
done