diff options
| author | sbd <sbd@pkgsrc.org> | 2012-05-08 23:11:48 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-05-08 23:11:48 +0000 |
| commit | fa4603b83156579042976a6184b21280c63ba071 (patch) | |
| tree | bb9912b78781b28afdaa15efbf2b01a9cb221ccd /pkgtools | |
| parent | 0623f1e90ee3cdcf0aae07089945e8edb4ef3067 (diff) | |
| download | pkgsrc-fa4603b83156579042976a6184b21280c63ba071.tar.gz | |
In parse_makefile_vars() inprove the pattern used to remove comments so
that it doesn't match on backslash quoted hash characters. PR/46422
Bump PKGVERSION.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 9a8d21cde3b..f76e1057d09 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2010/02/24 22:04:38 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/05/08 23:11:48 sbd Exp $ # -DISTNAME= lintpkgsrc-4.82 +DISTNAME= lintpkgsrc-4.83 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index f6ae00839b3..eb9aeb4afea 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #! @PERL@ -# $NetBSD: lintpkgsrc.pl,v 1.115 2007/11/22 09:36:38 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.116 2012/05/08 23:11:48 sbd Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -994,7 +994,7 @@ sub parse_makefile_vars($$) { } while ( defined( $_ = shift(@data) ) ) { - s/\s*#.*//; + s/\s*[^\\]#.*//; # Continuation lines # |