pkglint: use Go module build, simplify Makefile

Add a go.mod file to the sources and pull in goyacc through a TOOL_DEPENDS.
Bump version to 22.2.7.

5 files changed, 88 insertions, 40 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 57591fdded6..1d194509757 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,12 +1,7 @@
-# $NetBSD: Makefile,v 1.728 2022/09/07 09:32:24 bsiegert Exp $
+# $NetBSD: Makefile,v 1.729 2022/09/17 15:50:39 bsiegert Exp $
 
-PKGNAME=	pkglint-22.2.6
-PKGREVISION=	1
+PKGNAME=	pkglint-22.2.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
@@ -15,48 +10,35 @@ LICENSE=	2-clause-bsd
 CONFLICTS+=	pkglint4-[0-9]*
 
 USE_TOOLS+=		pax
-AUTO_MKDIRS=		yes
-GO_SRCPATH=		golang.org/x/tools
-GO_DIST_BASE=		${GO_SRCPATH}
-GO_BUILD_PATTERN=	netbsd.org/pkglint/...
-
 CHECK_RELRO_SKIP+=	bin/pkglint
 
+
 SUBST_CLASSES+=		pkglint
 SUBST_STAGE.pkglint=	post-configure
-SUBST_FILES.pkglint+=	${WRKSRC.pkglint}/pkglint.go
+SUBST_FILES.pkglint+=	${WRKSRC}/pkglint.go
 SUBST_SED.pkglint+=	-e s\|@VERSION@\|${PKGVERSION}\|g
 SUBST_SED.pkglint+=	-e s\|@BMAKE@\|${MAKE:T:Q}\|g
 
 EXTRACT_PAX_ARGS=	-s ',.*/CVS$$,,' -s ',.*/CVS/.*,,' -s ',.*/\..*,,'
 
-WRKSRC.tools=		${WRKSRC}/golang.org/x/tools
-WRKSRC.pkglint=		${WRKSRC}/netbsd.org/pkglint
-
-PREPEND_PATH+=		${WRKDIR}/bin	# for goyacc
+TOOL_DEPENDS+=		go-tools-[0-9]*:../../devel/go-tools
 
