[pkgsrc/trunk]: pkgsrc/pkgtools In parse_makefile_vars() inprove the pattern ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c26f318ebf4
branches:  trunk
changeset: 603614:1c26f318ebf4
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Tue May 08 23:11:48 2012 +0000

description:
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:

 pkgtools/lintpkgsrc/Makefile         |  4 ++--
 pkgtools/pkglint/files/lintpkgsrc.pl |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 635100e0ab68 -r 1c26f318ebf4 pkgtools/lintpkgsrc/Makefile
--- a/pkgtools/lintpkgsrc/Makefile      Tue May 08 22:43:39 2012 +0000
+++ b/pkgtools/lintpkgsrc/Makefile      Tue May 08 23:11:48 2012 +0000
@@ -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 -r 635100e0ab68 -r 1c26f318ebf4 pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Tue May 08 22:43:39 2012 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Tue May 08 23:11:48 2012 +0000
@@ -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@localhost>.
 #
@@ -994,7 +994,7 @@
     }
 
     while ( defined( $_ = shift(@data) ) ) {
-        s/\s*#.*//;
+        s/\s*[^\\]#.*//;
 
         # Continuation lines
         #