diff options
| author | wiz <wiz@pkgsrc.org> | 2015-01-10 20:12:24 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-01-10 20:12:24 +0000 |
| commit | 91e25b247be383fbd2479639b8e1d92b8753d9b4 (patch) | |
| tree | 45ed5ce7afbcb686d1858ab8bc1fc5e8fae1264d /pkgtools | |
| parent | a72237747f4cefa6cd01115fff53eb524db2ec3d (diff) | |
| download | pkgsrc-91e25b247be383fbd2479639b8e1d92b8753d9b4.tar.gz | |
Improve variable expansion, in particular improving EMACS packages.
From J. Lewis Muir.
Bump version.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index bb5dd4b49d0..5d9be352321 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2014/11/24 09:41:25 bsiegert Exp $ +# $NetBSD: Makefile,v 1.19 2015/01/10 20:12:24 wiz Exp $ -PKGNAME= lintpkgsrc-4.87 +PKGNAME= lintpkgsrc-4.88 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 3827d431699..fc2bfe4f8b3 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #! @PERL@ -# $NetBSD: lintpkgsrc.pl,v 1.4 2014/11/24 09:41:25 bsiegert Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.5 2015/01/10 20:12:24 wiz Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -1190,6 +1190,7 @@ sub parse_makefile_vars($$) { # fully expand if ( $incfile =~ m#/mk/bsd# || $incfile =~ /$magic_undefined/ + || $incfile =~ /\${/ || ( !$opt{d} && $incfile =~ m#/(buildlink[^/]*\.mk)# ) ) { debug("$file: .include \"$incfile\" skipped\n"); |