diff options
| author | dholland <dholland@pkgsrc.org> | 2011-06-12 20:28:32 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-06-12 20:28:32 +0000 |
| commit | 159d04ce0a53c69867fa939903923bc0f72e1b4a (patch) | |
| tree | 388e5d0b57cb1a4e0eee17fa069d2852eafa5d59 /pkgtools | |
| parent | 3264219c8c122dd3fc01bb06bc0de602667b63db (diff) | |
| download | pkgsrc-159d04ce0a53c69867fa939903923bc0f72e1b4a.tar.gz | |
verifypc-1.5: replace improper seddery with a call to reduce-depends.awk.
(This avoids false positive reports in some circumstances, such as a pair
of depends on e.g. foo-2.0 and 2.0.3, and also for more complicated forms
of version numbers.)
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/verifypc/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/verifypc/files/verifypc.sh | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile index 36b57eb2e92..69835914c93 100644 --- a/pkgtools/verifypc/Makefile +++ b/pkgtools/verifypc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2009/04/09 00:48:14 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2011/06/12 20:28:32 dholland Exp $ # -DISTNAME= verifypc-1.4 +DISTNAME= verifypc-1.5 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/verifypc/files/verifypc.sh b/pkgtools/verifypc/files/verifypc.sh index 6d2dca8c27d..511b9e71b8d 100644 --- a/pkgtools/verifypc/files/verifypc.sh +++ b/pkgtools/verifypc/files/verifypc.sh @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: verifypc.sh,v 1.5 2006/09/14 15:35:46 jmmv Exp $ +# $NetBSD: verifypc.sh,v 1.6 2011/06/12 20:28:33 dholland Exp $ # # verifypc - Sanity check package dependencies according to pkg-config # Copyright (c) 2005 Julio M. Merino Vidal <jmmv@NetBSD.org> @@ -123,13 +123,13 @@ main() { err "pkg-config log not found; must run '${MAKE} configure' first" # Construct a list of dependency specifications for the current package. - SORTED_DEPS=$(${MAKE} show-vars VARNAMES="BUILD_DEPENDS DEPENDS" | tr ' ' ' -' | 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) + # + # (The list is no longer actually sorted -- the important part is that + # the loop in search_file_in_depends finds the most restrictive spec + # first, which used to be done by sorting but is now done with + # reduce-depends.) + SORTED_DEPS=$(awk -f ../../mk/flavor/pkg/reduce-depends.awk \ + "$(${MAKE} show-vars VARNAMES='BUILD_DEPENDS DEPENDS')") error=0 lines=$(cat ${log} | sort | uniq | tr ' ' '¬') |