 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.666 2020/07/31 22:39:36 rillig Exp $
+# $NetBSD: Makefile,v 1.667 2020/08/02 13:27:17 rillig Exp $
-PKGNAME=	pkglint-20.2.5
+PKGNAME=	pkglint-20.2.6
 CATEGORIES=	pkgtools
 DISTNAME=	tools
 MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=	tools
 GITHUB_TAG=	92d8274bd7b8a4c65f24bafe401a029e58392704
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	https://github.com/rillig/pkglint
 COMMENT=	Verifier for NetBSD packages
 LICENSE=	2-clause-bsd
 CONFLICTS+=	pkglint4-[0-9]*
 USE_TOOLS+=		pax

 @@ -357,40 +357,40 @@ func (p *MkLexer) varUseModifier(varname
+	}
 	return ""
+}
 // varUseModifierTs parses the :ts modifier.
 //
 // The API of this method is tricky.
 // It is only extracted from varUseModifier to make the latter smaller.
 func (p *MkLexer) varUseModifierTs(
 	mod string, closing byte, lexer *textproc.Lexer, varname string,
 	mark textproc.LexerMark) MkVarUseModifier {
-	// See devel/bmake/files/var.c:/case 't'
+	// See devel/bmake/files/var.c:/^ApplyModifier_ToSep/
 	sep := mod[2:] + p.varUseText(closing)
 	switch {
 	case sep == "":
 		lexer.SkipString(":")
 	case len(sep) == 1:
 		break
 	case matches(sep, `^\\\d+`):
 		break
 	default:
 		p.Warnf("Invalid separator %q for :ts modifier of %q.", sep, varname)
 		p.Explain(
 			"The separator for the :ts modifier must be either a single character",
-			"or an escape sequence like \\t or \\n or an octal or decimal escape",
+			"or an escape sequence like \\t or \\n or an octal or hexadecimal escape",
 			"sequence; see the bmake man page for further details.")
+	}
 	return MkVarUseModifier(lexer.Since(mark))
+}
 // varUseModifierMatch parses an :M or :N pattern.
 //
 // See devel/bmake/files/var.c:/^ApplyModifiers/, case 'M'.
 func (p *MkLexer) varUseModifierMatch(closing byte) MkVarUseModifier {
 	lexer := p.lexer
 	mark := lexer.Mark()
 	lexer.Skip(1)
 	opening := byte(condInt(closing == '}', '{', '('))

 @@ -631,28 +631,28 @@ func (s *Suite) Test_MkLexer_varUseModif
 	t.SetUpCommandLine("-Wall", "--explain")
 	line := t.NewLine("filename.mk", 123, "${VAR:tsabc}")
 	p := NewMkLexer("tsabc}", line)
 	modifier := p.varUseModifier("VAR", '}')
 	t.CheckEquals(modifier, MkVarUseModifier("tsabc"))
 	t.CheckEquals(p.Rest(), "}")
 	t.CheckOutputLines(
 		"WARN: filename.mk:123: Invalid separator \"abc\" for :ts modifier of \"VAR\".",
 		"",
 		"\tThe separator for the :ts modifier must be either a single character",
-		"\tor an escape sequence like \\t or \\n or an octal or decimal escape",
+		"\tor an escape sequence like \\t or \\n or an octal or hexadecimal",
-		"\tsequence; see the bmake man page for further details.",
+		"\tescape sequence; see the bmake man page for further details.",
 		"")
+}
 func (s *Suite) Test_MkLexer_varUseModifier__invalid_ts_modifier_without_warning(c *check.C) {
 	t := s.Init(c)
 	p := NewMkLexer("tsabc}", nil)
 	modifier := p.varUseModifier("VAR", '}')
 	t.CheckEquals(modifier, MkVarUseModifier("tsabc"))
 	t.CheckEquals(p.Rest(), "}")
+}

 @@ -286,43 +286,58 @@ func (ck *PatchChecker) checkAddedAbsPat
 	line := ck.llex.PreviousLine()
 	// Remove the #define from C and C++ macros.
 	before = replaceAll(before, `^[ \t]*#[ \t]*define[ \t]*\w+[ \t]*(.+)[ \t]*$`, "$1")
 	// Remove the "set(VAR" from CMakeLists.txt.
 	before = replaceAll(before, `^[ \t]*set\(\w+[ \t]*`, "")
 	// Ignore comments in shell programs.
 	if hasPrefix(trimHspace(before), "#") {
 		return
+	}
-	// Ignore paths inside C-style comments.
+	// Ignore paths inside C-style block comments.
 	if contains(before, "/*") && contains(after, "*/") {
 		return
+	}
 	// Ignore paths inside multiline C-style block comments.
 	if hasPrefix(trimHspace(before), "*") {
 		return
+	}
 	// Ignore paths inside C-style end-of-line comments.
 	if contains(before, "//") {
 		return
+	}
 	// Ignore composed C string literals such as PREFIX "/etc".
 	if matches(before, `\w+[ \t]*"$`) {
 		return
+	}
 	// Ignore shell literals such as $PREFIX/etc.
 	// But keep compiler options like -I/usr/pkg even though they look
 	// like a relative pathname.
 	if matches(before, `\w$`) && !matches(before, `(^|[ \t])-(I|L|R|rpath|Wl,-R)$`) {
 		return
+	}
 	// Allow well-known pathnames that belong to the base system.
 	if matches(after, `hosts|passwd|shadow`) {
 		return
+	}
 	switch dir {
 	case "/usr/pkg":
 		line.Errorf("Patches must not hard-code the pkgsrc PREFIX.")
 		line.Explain(
 			"Not every pkgsrc installation uses /usr/pkg as its PREFIX.",
 			"To keep the PREFIX configurable, the patch files should contain",
 			"the placeholder @PREFIX@ instead.",
 			"",
 			"In the pre-configure stage, this placeholder should then be",
 			"replaced with the actual configuration directory",
 			"using a SUBST block containing SUBST_VARS.dirs=PREFIX.",
 			"See mk/subst.mk for details.")

 @@ -965,48 +965,70 @@ func (s *Suite) Test_PatchChecker_checkA
 	// There should be an additional warning for using COMPILER_RPATH_FLAG.
 	test(
 		"LDFLAGS+= -rpath/usr/pkg/lib",
 		"ERROR: patch-file:8: Patches must not hard-code the pkgsrc PREFIX.")
 	// Makefile with flags for the linker.
 	// There should be an additional warning for using COMPILER_RPATH_FLAG.
 	test(
 		"LDFLAGS+= -Wl,-R/usr/pkg/lib",
 		"ERROR: patch-file:8: Patches must not hard-code the pkgsrc PREFIX.")
 	// The dot before the "/etc" makes it a relative pathname.
 	test(
-		"cp ./etc/hostname /tmp")
+		"cp ./etc/hostname /tmp",
 		nil...)
 	// +>	+#	from /etc/inittab (SYSV systems)
 	// +ERROR: devel/tet3/patches/patch-ac:51: Patches must not hard-code the pkgsrc PKG_SYSCONFDIR.
 	test(
-		"# SysV /etc/install, /usr/sbin/install")
+		"# SysV /etc/install, /usr/sbin/install",
 		nil...)
 	// C or C++ program, macro definition.
 	// This is an absolute path since the PID_FILE is the macro name,
 	// and not part of the macro body containing the path.
 	test(
 		"#define PID_FILE \"/var/run/daemon.pid\"",
 		"ERROR: patch-file:8: Patches must not hard-code the pkgsrc VARBASE.")
 	// This is a relative path because of the PREFIX before it.
 	test(
 		"#define PID_FILE PREFIX \"/etc/conf\"",
 		nil...)
 	// In C-style block comments, absolute pathnames are ok,
 	// even though they could still be confusing.
 	test(
 		"#define L 150 /* Length of a line in /etc/some/file */",
 		nil...)
 	// In multiline C-style block comment, absolute pathnames are ok,
 	// even though they could still be confusing.
 	test(
 		" * Length of a line in /etc/some/file",
 		nil...)
 	// In C-style end-of-line comments, absolute pathnames are ok,
 	//	// even though they could still be confusing.
 	test(
 		"#define L 150 // Length of a line in /etc/some/file",
 		nil...)
 	// Allow /etc/passwd, /etc/shadow, /etc/hosts and their variants.
 	// These belong to the base system, not to pkgsrc.
 	test(
-		"#define L 150 /* Length of a line in /etc/passwd */",
+		"#define PATH_SHADOW \"/etc/master.passwd\"",
 		nil...)
 	test(
 		"#define PID_FILE \"/var/run/daemon.pid\" /* comment */",
 		"ERROR: patch-file:8: Patches must not hard-code the pkgsrc VARBASE.")
 	// This is a rather theoretical case.
 	// Don't worry if pkglint doesn't complain about the absolute path here.
 	test(
 		"#define PID_FILE /* */ \"/var/run/daemon.pid\" /* */",
 		nil...)
 	// The absolute path occurs in a comment that is only opened but not closed.