summaryrefslogtreecommitdiff
path: root/pkgtools/verifypc
diff options
context:
space:
mode:
authorjmmv <jmmv>2006-09-14 15:35:46 +0000
committerjmmv <jmmv>2006-09-14 15:35:46 +0000
commit4606349a52c9793b40d8ea406f72050fef6789c7 (patch)
treee8d176c00ef2bd3d66a060f26bda822463718541 /pkgtools/verifypc
parentc06b4f692605b0562ff2333e68d40f2198613ce9 (diff)
downloadpkgsrc-4606349a52c9793b40d8ea406f72050fef6789c7.tar.gz
Update to 1.4:
- Sort dependencies properly so that, e.g., 2.10 is considered newer than 2.8. This is still a hack and might fail in some cases, but is hopefully much better than before.
Diffstat (limited to 'pkgtools/verifypc')
-rw-r--r--pkgtools/verifypc/Makefile4
-rw-r--r--pkgtools/verifypc/files/verifypc.sh9
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile
index 7c2f543924e..56867703526 100644
--- a/pkgtools/verifypc/Makefile
+++ b/pkgtools/verifypc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/19 10:49:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/09/14 15:35:46 jmmv Exp $
#
-DISTNAME= verifypc-1.3
+DISTNAME= verifypc-1.4
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/verifypc/files/verifypc.sh b/pkgtools/verifypc/files/verifypc.sh
index b9e1ba99f99..6d2dca8c27d 100644
--- a/pkgtools/verifypc/files/verifypc.sh
+++ b/pkgtools/verifypc/files/verifypc.sh
@@ -1,6 +1,6 @@
#!@SH@
#
-# $NetBSD: verifypc.sh,v 1.4 2005/10/09 10:30:23 jmmv Exp $
+# $NetBSD: verifypc.sh,v 1.5 2006/09/14 15:35:46 jmmv Exp $
#
# verifypc - Sanity check package dependencies according to pkg-config
# Copyright (c) 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -124,7 +124,12 @@ main() {
# Construct a list of dependency specifications for the current package.
SORTED_DEPS=$(${MAKE} show-vars VARNAMES="BUILD_DEPENDS DEPENDS" | tr ' ' '
-' | sort -r | uniq)
+' | sed 's,\([.<>=]\)\([0-9][.:n]\),\10\2,g' | \
+ sed 's,\([.<>=]\)\([0-9][.:n]\),\10\2,g' | \
+ sort -r | \
+ sed 's,\([.<>=]\)0\([0-9][.:n]\),\1\2,g' | \
+ sed 's,\([.<>=]\)0\([0-9][.:n]\),\1\2,g' | \
+ uniq)
error=0
lines=$(cat ${log} | sort | uniq | tr ' ' '¬')