kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

verifypc-1.5: replace improper seddery with a call to reduce-depends.awk.

Browse source 
(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.)
This commit is contained in:
dholland 2011-06-12 20:28:32 +00:00
parent 3264219c8c
commit 159d04ce0a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/verifypc/Makefile
View file

@ -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

16
pkgtools/verifypc/files/verifypc.sh
View file

@ -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 ' ' '¬')