Mon May 18 19:11:16 2020 UTC ()

pkgtools/pkglint: update to 20.1.7

Changes since 20.1.6:

Versioned Python dependencies may end with :test or :tool, as the code in
lang/python/versioned_dependencies.mk says.


(rillig)

diff -r1.645 -r1.646 pkgsrc/pkgtools/pkglint/Makefile
diff -r1.86 -r1.87 pkgsrc/pkgtools/pkglint/files/vartypecheck.go

--- pkgsrc/pkgtools/pkglint/Makefile 2020/05/17 07:07:18 1.645
+++ pkgsrc/pkgtools/pkglint/Makefile 2020/05/18 19:11:16 1.646

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.645 2020/05/17 07:07:18 rillig Exp $
+# $NetBSD: Makefile,v 1.646 2020/05/18 19:11:16 rillig Exp $
-PKGNAME=	pkglint-20.1.6
+PKGNAME=	pkglint-20.1.7
 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

--- pkgsrc/pkgtools/pkglint/files/Attic/vartypecheck.go 2020/05/08 19:50:04 1.86
+++ pkgsrc/pkgtools/pkglint/files/Attic/vartypecheck.go 2020/05/18 19:11:16 1.87

 @@ -1133,33 +1133,36 @@ func (cv *VartypeCheck) PrefixPathname()
 	if m, manSubdir := match1(cv.Value, `^man/(.+)`); m {
 		from := "${PKGMANDIR}/" + manSubdir
 		fix := cv.Autofix()
 		fix.Warnf("Please use %q instead of %q.", from, cv.Value)
 		fix.Replace(cv.Value, from)
 		fix.Apply()
+	}
+}
 func (cv *VartypeCheck) PythonDependency() {
 	if cv.Value != cv.ValueNoVar {
 		cv.Warnf("Python dependencies should not contain variables.")
-	} else if !matches(cv.ValueNoVar, `^[+\-.0-9A-Z_a-z]+(?:|:link|:build)$`) {
+	} else if !matches(cv.ValueNoVar, `^[+\-.0-9A-Z_a-z]+(?:|:link|:build|:test|:tool)$`) {
 		cv.Warnf("Invalid Python dependency %q.", cv.Value)
 		cv.Explain(
 			"Python dependencies must be an identifier for a package, as",
 			"specified in lang/python/versioned_dependencies.mk.",
-			"This identifier may be followed by :build for a build-time only",
+			"This identifier may be followed by:",
-			"dependency, or by :link for a run-time only dependency.")
+			"\t:tool for a tool dependency,",
 			"\t:build for a build-time only dependency,",
 			"\t:test for a test-only dependency,",
 			"\t:link for a run-time dependency.")
+	}
+}
 func (cv *VartypeCheck) RPkgName() {
 	if cv.Op == opUseMatch {
 		return
+	}
 	if cv.Value != cv.ValueNoVar {
 		cv.Warnf("The R package name should not contain variables.")
 		return
+	}