summaryrefslogtreecommitdiff
path: root/pkgtools/verifypc
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-10-03 09:45:45 +0000
committerjmmv <jmmv@pkgsrc.org>2005-10-03 09:45:45 +0000
commit47b9407ba8c896bea4e5f843b766f7af316ad57f (patch)
tree454e4cb5b13d7030834343be0f5a62e9731c4756 /pkgtools/verifypc
parentba0f92621a9416b213f49d5e57bb55e44decf573 (diff)
downloadpkgsrc-47b9407ba8c896bea4e5f843b766f7af316ad57f.tar.gz
Update to 1.2:
- Package names can have dashes in them, so use a correct regexp to extract the package name from a dependency specification.
Diffstat (limited to 'pkgtools/verifypc')
-rw-r--r--pkgtools/verifypc/Makefile4
-rw-r--r--pkgtools/verifypc/files/verifypc.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile
index 3e771a9804e..9537f16b25d 100644
--- a/pkgtools/verifypc/Makefile
+++ b/pkgtools/verifypc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/10/02 09:29:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/03 09:45:45 jmmv Exp $
#
-DISTNAME= verifypc-1.1
+DISTNAME= verifypc-1.2
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/verifypc/files/verifypc.sh b/pkgtools/verifypc/files/verifypc.sh
index d19e97202b4..fabed6a2f19 100644
--- a/pkgtools/verifypc/files/verifypc.sh
+++ b/pkgtools/verifypc/files/verifypc.sh
@@ -1,6 +1,6 @@
#!@SH@
#
-# $NetBSD: verifypc.sh,v 1.2 2005/10/02 09:29:29 jmmv Exp $
+# $NetBSD: verifypc.sh,v 1.3 2005/10/03 09:45:45 jmmv Exp $
#
# verifypc - Sanity check package dependencies according to pkg-config
# Copyright (c) 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -91,7 +91,7 @@ check_match() {
fi
pkgdep=$(echo ${dep} | cut -d : -f 1 | sed 's|>=|-|;s|>|-|')
- pkgname=$(echo ${pkgdep} | cut -d - -f 1)
+ pkgname=$(echo ${pkgdep} | sed 's|^\(.*\)-\([0-9].*\)$|\1|')
out=$(pkg_admin pmatch "${pkgname}${pcop}${pcver}" "${pkgdep}" 2>&1)
ret=$?