CVS commit: pkgsrc/pkgtools/verifypc

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Feb 20 02:55:15 UTC 2018

Modified Files:
        pkgsrc/pkgtools/verifypc: Makefile
        pkgsrc/pkgtools/verifypc/files: verifypc.sh

Log Message:
verifypc 1.7: adapt to a change in the log format produced by pkg-config,
and while here, fix PR 50482 (verifypc uses invalid ASCII literal in script).

also tidy some pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/verifypc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/verifypc/files/verifypc.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/verifypc/Makefile
diff -u pkgsrc/pkgtools/verifypc/Makefile:1.15 pkgsrc/pkgtools/verifypc/Makefile:1.16
--- pkgsrc/pkgtools/verifypc/Makefile:1.15      Thu Oct  9 14:06:50 2014
+++ pkgsrc/pkgtools/verifypc/Makefile   Tue Feb 20 02:55:15 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/02/20 02:55:15 dholland Exp $
 #
 
-PKGNAME=       verifypc-1.6
+PKGNAME=       verifypc-1.7
 CATEGORIES=    pkgtools
 
 MAINTAINER=    jmmv%NetBSD.org@localhost
@@ -15,8 +15,8 @@ SUBST_CLASSES+=               vars
 SUBST_STAGE.vars=      do-configure
 SUBST_MESSAGE.vars=    Configuring sources.
 SUBST_FILES.vars=      *
-SUBST_SED.vars=                -e 's|@MAKE@|${MAKE}|g'
-SUBST_SED.vars+=       -e 's|@SH@|${SH}|g'
+SUBST_SED.vars=                -e s\|@MAKE@\|${MAKE:Q}\|g
+SUBST_SED.vars+=       -e s\|@SH@\|${SH:Q}\|g
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 bin
 

Index: pkgsrc/pkgtools/verifypc/files/verifypc.sh
diff -u pkgsrc/pkgtools/verifypc/files/verifypc.sh:1.7 pkgsrc/pkgtools/verifypc/files/verifypc.sh:1.8
--- pkgsrc/pkgtools/verifypc/files/verifypc.sh:1.7      Wed Oct 26 08:03:35 2011
+++ pkgsrc/pkgtools/verifypc/files/verifypc.sh  Tue Feb 20 02:55:15 2018
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: verifypc.sh,v 1.7 2011/10/26 08:03:35 sbd Exp $
+# $NetBSD: verifypc.sh,v 1.8 2018/02/20 02:55:15 dholland Exp $
 #
 # verifypc - Sanity check package dependencies according to pkg-config
 # Copyright (c) 2005 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -131,12 +131,21 @@ main() {
     SORTED_DEPS=$(awk -f ../../mk/pkgformat/pkg/reduce-depends.awk \
        "$(${MAKE} show-vars VARNAMES='BUILD_DEPENDS DEPENDS')")
 
+    if grep @ ${log} >/dev/null 2>&1; then
+       err "pkg-config log contains unexpected @-characters"
+    fi
+
     error=0
-    lines=$(cat ${log} | sort | uniq | tr ' ' '�')
+    lines=$(sort < ${log} | uniq | awk '
+       NF==2 {
+           # make current syntax resemble old syntax
+           print $1, "(any)", "_", $2;
+       }
+    ' | tr ' ' '@')
     for l in ${lines}; do
-        pcname=$(echo ${l} | cut -d '�' -f 1)
-        pcop=$(echo ${l} | cut -d '�' -f 2)
-        pcver=$(echo ${l} | cut -d '�' -f 3)
+        pcname=$(echo ${l} | cut -d '@' -f 1)
+        pcop=$(echo ${l} | cut -d '@' -f 2)
+        pcver=$(echo ${l} | cut -d '@' -f 3)
 
         dep=$(search_file_in_depends pkgconfig/${pcname}.pc)
         if [ -n "${dep}" -a "${pcop}" != "NOT-FOUND" ]; then