-post-extract:
-	${RUN} ${MKDIR} ${WRKSRC.pkglint}
-	${RUN} cd ${FILESDIR} && ${PAX} -rw ${EXTRACT_PAX_ARGS} . ${WRKSRC.pkglint}
-
-	${RUN} ${MKDIR} ${WRKSRC.tools}
-	${RUN} ${MV} ${WRKDIR}/tools-*/* ${WRKSRC.tools}
+do-extract:
+	${RUN} ${MKDIR} ${WRKSRC}
+	${RUN} cd ${FILESDIR} && ${PAX} -rw ${EXTRACT_PAX_ARGS} . ${WRKSRC}
 
 pre-build:
-	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v golang.org/x/tools/cmd/goyacc
-	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN}
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN}
 
 do-test:
-	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} test -vet=off -v ${GO_BUILD_PATTERN}
-
-do-install:
-	${RUN} cd ${WRKDIR} && ${PAX} -rw bin/pkglint ${DESTDIR}${PREFIX}
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} test -vet=off -v ${GO_BUILD_PATTERN}
 
 post-install: do-install-man
 
+.include "go-modules.mk"
+
 # This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
-.include "../../lang/go/go-package.mk"
-WRKSRC=		${WRKDIR}/src	# Is set unconditionally by go-package.mk
+.include "../../lang/go/go-module.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -75,10 +57,8 @@ PLIST.maninstall=	yes
 .endif
 
 do-install-man: .PHONY
-	${PLIST.catinstall:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
-	${PLIST.catinstall0:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
-	${PLIST.maninstall:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${PLIST.catinstall:D:U\:} ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
+	${PLIST.catinstall0:D:U\:} ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
+	${PLIST.maninstall:D:U\:} ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
-.include "../../devel/go-check/buildlink3.mk"
-.include "../../security/go-crypto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglint/distinfo b/pkgtools/pkglint/distinfo
index b58265851ab..9d43d277c7c 100644
--- a/pkgtools/pkglint/distinfo
+++ b/pkgtools/pkglint/distinfo
@@ -1,5 +1,35 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:11:08 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/09/17 15:50:39 bsiegert Exp $
 
-BLAKE2s (tools-92d8274bd7b8a4c65f24bafe401a029e58392704.tar.gz) = b49c6cb41376ab15785e1c05f95e8411c4b547178cc4c9b299f2e94495e6933b
-SHA512 (tools-92d8274bd7b8a4c65f24bafe401a029e58392704.tar.gz) = 92027f221aa802798fd9734ebfc020163ccded95f6f2b208f614f45d8eec4f988ad77b155330fe8933ba3ddefe65af961a808b515a9b48da381b31da4f0d04bf
-Size (tools-92d8274bd7b8a4c65f24bafe401a029e58392704.tar.gz) = 2741721 bytes
+BLAKE2s (github.com_kr_pretty_@v_v0.2.1.mod) = c7902e2b218e48371c72208ab3a42754282b425818489f0872c333e1dc01c1f7
+SHA512 (github.com_kr_pretty_@v_v0.2.1.mod) = b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+Size (github.com_kr_pretty_@v_v0.2.1.mod) = 72 bytes
+BLAKE2s (github.com_kr_pretty_@v_v0.2.1.zip) = 896e81e7424f14aad49573cc60ff40e3a1eb6ab08c9ba04f55523eac9c3a0954
+SHA512 (github.com_kr_pretty_@v_v0.2.1.zip) = 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
+Size (github.com_kr_pretty_@v_v0.2.1.zip) = 11508 bytes
+BLAKE2s (github.com_kr_pty_@v_v1.1.1.mod) = 40cf54480d039c9d4a2692ae500319fdc6cb62b869b60976b3df99163869894d
+SHA512 (github.com_kr_pty_@v_v1.1.1.mod) = 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+Size (github.com_kr_pty_@v_v1.1.1.mod) = 25 bytes
+BLAKE2s (github.com_kr_text_@v_v0.1.0.mod) = 680f50a44801214a99d92a8314fc050a200f0c8ee971e7c64ba69346c5554425
+SHA512 (github.com_kr_text_@v_v0.1.0.mod) = 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+Size (github.com_kr_text_@v_v0.1.0.mod) = 64 bytes
+BLAKE2s (github.com_kr_text_@v_v0.1.0.zip) = 4bef0ff8ec566270582dcd66cd961e217cf0e869c864ef19d535ee2639332a95
+SHA512 (github.com_kr_text_@v_v0.1.0.zip) = 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+Size (github.com_kr_text_@v_v0.1.0.zip) = 12591 bytes
+BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) = 3218fb197e3df718e689eb2e6187e8b6164db45fcd92c7b120f1805fb409353f
+SHA512 (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) = 8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3
+Size (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.mod) = 255 bytes
+BLAKE2s (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) = 936646a3872a7c2b5d8b94eedfe611742ba1c632de2854577a1fd1f0d605e001
+SHA512 (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) = 8850e5af000fc6f8ace471c19f7edce4da91025154415435723cfa6c355a13c2d7648b24010155de107444ffa07d6806a116a090420047627f511bd63482db8b
+Size (golang.org_x_crypto_@v_v0.0.0-20220829220503-c86fa9a7ed90.zip) = 1779881 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 66613eb38a59b8a7f75e1aaeb294a1c4ea290d4e9ae699137566025e50ed741c
+SHA512 (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+Size (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.mod) = 33 bytes
+BLAKE2s (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = bc46f9203ee9a65dead922f9a7b8b7433778b1da11a7d7f8738091dceb51939c
+SHA512 (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
+Size (golang.org_x_sys_@v_v0.0.0-20210615035016-665e8c7367d1.zip) = 1644123 bytes
+BLAKE2s (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.mod) = 535d854a3208e5345eb291d48f401669a53e91c1d94a7a383a10a2cadd71e823
+SHA512 (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.mod) = a2f9fd465e2e0c735ca80e04f2002e31cad434c5a3771a3adcdc7f9502f0caa7b27a5f17ec2cd95bcb214e12ac1200a78139db063d4384b864bd290cb6815e87
+Size (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.mod) = 71 bytes
+BLAKE2s (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.zip) = 0f65407cbdc610b7d793aabb53ce86f87039d306762692fafe04de7c6669d460
+SHA512 (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.zip) = b69b95251b63b6fd0ed1953dae01edefa52126e2168246bc2cdf067879ae5f830df4e610da45f5ac5aa4789f70d79da8a9bfa7af5b3786ef8f1e665a8b397e02
+Size (gopkg.in_check.v1_@v_v1.0.0-20201130134442-10cb98267c6c.zip) = 42835 bytes
diff --git a/pkgtools/pkglint/files/go.mod b/pkgtools/pkglint/files/go.mod
new file mode 100644
index 00000000000..cbf267b7450
--- /dev/null
+++ b/pkgtools/pkglint/files/go.mod
@@ -0,0 +1,14 @@
+module netbsd.org/pkglint
+
+go 1.18
+
+require (
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
+)
+
+require (
+	github.com/kr/pretty v0.2.1 // indirect
+	github.com/kr/text v0.1.0 // indirect
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+)
diff --git a/pkgtools/pkglint/files/go.sum b/pkgtools/pkglint/files/go.sum
new file mode 100644
index 00000000000..c829fabf2d7
--- /dev/null
+++ b/pkgtools/pkglint/files/go.sum
@@ -0,0 +1,11 @@
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/pkgtools/pkglint/go-modules.mk b/pkgtools/pkglint/go-modules.mk
new file mode 100644
index 00000000000..3159ee7da80
--- /dev/null
+++ b/pkgtools/pkglint/go-modules.mk
@@ -0,0 +1,13 @@
+# $NetBSD: go-modules.mk,v 1.1 2022/09/17 15:50:39 bsiegert Exp $
+
+GO_MODULE_FILES+=	github.com/kr/pretty/@v/v0.2.1.mod
+GO_MODULE_FILES+=	github.com/kr/pretty/@v/v0.2.1.zip
+GO_MODULE_FILES+=	github.com/kr/pty/@v/v1.1.1.mod
+GO_MODULE_FILES+=	github.com/kr/text/@v/v0.1.0.mod
+GO_MODULE_FILES+=	github.com/kr/text/@v/v0.1.0.zip
+GO_MODULE_FILES+=	golang.org/x/crypto/@v/v0.0.0-20220829220503-c86fa9a7ed90.mod
+GO_MODULE_FILES+=	golang.org/x/crypto/@v/v0.0.0-20220829220503-c86fa9a7ed90.zip
+GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod
+GO_MODULE_FILES+=	golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip
+GO_MODULE_FILES+=	gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod
+GO_MODULE_FILES+=	gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip