diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-20 10:55:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-20 10:55:43 +0000 |
| commit | 48d7945a64f28629d3792bb3772c3566386fc567 (patch) | |
| tree | 5bae29f507acc7c53f058f7033f6bf5182f5ff69 | |
| parent | ec147cbfcee2e5547fd3698dd8e90caa355c3434 (diff) | |
| download | pkgsrc-48d7945a64f28629d3792bb3772c3566386fc567.tar.gz | |
Updated lintpkgsrc to 4.43.1.
- In BATCH mode, that is for the bulk builds, hardcode PKGSRCDIR as
/usr/pkgsrc. Otherwise take ${PKGSRCDIR}.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 9 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 6c06fd1a51c..50d5c1091cf 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -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_CLASSES+= pkglint 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 --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 98c887d7d69..19613511e52 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -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>. # @@ -20,6 +20,11 @@ use Getopt::Std; 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 @@ my( $pkglist, # list of Pkg packages %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 @@ if ($opt{D} && @ARGV) } 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 @@ if ($opt{D} && @ARGV) { 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 @@ sub parse_makefile_pkgsrc { # 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; } } |