remove redundant do-install, CHECK_RELRO_SKIP, INSTALLATIONS_DIRS ...

... for packages where the go-module.mk defaults DTRT as-is.

18 files changed, 29 insertions, 94 deletions

diff --git a/databases/prometheus/Makefile b/databases/prometheus/Makefile
index 14e35f3b887..ab17f461b84 100644
--- a/databases/prometheus/Makefile
+++ b/databases/prometheus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2021/10/08 18:55:08 bsiegert Exp $
+# $NetBSD: Makefile,v 1.57 2021/10/09 10:41:07 tnn Exp $
 
 # Important: UI has to be manually built when updating. See instructions below.
 
@@ -78,7 +78,7 @@ EXAMPLE_FILES+=	consoles/index.html.example consoles/node-cpu.html \
 EXAMPLE_FILES+=	console_libraries/menu.lib console_libraries/prom.lib
 WEBUI_DIR=	${PREFIX}/share/prometheus
 
-INSTALLATION_DIRS+=	bin ${EXAMPLE_DIR} ${WEBUI_DIR}
+INSTALLATION_DIRS+=	${EXAMPLE_DIR} ${WEBUI_DIR}
 
 .for f in ${EXAMPLE_FILES}
 CONF_FILES+=	${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -90,12 +90,9 @@ do-build:
 		${GO} install -v -ldflags ${GO_LDFLAGS:Q} ./cmd/${f}/...
 .endfor
 
-do-install:
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \
 		${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
-.for f in prometheus promtool
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/${f} ${DESTDIR}${PREFIX}/bin
-.endfor
 .for f in consoles console_libraries
 	cd ${WRKSRC} && ${PAX} -rw ${f} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
 .endfor
@@ -103,8 +100,6 @@ do-install:
 	cd ${WRKSRC}/web/ui && ${PAX} -rw ${f} ${DESTDIR}${WEBUI_DIR}
 	${CHMOD} -R g-w ${DESTDIR}${WEBUI_DIR}/${f}
 .endfor
-
-post-install:
 .for f in ${EXAMPLE_FILES}
 	${CHMOD} ${NONBINMODE} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}/${f}
 .endfor
diff --git a/databases/promscale/Makefile b/databases/promscale/Makefile
index 9cffc54dec5..013030b6fea 100644
--- a/databases/promscale/Makefile
+++ b/databases/promscale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/10/08 18:55:08 bsiegert Exp $
+# $NetBSD: Makefile,v 1.20 2021/10/09 10:41:07 tnn Exp $
 
 DISTNAME=	promscale-0.6.0
 MASTER_SITES=	${MASTER_SITE_GITHUB:=timescale/}
@@ -14,10 +14,6 @@ LICENSE=	apache-2.0
 .include "go-modules.mk"
 
 GO_BUILD_PATTERN=	./cmd/promscale/...
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/promscale ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/timescaledb-tune/Makefile b/databases/timescaledb-tune/Makefile
index e2a2083afbb..89d8b7353f4 100644
--- a/databases/timescaledb-tune/Makefile
+++ b/databases/timescaledb-tune/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/10/08 18:55:08 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2021/10/09 10:41:08 tnn Exp $
 
 DISTNAME=	timescaledb-tune-0.11.1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=timescale/}
@@ -14,11 +14,6 @@ LICENSE=	apache-2.0
 .include "go-modules.mk"
 
 GO_BUILD_PATTERN=	./cmd/timescaledb-tune/...
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/timescaledb-tune	\
-	  ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile
index a261adbfb6f..01e5686e33d 100644
--- a/devel/git-lfs/Makefile
+++ b/devel/git-lfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/10/09 09:24:29 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2021/10/09 10:41:07 tnn Exp $
 
 DISTNAME=	git-lfs-2.13.3
 PKGREVISION=	7
@@ -15,8 +15,6 @@ NO_CONFIGURE=	yes
 USE_LANGUAGES=	c
 GO_BUILD_PATTERN=	.
 
-INSTALLATION_DIRS=	bin
-
 pre-build:
 	cp ${WRKSRC}/lfshttp/certs_openbsd.go ${WRKSRC}/lfshttp/certs_netbsd.go
 # generate content for "git-lfs --help"
diff --git a/devel/go-gopkgs/Makefile b/devel/go-gopkgs/Makefile
index 77df52ba0b7..ba2f1cd9ce2 100644
--- a/devel/go-gopkgs/Makefile
+++ b/devel/go-gopkgs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/10/08 18:55:12 bsiegert Exp $
+# $NetBSD: Makefile,v 1.33 2021/10/09 10:41:08 tnn Exp $
 
 DISTNAME=	gopkgs-2.1.2
 PKGNAME=	go-${DISTNAME}
