 @@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.46 2022/08/04 21:55:57 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2022/08/09 18:14:22 rillig Exp $
-PKGNAME=	lintpkgsrc-4.99
+PKGNAME=	lintpkgsrc-2022.08.09
 CATEGORIES=	pkgtools
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Sanity checks on the complete pkgsrc tree
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
 TEST_DEPENDS+=	p5-File-Slurp>=0:../../devel/p5-File-Slurp
 TEST_DEPENDS+=	p5-IO-Null>=0:../../devel/p5-IO-Null
 CONFLICTS+=	pkglint<4.82
 USE_TOOLS+=	perl:run
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 AUTO_MKDIRS=	yes
 SUBST_CLASSES+=		lp
 SUBST_STAGE.lp=		post-configure
 SUBST_FILES.lp+=	lintpkgsrc.0 lintpkgsrc.1 lintpkgsrc.pl
 SUBST_SED.lp+=		-e 's;@PKGSRCDIR@;${BATCH:D/usr/pkgsrc:U${PKGSRCDIR}};g'
 SUBST_VARS.lp+=		MAKE
 SUBST_VARS.lp+=		PERL5

 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.56 2022/08/04 21:55:58 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.57 2022/08/09 18:14:22 rillig Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 use locale;
 @@ -864,40 +864,43 @@ sub list_pkgsrc_pkgdirs($$) {
 	if (!opendir(CAT, "$pkgsrcdir/$cat")) {
 		die("Unable to opendir($pkgsrcdir/$cat): $!");
+	}
 	@pkgdirs =
 	    sort grep($_ ne 'Makefile'
 		&& $_ ne 'pkg'
 		&& $_ ne 'CVS'
 		&& substr($_, 0, 1) ne '.',
 		readdir(CAT));
 	closedir(CAT);
 	@pkgdirs;
+}
 # Convert the glob pattern to a regular expression.
 # Return '' if the regular expression equals the glob expression.
 # Return undef on error.
 sub glob2regex($) {
 	my ($glob) = @_;
 	my (@chars, $in_alt);
 	my ($regex);
 	@chars = split(//, $glob);
 	while (defined($_ = shift @chars)) {
 		if ($_ eq '*') {
 			$regex .= '.*';
 		} elsif ($_ eq '?') {
 			$regex .= '.';
 		} elsif ($_ eq '+') {
-			$regex .= '.';
+			$regex .= '\\+';
-		} elsif ($_ eq '\\+') {
+		} elsif ($_ eq '\\') {
 			$regex .= $_ . shift @chars;
 		} elsif ($_ eq '.' || $_ eq '|') {
 			$regex .= quotemeta;
 		} elsif ($_ eq '{') {
 			$regex .= '(';
 			++$in_alt;
 		} elsif ($_ eq '}') {
 			if (!$in_alt) {
 				# Error
 				return undef;
+			}
 			$regex .= ')';
 			--$in_alt;

 @@ -1,62 +1,56 @@
-# $NetBSD: glob.t,v 1.4 2022/08/09 17:53:47 rillig Exp $
+# $NetBSD: glob.t,v 1.5 2022/08/09 18:14:22 rillig Exp $
 use strict;
 use warnings;
 use Test;
 BEGIN { plan tests => 12, onfail => sub { die } }
 require('../lintpkgsrc.pl');
 sub test_glob2regex() {
 	ok(glob2regex('*'), '^.*$');
 	ok(glob2regex('?'), '^.$');
 	# The '' means that the regular expression equals the glob.
 	ok(glob2regex('[a-z]'), '');
 	# The '' means that the regular expression equals the glob.
 	ok(glob2regex('[a-z0-9]'), '');
 	# The '' means that the regular expression equals the glob.
 	ok(glob2regex('[a-z0-9_]'), '');
 	# Outside of braces, the ',' is a regular character.
 	# The '' means that the regular expression equals the glob.
 	ok(glob2regex('a,b'), '');
 	# FIXME: Inside brackets, the '*' is a literal '*'.
 	ok(glob2regex('[*]'), '^[.*]$');
-	# FIXME: After a backslash, the '*' must be preserved.
+	ok(glob2regex('\*'), '');
 	ok(glob2regex('\*'), '^\.*$');
 	ok(glob2regex('*.[ch]'), '^.*\.[ch]$');
 	ok(glob2regex('{one,two}'), '^(one|two)$');
 	ok(glob2regex('{{thi,fou}r,fif}teen'), '^((thi|fou)r|fif)teen$');
 	# There is an unbalanced '}' at the very end.
 	ok(glob2regex('{{thi,fou}r,fif}teen}'), undef);
-	# XXX: Why is '+' turned into '.'?
+	ok(glob2regex('a+b|c'), '^a\+b\|c$');
 	ok(glob2regex('a+b|c'), '^a.b\|c$');
 	# XXX: Typo in the code, the case '\\+' is unreachable.
 	# Escaping the backslash works nevertheless.
 	ok(glob2regex('a\[b*'), '^a\[b.*$');
-	ok(glob2regex('a\+b'), '^a\.b$');
+	ok(glob2regex('a\+b'), '');
-	# FIXME: Must be '^a\?b$' instead.
+	ok(glob2regex('a\?b'), '');
 	ok(glob2regex('a\?b'), '^a\.b$');
 	# XXX: Depending on the exact implementation, the '\n' may be
 	# interpreted as a newline, a literal 'n' or a literal '\' 'n'.
 	ok(glob2regex('a\n*'), '^a\n.*$');
 	# https://gnats.netbsd.org/12996
 	ok(glob2regex('libsigc++'), '^libsigc\+\+$');
+}
 test_glob2regex();