[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed the regular expression to...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a97d61986a1
branches:  trunk
changeset: 516488:5a97d61986a1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jul 21 19:09:23 2006 +0000

description:
Fixed the regular expression to detect whether USE_LANGUAGES contains
"c" or not.

diffstat:

 pkgtools/pkglint/files/makevars.map |  4 ++--
 pkgtools/pkglint/files/pkglint.pl   |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r b531eb1d4872 -r 5a97d61986a1 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Fri Jul 21 19:08:56 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Fri Jul 21 19:09:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.132 2006/07/18 18:14:33 rillig Exp $
+# $NetBSD: makevars.map,v 1.133 2006/07/21 19:09:23 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -638,7 +638,7 @@
 USE_IMAKE              Yes [m:s]
 USE_JAVA               { run yes } [m:s]
 USE_JAVA2              { YES yes 1.4 1.5 } [m:s]
-USE_LANGUAGES          List of { c c++ fortran java objc } [m:as,c:as,o:a]
+USE_LANGUAGES          List of { c c++ fortran java objc } [m:s,c:s,o:s]
 USE_LIBTOOL            Yes [m:s,c:s]
 USE_MAKEINFO           Yes [$package]
 USE_MSGFMT_PLURALS     Yes [$package]
diff -r b531eb1d4872 -r 5a97d61986a1 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Jul 21 19:08:56 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Jul 21 19:09:23 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.658 2006/07/21 05:02:52 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.659 2006/07/21 19:09:23 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -6281,7 +6281,7 @@
                if ($languages_line->text =~ regex_varassign) {
                        my (undef, $op, $value, undef) = ($1, $2, $3, $4);
 
-                       if ($value !~ qr"\bc\b") {
+                       if ($value !~ qr"(?:^|\s+)c(?:\s+|$)") {
                                $pkgctx_vardef->{"GNU_CONFIGURE"}->log_warning("GNU_CONFIGURE almost always needs a C compiler, ...");
                                $languages_line->log_warning("... but \"c\" is not added to USE_LANGUAGES.");
                        }