@@ -17,9 +17,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/v2
 
 GO_BUILD_PATTERN=	./cmd/gopkgs
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/gopkgs ${DESTDIR}${PREFIX}/bin
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"
diff --git a/devel/gopls/Makefile b/devel/gopls/Makefile
index 78359d0a039..7c1e4691d7a 100644
--- a/devel/gopls/Makefile
+++ b/devel/gopls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/10/08 18:55:10 bsiegert Exp $
+# $NetBSD: Makefile,v 1.37 2021/10/09 10:41:09 tnn Exp $
 #
 # Release notes:
 # https://github.com/golang/tools/releases
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/tools-${GITHUB_TAG:S/\//-/}/gopls
 
 GO_BUILD_PATTERN=	.
 
-CHECK_RELRO_SKIP+=	bin/gopls
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"
diff --git a/net/go-dnstap/Makefile b/net/go-dnstap/Makefile
index 2ce93785fda..2dd0e64a867 100644
--- a/net/go-dnstap/Makefile
+++ b/net/go-dnstap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/10/08 18:55:02 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2021/10/09 10:41:08 tnn Exp $
 
 DISTNAME=		go-dnstap-0.4.0
 PKGREVISION=		6
@@ -13,11 +13,10 @@ LICENSE=		apache-2.0
 
 GO_BUILD_PATTERN=	./dnstap
 
-INSTALLATION_DIRS=	man/man8
+INSTALLATION_DIRS=	${PKGMANDIR}/man8
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/dnstap ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/dnstap/dnstap.8 ${DESTDIR}${PREFIX}/man/man8/
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/dnstap/dnstap.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "go-modules.mk"
 
diff --git a/net/gunison/Makefile b/net/gunison/Makefile
index 644969ee9d0..6127b0a9bad 100644
--- a/net/gunison/Makefile
+++ b/net/gunison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/10/08 18:55:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.7 2021/10/09 10:41:10 tnn Exp $
 
 DISTNAME=	gunison-0.1.0
 PKGREVISION=	5
@@ -15,8 +15,6 @@ USE_TOOLS+=	pkg-config
 
 GO_BUILD_PATTERN=	.
 
-CHECK_RELRO_SKIP+=	bin/gunison
-
 .include "go-modules.mk"
 
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 855d07e7318..930209f8cf3 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/10/08 18:55:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.27 2021/10/09 10:41:09 tnn Exp $
 
 # When updating changelog is available in
 # ${WRKSRC}/docs/content/changelog.md
@@ -14,13 +14,9 @@ COMMENT=	Rsync for cloud storage
 LICENSE=	mit
 
 GO_BUILD_PATTERN=	--ldflags "-X github.com/rclone/rclone/fs.Version=${PKGVERSION_NOREV}"
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
-CHECK_RELRO_SKIP+=	bin/rclone
-
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/rclone ${DESTDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/rclone.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "go-modules.mk"
diff --git a/net/terraform-provider-aws/Makefile b/net/terraform-provider-aws/Makefile
index 7dbf1959cb6..5d18fee8f60 100644
--- a/net/terraform-provider-aws/Makefile
+++ b/net/terraform-provider-aws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/10/08 18:55:03 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=	terraform-provider-aws-3.27.0
 PKGREVISION=	7
@@ -17,11 +17,6 @@ GO_BUILD_PATTERN=	.
 
 UNLIMIT_RESOURCES=	datasize virtualsize
 
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/terraform-provider-aws ${DESTDIR}${PREFIX}/bin
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"
diff --git a/security/2fa/Makefile b/security/2fa/Makefile
index c79d4a4947d..273bbf58f2d 100644
--- a/security/2fa/Makefile
+++ b/security/2fa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/10/08 18:55:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.38 2021/10/09 10:41:08 tnn Exp $
 
 DISTNAME=	2fa-1.2.0
 PKGREVISION=	5
@@ -12,10 +12,6 @@ HOMEPAGE=	${MASTER_SITE_GITHUB:=rsc/2fa/}
 COMMENT=	Command-line client for two-factor authentication
 LICENSE=	modified-bsd
 
-CHECK_RELRO_SKIP+=	bin/2fa
-
-INSTALLATION_DIRS=	bin
-
 pre-configure:
 	# Fix build error, invalid vendor/modules.txt.
 	${RM} -rf ${WRKSRC}/vendor
diff --git a/security/age/Makefile b/security/age/Makefile
index 012986c1d68..16d552732cd 100644
--- a/security/age/Makefile
+++ b/security/age/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/10/08 18:55:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=		age-1.0.0
 PKGREVISION=		2
@@ -15,11 +15,5 @@ LICENSE=		modified-bsd
 
 GO_BUILD_PATTERN=	filippo.io/age/cmd/...
 
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/age ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/age-keygen ${DESTDIR}${PREFIX}/bin
-
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/amass/Makefile b/security/amass/Makefile
index f95b8dea6fa..5fa1a05d4c2 100644
--- a/security/amass/Makefile
+++ b/security/amass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/10/08 18:55:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.18 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=	amass-3.11.13
 PKGREVISION=	6
@@ -13,12 +13,10 @@ COMMENT=	In-depth Attack Surface Mapping and Asset Discovery
 LICENSE=	apache-2.0
 
 GO_BUILD_PATTERN=	./cmd/amass
-CHECK_RELRO_SKIP+=	bin/amass
 
-INSTALLATION_DIRS+=	bin share/examples/amass share/examples/amass/wordlists
+INSTALLATION_DIRS+=	share/examples/amass share/examples/amass/wordlists
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/amass ${DESTDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/config.ini ${DESTDIR}${PREFIX}/share/examples/amass
 	${INSTALL_DATA} ${WRKSRC}/examples/wordlists/* ${DESTDIR}${PREFIX}/share/examples/amass/wordlists
 
diff --git a/security/go-mkcert/Makefile b/security/go-mkcert/Makefile
index 71a39cd3480..c1acf9c45f3 100644
--- a/security/go-mkcert/Makefile
+++ b/security/go-mkcert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/10/08 18:55:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.30 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=		mkcert-${GITHUB_TAG}
 PKGNAME=		go-mkcert-${VERSION}
@@ -17,8 +17,6 @@ LICENSE=		modified-bsd
 WRKSRC=			${WRKDIR}/mkcert-${VERSION}
 GO_BUILD_PATTERN=	github.com/FiloSottile/mkcert
 
-INSTALLATION_DIRS+=	bin
-
 GO_MODULE_FILES+=	software.sslmate.com/src/go-pkcs12/@v/v0.0.0-20180114231543-2291e8f0f237.mod
 GO_MODULE_FILES+=	golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod
 GO_MODULE_FILES+=	golang.org/x/tools/@v/v0.0.0-20191022074931-774d2ec196ee.mod
@@ -72,9 +70,6 @@ GO_MODULE_FILES+=	gopkg.in/errgo.v2/@v/v2.1.0.zip
 post-patch:
 	cd ${WRKSRC} && cp truststore_linux.go truststore_netbsd.go
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/mkcert ${DESTDIR}${PREFIX}/bin
-
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/sysutils/lf/Makefile b/sysutils/lf/Makefile
index 55dda20614b..2982778bd95 100644
--- a/sysutils/lf/Makefile
+++ b/sysutils/lf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/10/08 18:55:09 bsiegert Exp $
+# $NetBSD: Makefile,v 1.42 2021/10/09 10:41:10 tnn Exp $
 #
 
 DISTNAME=		lf-13
@@ -16,7 +16,5 @@ GO_MODULE_FILES+=	github.com/mattn/go-runewidth/@v/v0.0.4.zip
 GO_MODULE_FILES+=	github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.zip
 GO_MODULE_FILES+=	github.com/nsf/termbox-go/@v/v0.0.0-20190325093121-288510b9734e.mod
 
-CHECK_RELRO_SKIP+=	bin/lf
-
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 39f6faf6fe3..b49cc260a50 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2021/10/08 18:55:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.45 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=	caddy-2.4.5
 PKGREVISION=	1
@@ -12,16 +12,8 @@ COMMENT=	General-purpose web server
 LICENSE=	apache-2.0
 
 GO_BUILD_PATTERN=	./...
-
-CHECK_RELRO_SKIP+=	bin/caddy
-
 EXTRACT_USING=		bsdtar
 
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/caddy ${DESTDIR}${PREFIX}/bin
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"
diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index 5b501901ce2..24be3b9bf98 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2021/10/08 18:55:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.55 2021/10/09 10:41:10 tnn Exp $
 
 DISTNAME=	grafana-8.1.3
 PKGREVISION=	2
@@ -23,9 +23,6 @@ EXTRACT_DIR.${FE_DISTNAME}=	${WRKDIR}/linux
 CHECK_PORTABILITY_SKIP=		packaging/* devenv/*
 CHECK_PORTABILITY_SKIP+=	packages/grafana-toolkit/docker/*
 
-CHECK_RELRO_SKIP+=		bin/grafana-cli
-CHECK_RELRO_SKIP+=		bin/grafana-server
-
 USE_TOOLS+=			pax
 
 PUBLICDIR=	${PREFIX}/share/grafana/public
diff --git a/www/pup/Makefile b/www/pup/Makefile
index 4280ed26ca4..c942f34d3f7 100644
--- a/www/pup/Makefile
+++ b/www/pup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/10/08 18:55:06 bsiegert Exp $
+# $NetBSD: Makefile,v 1.42 2021/10/09 10:41:09 tnn Exp $
 
 DISTNAME=		pup-0.4.0
 PKGREVISION=		36
@@ -12,15 +12,13 @@ COMMENT=		Parsing HTML at the command line
 LICENSE=		mit
 
 GO_BUILD_PATTERN=	.
-
-INSTALLATION_DIRS+=	bin share/doc/pup
+INSTALLATION_DIRS+=	share/doc/pup
 
 pre-patch:
 	${CP} ${FILESDIR}/go.mod ${WRKSRC}
 	${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/pup ${DESTDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/pup
 
 .include "../../lang/go/go-module.mk"