[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files The PKGDIR variable is extracte...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f57ab8b9d3e8
branches:  trunk
changeset: 498750:f57ab8b9d3e8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Sep 02 10:11:24 2005 +0000

description:
The PKGDIR variable is extracted from the Makefile first, because other
variables like PATCHDIR and DISTINFO_FILE depend on it.

diffstat:

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

diffs (34 lines):

diff -r 3a92e7e07442 -r f57ab8b9d3e8 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Sep 02 08:14:25 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Sep 02 10:11:24 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.265 2005/09/02 01:03:20 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.266 2005/09/02 10:11:24 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1403,16 +1403,15 @@
                }
        }
 
+       $pkgdir = expand_variable($whole, "PKGDIR");
+       set_default_value(\$pkgdir, ".");
        $distinfo_file = expand_variable($whole, "DISTINFO_FILE");
+       set_default_value(\$distinfo_file, "distinfo");
        $filesdir = expand_variable($whole, "FILESDIR");
+       set_default_value(\$filesdir, "files");
        $patchdir = expand_variable($whole, "PATCHDIR");
-       $pkgdir = expand_variable($whole, "PKGDIR");
+       set_default_value(\$patchdir, "patches");
        $scriptdir = expand_variable($whole, "SCRIPTDIR");
-
-       set_default_value(\$distinfo_file, "distinfo");
-       set_default_value(\$filesdir, "files");
-       set_default_value(\$patchdir, "patches");
-       set_default_value(\$pkgdir, ".");
        set_default_value(\$scriptdir, "scripts");
 
        log_subinfo($subr, NO_FILE, NO_LINE_NUMBER, "DISTINFO_FILE=$distinfo_file");