Tue May 8 23:11:48 2012 UTC ()
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.


(sbd)
diff -r1.5 -r1.6 pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -r1.115 -r1.116 pkgsrc/pkgtools/pkglint/files/lintpkgsrc.pl
cvs diff -r1.5 -r1.6 pkgsrc/pkgtools/lintpkgsrc/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/lintpkgsrc/Makefile 2010/02/24 22:04:38 1.5
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile 2012/05/08 23:11:48 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2010/02/24 22:04:38 joerg Exp $ 1# $NetBSD: Makefile,v 1.6 2012/05/08 23:11:48 sbd Exp $
2# 2#
3 3
4DISTNAME= lintpkgsrc-4.82 4DISTNAME= lintpkgsrc-4.83
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= # none 6MASTER_SITES= # none
7DISTFILES= # none 7DISTFILES= # none
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.NetBSD.org/Documentation/pkgsrc/ 10HOMEPAGE= http://www.NetBSD.org/Documentation/pkgsrc/
11COMMENT= Sanity checks on the complete pkgsrc tree 11COMMENT= Sanity checks on the complete pkgsrc tree
12 12
13DEPENDS+= digest>=20010101:../../pkgtools/digest 13DEPENDS+= digest>=20010101:../../pkgtools/digest
14CONFLICTS+= pkglint<4.82 14CONFLICTS+= pkglint<4.82
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17 17
cvs diff -r1.115 -r1.116 pkgsrc/pkgtools/pkglint/files/Attic/lintpkgsrc.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/lintpkgsrc.pl 2007/11/22 09:36:38 1.115
+++ pkgsrc/pkgtools/pkglint/files/Attic/lintpkgsrc.pl 2012/05/08 23:11:48 1.116
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! @PERL@ 1#! @PERL@
2 2
3# $NetBSD: lintpkgsrc.pl,v 1.115 2007/11/22 09:36:38 rillig Exp $ 3# $NetBSD: lintpkgsrc.pl,v 1.116 2012/05/08 23:11:48 sbd Exp $
4 4
5# Written by David Brownlee <abs@netbsd.org>. 5# Written by David Brownlee <abs@netbsd.org>.
6# 6#
7# Caveats: 7# Caveats:
8# The 'Makefile parsing' algorithm used to obtain package versions and 8# The 'Makefile parsing' algorithm used to obtain package versions and
9# DEPENDS information is geared towards speed rather than perfection, 9# DEPENDS information is geared towards speed rather than perfection,
10# though it has gotten somewhat better over time, it only parses the 10# though it has gotten somewhat better over time, it only parses the
11# simpler Makefile conditionals. 11# simpler Makefile conditionals.
12# 12#
13# TODO: Handle fun DEPENDS like avifile-devel with 13# TODO: Handle fun DEPENDS like avifile-devel with
14# {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1} 14# {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
15 15
16$^W = 1; 16$^W = 1;
@@ -984,27 +984,27 @@ sub parse_makefile_vars($$) { @@ -984,27 +984,27 @@ sub parse_makefile_vars($$) {
984 $vars{'.CURDIR'} = $1; 984 $vars{'.CURDIR'} = $1;
985 985
986 } 986 }
987 else { 987 else {
988 $vars{'.CURDIR'} = getcwd; 988 $vars{'.CURDIR'} = getcwd;
989 } 989 }
990 990
991 $incdirs{ $vars{'.CURDIR'} } = 1; 991 $incdirs{ $vars{'.CURDIR'} } = 1;
992 if ( $opt{L} ) { 992 if ( $opt{L} ) {
993 print "$file\n"; 993 print "$file\n";
994 } 994 }
995 995
996 while ( defined( $_ = shift(@data) ) ) { 996 while ( defined( $_ = shift(@data) ) ) {
997 s/\s*#.*//; 997 s/\s*[^\\]#.*//;
998 998
999 # Continuation lines 999 # Continuation lines
1000 # 1000 #
1001 while ( substr( $_, -1 ) eq "\\" ) { 1001 while ( substr( $_, -1 ) eq "\\" ) {
1002 substr( $_, -2 ) = shift @data; 1002 substr( $_, -2 ) = shift @data;
1003 } 1003 }
1004 1004
1005 # Conditionals 1005 # Conditionals
1006 # 1006 #
1007 if (m#^\.\s*if(|def|ndef)\s+(.*)#) { 1007 if (m#^\.\s*if(|def|ndef)\s+(.*)#) {
1008 my ( $type, $false ); 1008 my ( $type, $false );
1009 1009
1010 $type = $1; 1010 $type = $1;