From 742b4443993543cbcd267cfd6334037036158a63 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 10 Jan 2015 20:12:24 +0000 Subject: Improve variable expansion, in particular improving EMACS packages. From J. Lewis Muir. Bump version. --- pkgtools/lintpkgsrc/Makefile | 4 ++-- pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgtools') 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 . # @@ -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"); -- cgit v1.2.3