[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Including "options.mk" does n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b480b53a4a2
branches:  trunk
changeset: 508035:4b480b53a4a2
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Feb 13 15:37:49 2006 +0000

description:
- Including "options.mk" does not qualify to using common Makefiles, which
  would suppress the variable order checking.
- Added an additional debugging statement to the variable ordering.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 053d5f28871b -r 4b480b53a4a2 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Feb 13 15:32:31 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Feb 13 15:37:49 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.513 2006/02/13 15:20:22 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.514 2006/02/13 15:37:49 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -1974,7 +1974,8 @@
                        if ($includefile =~ qr"(?:^|/)Makefile.common$"
                            || ($includefile =~ qr"^(?:\.\./(\.\./[^/]+/)?[^/]+/)?([^/]+)$"
                                && (!defined($1) || $1 ne "../mk")
-                               && $2 ne "buildlink3.mk")) {
+                               && $2 ne "buildlink3.mk"
+                               && $2 ne "options.mk")) {
                                $line->log_debug("including ${includefile} sets seen_Makefile_common.");
                                $seen_Makefile_common = true;
                        }
@@ -3349,6 +3350,8 @@
                my $line = $lines->[$lineno];
                my $text = $line->text;
 
+               $line->log_debug("[varorder] section ${sectindex} variable ${varindex}.");
+
                if ($next_section) {
                        $next_section = false;
                        $sectindex++;