[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Updated pkglint to 4.38.2.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8246a7ddad3c
branches:  trunk
changeset: 502793:8246a7ddad3c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 08 22:55:22 2005 +0000

description:
Updated pkglint to 4.38.2.

- pkglint(1) does not use the hard-coded PKGSRCDIR anymore.

This fix is related to PR 32006, but doesn't fix it, since the PR is
about lintpkgsrc(1), not pkglint(1).

diffstat:

 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (77 lines):

diff -r 7ced355eebb3 -r 8246a7ddad3c pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Tue Nov 08 22:32:33 2005 +0000
+++ b/pkgtools/pkglint/Makefile Tue Nov 08 22:55:22 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.287 2005/11/08 21:09:48 rillig Exp $
+# $NetBSD: Makefile,v 1.288 2005/11/08 22:55:22 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.38.1
+DISTNAME=      pkglint-4.38.2
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 7ced355eebb3 -r 8246a7ddad3c pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Nov 08 22:32:33 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Nov 08 22:55:22 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.340 2005/11/08 22:27:12 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.341 2005/11/08 22:55:22 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -494,8 +494,6 @@
 
 # Buildtime configuration
 use constant conf_rcsidstring  => 'NetBSD';
-use constant conf_pkgsrcdir    => '@PKGSRCDIR@';
-use constant conf_localbase    => '@PREFIX@';
 use constant conf_distver      => '@DISTVER@';
 use constant conf_make         => '@MAKE@';
 use constant conf_datadir      => '@DATADIR@';
@@ -606,6 +604,7 @@
 my $current_dir;               # The currently checked directory.
 my $is_wip;                    # Is the current directory from pkgsrc-wip?
 
+my $pkgsrcdir;                 # The pkgsrc root directory
 my $pkgdir;                    # PKGDIR from the package Makefile
 my $filesdir;                  # FILESDIR from the package Makefile
 my $patchdir;                  # PATCHDIR from the package Makefile
@@ -730,7 +729,7 @@
 my $load_dist_sites_url2name = undef;
 my $load_dist_sites_names = undef;
 sub load_dist_sites() {
-       my ($fname) = (conf_pkgsrcdir."/mk/bsd.sites.mk");
+       my ($fname) = ("${pkgsrcdir}/mk/bsd.sites.mk");
        my ($lines) = load_file($fname);
        my ($varname) = undef;
        my ($ignoring) = false;
@@ -1440,7 +1439,7 @@
 
        my $tools = {};
        foreach my $file (qw(autoconf automake ldconfig make replace rpcgen texinfo)) {
-               my $fname = conf_pkgsrcdir."/mk/tools/${file}.mk";
+               my $fname = "${pkgsrcdir}/mk/tools/${file}.mk";
                my $lines = load_lines($fname, true);
 
                if (!$lines) {
@@ -2845,13 +2844,16 @@
        $is_wip = !$opt_import && (Cwd::abs_path($dir) =~ qr"/wip(?:/|$)");
 
        if (-f "${dir}/../../mk/bsd.pkg.mk") {
+               $pkgsrcdir = "${dir}/../..";
                checkdir_package();
 
        } elsif (-f "${dir}/../mk/bsd.pkg.mk") {
                log_info(NO_FILE, NO_LINE_NUMBER, "Checking category Makefile.");
+               $pkgsrcdir = "${dir}/..";
                checkdir_category();
 
        } elsif (-f "${dir}/mk/bsd.pkg.mk") {
+               $pkgsrcdir = $dir;
                checkdir_root();
 
        } else {