[pkgsrc/trunk]: pkgsrc remove redundant do-install, CHECK_RELRO_SKIP, INSTALL...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc remove redundant do-install, CHECK_RELRO_SKIP, INSTALL...
From: tnn <tnn%pkgsrc.org@localhost>
Date: Sat, 09 Oct 2021 11:58:51 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/85a5084c9a27
branches:  trunk
changeset: 459555:85a5084c9a27
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Oct 09 10:41:07 2021 +0000

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

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

diffstat:

 databases/prometheus/Makefile       |  11 +++--------
 databases/promscale/Makefile        |   6 +-----
 databases/timescaledb-tune/Makefile |   7 +------
 devel/git-lfs/Makefile              |   4 +---
 devel/go-gopkgs/Makefile            |   5 +----
 devel/gopls/Makefile                |   4 +---
 net/go-dnstap/Makefile              |   9 ++++-----
 net/gunison/Makefile                |   4 +---
 net/rclone/Makefile                 |  10 +++-------
 net/terraform-provider-aws/Makefile |   7 +------
 security/2fa/Makefile               |   6 +-----
 security/age/Makefile               |   8 +-------
 security/amass/Makefile             |   8 +++-----
 security/go-mkcert/Makefile         |   7 +------
 sysutils/lf/Makefile                |   4 +---
 www/caddy/Makefile                  |  10 +---------
 www/grafana/Makefile                |   5 +----
 www/pup/Makefile                    |   8 +++-----
 18 files changed, 29 insertions(+), 94 deletions(-)

diffs (truncated from 407 to 300 lines):

diff -r 37629cc43c50 -r 85a5084c9a27 databases/prometheus/Makefile
--- a/databases/prometheus/Makefile     Sat Oct 09 09:52:16 2021 +0000
+++ b/databases/prometheus/Makefile     Sat Oct 09 10:41:07 2021 +0000
@@ -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+=        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 @@
                ${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 @@
        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 -r 37629cc43c50 -r 85a5084c9a27 databases/promscale/Makefile
--- a/databases/promscale/Makefile      Sat Oct 09 09:52:16 2021 +0000
+++ b/databases/promscale/Makefile      Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 .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 -r 37629cc43c50 -r 85a5084c9a27 databases/timescaledb-tune/Makefile
--- a/databases/timescaledb-tune/Makefile       Sat Oct 09 09:52:16 2021 +0000
+++ b/databases/timescaledb-tune/Makefile       Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 .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 -r 37629cc43c50 -r 85a5084c9a27 devel/git-lfs/Makefile
--- a/devel/git-lfs/Makefile    Sat Oct 09 09:52:16 2021 +0000
+++ b/devel/git-lfs/Makefile    Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 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 -r 37629cc43c50 -r 85a5084c9a27 devel/go-gopkgs/Makefile
--- a/devel/go-gopkgs/Makefile  Sat Oct 09 09:52:16 2021 +0000
+++ b/devel/go-gopkgs/Makefile  Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 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 -r 37629cc43c50 -r 85a5084c9a27 devel/gopls/Makefile
--- a/devel/gopls/Makefile      Sat Oct 09 09:52:16 2021 +0000
+++ b/devel/gopls/Makefile      Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 GO_BUILD_PATTERN=      .
 
-CHECK_RELRO_SKIP+=     bin/gopls
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"
diff -r 37629cc43c50 -r 85a5084c9a27 net/go-dnstap/Makefile
--- a/net/go-dnstap/Makefile    Sat Oct 09 09:52:16 2021 +0000
+++ b/net/go-dnstap/Makefile    Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 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 -r 37629cc43c50 -r 85a5084c9a27 net/gunison/Makefile
--- a/net/gunison/Makefile      Sat Oct 09 09:52:16 2021 +0000
+++ b/net/gunison/Makefile      Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 GO_BUILD_PATTERN=      .
 
-CHECK_RELRO_SKIP+=     bin/gunison
-
 .include "go-modules.mk"
 
 .include "../../x11/gtk3/buildlink3.mk"
diff -r 37629cc43c50 -r 85a5084c9a27 net/rclone/Makefile
--- a/net/rclone/Makefile       Sat Oct 09 09:52:16 2021 +0000
+++ b/net/rclone/Makefile       Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 LICENSE=       mit
 
 GO_BUILD_PATTERN=      --ldflags "-X github.com/rclone/rclone/fs.Version=${PKGVERSION_NOREV}"
-
-CHECK_RELRO_SKIP+=     bin/rclone
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-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 -r 37629cc43c50 -r 85a5084c9a27 net/terraform-provider-aws/Makefile
--- a/net/terraform-provider-aws/Makefile       Sat Oct 09 09:52:16 2021 +0000
+++ b/net/terraform-provider-aws/Makefile       Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 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 -r 37629cc43c50 -r 85a5084c9a27 security/2fa/Makefile
--- a/security/2fa/Makefile     Sat Oct 09 09:52:16 2021 +0000
+++ b/security/2fa/Makefile     Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 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 -r 37629cc43c50 -r 85a5084c9a27 security/age/Makefile
--- a/security/age/Makefile     Sat Oct 09 09:52:16 2021 +0000
+++ b/security/age/Makefile     Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 
 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 -r 37629cc43c50 -r 85a5084c9a27 security/amass/Makefile
--- a/security/amass/Makefile   Sat Oct 09 09:52:16 2021 +0000
+++ b/security/amass/Makefile   Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
 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 -r 37629cc43c50 -r 85a5084c9a27 security/go-mkcert/Makefile
--- a/security/go-mkcert/Makefile       Sat Oct 09 09:52:16 2021 +0000
+++ b/security/go-mkcert/Makefile       Sat Oct 09 10:41:07 2021 +0000
@@ -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 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/py-cElementTree py-cElementTree: needs wrappe...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/neon neon: update to 0.32.1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/py-cElementTree py-cElementTree: needs wrappe...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/neon neon: update to 0.32.1.
Indexes:
Home | Main Index | Thread Index | Old Index