[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Updated lintpkgsrc to 4.43.1.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd041a3dbfb7
branches:  trunk
changeset: 503417:cd041a3dbfb7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 20 10:55:43 2005 +0000

description:
Updated lintpkgsrc to 4.43.1.

- In BATCH mode, that is for the bulk builds, hardcode PKGSRCDIR as
  /usr/pkgsrc. Otherwise take ${PKGSRCDIR}.

diffstat:

 pkgtools/pkglint/Makefile            |   9 +++++++--
 pkgtools/pkglint/files/lintpkgsrc.pl |  15 ++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diffs (84 lines):

diff -r e311ca9effb4 -r cd041a3dbfb7 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sun Nov 20 10:09:29 2005 +0000
+++ b/pkgtools/pkglint/Makefile Sun Nov 20 10:55:43 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.301 2005/11/19 17:23:49 rillig Exp $
+# $NetBSD: Makefile,v 1.302 2005/11/20 10:55:43 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.43
+DISTNAME=      pkglint-4.43.1
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -27,6 +27,11 @@
 SUBST_STAGE.pkglint=   post-configure
 SUBST_FILES.pkglint+=  lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl
 SUBST_FILES.pkglint+=  pkglint.0 pkglint.1 pkglint.pl
+.if defined(BATCH)
+SUBST_SED.pkglint+=    -e 's|@PKGSRCDIR@|/usr/pkgsrc|g'
+.else
+SUBST_SED.pkglint+=    -e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'
+.endif
 SUBST_SED.pkglint+=    -e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.pkglint+=    -e 's|@DISTVER@|${DISTNAME:S/pkglint-//}|g'
 SUBST_SED.pkglint+=    -e 's|@MAKE@|${MAKE}|g'
diff -r e311ca9effb4 -r cd041a3dbfb7 pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Sun Nov 20 10:09:29 2005 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Sun Nov 20 10:55:43 2005 +0000
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.105 2005/11/10 14:30:56 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.106 2005/11/20 10:55:43 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -20,6 +20,11 @@
 use File::Find;
 use File::Basename;
 use Cwd 'realpath', 'getcwd';
+
+# Buildtime configuration
+my $conf_pkgsrcdir             = '@PKGSRCDIR@';
+my $conf_prefix                        = '@PREFIX@';
+
 my(    $pkglist,               # list of Pkg packages
        $pkg_installver,        # installed version of pkg_install pseudo-pkg
        $default_vars,          # Set for Makefiles, inc PACKAGES & PKGSRCDIR
@@ -30,7 +35,7 @@
        %prebuilt_pkgdir_cache, # To avoid symlink loops in prebuilt_pkgdirs
        );
 
-$ENV{PATH} .= ':/bin:/usr/bin:/sbin:/usr/sbin:@PREFIX@/sbin:@PREFIX@/bin';
+$ENV{PATH} .= ":/bin:/usr/bin:/sbin:/usr/sbin:${conf_prefix}/sbin:${conf_prefix}/bin";
 
 if (! getopts('BDE:I:K:LM:OP:RSVdg:himopru', \%opt) || $opt{h} ||
        ! ( defined($opt{d}) || defined($opt{g}) || defined($opt{i}) ||
@@ -230,7 +235,7 @@
                    }
                print "\n";
                }
-           print "\nRunning '@MAKE@ fetch-list | sh' for each package:\n";
+           print "\nRunning '${conf_make} fetch-list | sh' for each package:\n";
            foreach my $pkgver (@update)
                {
                my($pkgdir);
@@ -240,7 +245,7 @@
                    { fail('Unable to determine '.$pkgver->pkg.' directory'); }
                print "$pkgsrcdir/$pkgdir\n";
                safe_chdir("$pkgsrcdir/$pkgdir");
-               system('@MAKE@ fetch-list | sh');
+               system("${conf_make} fetch-list | sh");
                }
            }
        }
@@ -756,7 +761,7 @@
        {
        # invoke make here as a last resort
        my($pkgsrcdir) = ($file =~ m:(/.*)/:);
-       my($makepkgname) = `cd $pkgsrcdir ; @MAKE@ show-vars VARNAMES=PKGNAME`;
+       my($makepkgname) = `cd $pkgsrcdir ; ${conf_make} show-vars VARNAMES=PKGNAME`;
        if ($makepkgname =~ /(.*)-(\d.*)/)
            { $pkgname = $makepkgname; }
        }