CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Sat, 9 Oct 2021 10:41:10 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  9 10:41:10 UTC 2021

Modified Files:
        pkgsrc/databases/prometheus: Makefile
        pkgsrc/databases/promscale: Makefile
        pkgsrc/databases/timescaledb-tune: Makefile
        pkgsrc/devel/git-lfs: Makefile
        pkgsrc/devel/go-gopkgs: Makefile
        pkgsrc/devel/gopls: Makefile
        pkgsrc/net/go-dnstap: Makefile
        pkgsrc/net/gunison: Makefile
        pkgsrc/net/rclone: Makefile
        pkgsrc/net/terraform-provider-aws: Makefile
        pkgsrc/security/2fa: Makefile
        pkgsrc/security/age: Makefile
        pkgsrc/security/amass: Makefile
        pkgsrc/security/go-mkcert: Makefile
        pkgsrc/sysutils/lf: Makefile
        pkgsrc/www/caddy: Makefile
        pkgsrc/www/grafana: Makefile
        pkgsrc/www/pup: Makefile

Log Message:
remove redundant do-install, CHECK_RELRO_SKIP, INSTALLATIONS_DIRS ...

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


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/databases/prometheus/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/promscale/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/timescaledb-tune/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/git-lfs/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/go-gopkgs/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/gopls/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/go-dnstap/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/gunison/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/rclone/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/terraform-provider-aws/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/2fa/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/age/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/amass/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/go-mkcert/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/lf/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/caddy/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/grafana/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/pup/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/prometheus/Makefile
diff -u pkgsrc/databases/prometheus/Makefile:1.56 pkgsrc/databases/prometheus/Makefile:1.57
--- pkgsrc/databases/prometheus/Makefile:1.56   Fri Oct  8 18:55:08 2021
+++ pkgsrc/databases/prometheus/Makefile        Sat Oct  9 10:41:07 2021
@@ -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.exam
 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

Index: pkgsrc/databases/promscale/Makefile
diff -u pkgsrc/databases/promscale/Makefile:1.19 pkgsrc/databases/promscale/Makefile:1.20
--- pkgsrc/databases/promscale/Makefile:1.19    Fri Oct  8 18:55:08 2021
+++ pkgsrc/databases/promscale/Makefile Sat Oct  9 10:41:07 2021
@@ -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"

Index: pkgsrc/databases/timescaledb-tune/Makefile
diff -u pkgsrc/databases/timescaledb-tune/Makefile:1.8 pkgsrc/databases/timescaledb-tune/Makefile:1.9
--- pkgsrc/databases/timescaledb-tune/Makefile:1.8      Fri Oct  8 18:55:08 2021
+++ pkgsrc/databases/timescaledb-tune/Makefile  Sat Oct  9 10:41:08 2021
@@ -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"

Index: pkgsrc/devel/git-lfs/Makefile
diff -u pkgsrc/devel/git-lfs/Makefile:1.40 pkgsrc/devel/git-lfs/Makefile:1.41
--- pkgsrc/devel/git-lfs/Makefile:1.40  Sat Oct  9 09:24:29 2021
+++ pkgsrc/devel/git-lfs/Makefile       Sat Oct  9 10:41:07 2021
@@ -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"

Index: pkgsrc/devel/go-gopkgs/Makefile
diff -u pkgsrc/devel/go-gopkgs/Makefile:1.32 pkgsrc/devel/go-gopkgs/Makefile:1.33
--- pkgsrc/devel/go-gopkgs/Makefile:1.32        Fri Oct  8 18:55:12 2021
+++ pkgsrc/devel/go-gopkgs/Makefile     Sat Oct  9 10:41:08 2021
@@ -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"

Index: pkgsrc/devel/gopls/Makefile
diff -u pkgsrc/devel/gopls/Makefile:1.36 pkgsrc/devel/gopls/Makefile:1.37
--- pkgsrc/devel/gopls/Makefile:1.36    Fri Oct  8 18:55:10 2021
+++ pkgsrc/devel/gopls/Makefile Sat Oct  9 10:41:09 2021
@@ -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/
 
 GO_BUILD_PATTERN=      .
 
-CHECK_RELRO_SKIP+=     bin/gopls
-
 .include "go-modules.mk"
 
 .include "../../lang/go/go-module.mk"

Index: pkgsrc/net/go-dnstap/Makefile
diff -u pkgsrc/net/go-dnstap/Makefile:1.31 pkgsrc/net/go-dnstap/Makefile:1.32
--- pkgsrc/net/go-dnstap/Makefile:1.31  Fri Oct  8 18:55:02 2021
+++ pkgsrc/net/go-dnstap/Makefile       Sat Oct  9 10:41:08 2021
@@ -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"
 

Index: pkgsrc/net/gunison/Makefile
diff -u pkgsrc/net/gunison/Makefile:1.6 pkgsrc/net/gunison/Makefile:1.7
--- pkgsrc/net/gunison/Makefile:1.6     Fri Oct  8 18:55:04 2021
+++ pkgsrc/net/gunison/Makefile Sat Oct  9 10:41:10 2021
@@ -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"

Index: pkgsrc/net/rclone/Makefile
diff -u pkgsrc/net/rclone/Makefile:1.26 pkgsrc/net/rclone/Makefile:1.27
--- pkgsrc/net/rclone/Makefile:1.26     Fri Oct  8 18:55:04 2021
+++ pkgsrc/net/rclone/Makefile  Sat Oct  9 10:41:09 2021
@@ -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"

Index: pkgsrc/net/terraform-provider-aws/Makefile
diff -u pkgsrc/net/terraform-provider-aws/Makefile:1.31 pkgsrc/net/terraform-provider-aws/Makefile:1.32
--- pkgsrc/net/terraform-provider-aws/Makefile:1.31     Fri Oct  8 18:55:03 2021
+++ pkgsrc/net/terraform-provider-aws/Makefile  Sat Oct  9 10:41:09 2021
@@ -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"

Index: pkgsrc/security/2fa/Makefile
diff -u pkgsrc/security/2fa/Makefile:1.37 pkgsrc/security/2fa/Makefile:1.38
--- pkgsrc/security/2fa/Makefile:1.37   Fri Oct  8 18:55:05 2021
+++ pkgsrc/security/2fa/Makefile        Sat Oct  9 10:41:08 2021
@@ -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

Index: pkgsrc/security/age/Makefile
diff -u pkgsrc/security/age/Makefile:1.8 pkgsrc/security/age/Makefile:1.9
--- pkgsrc/security/age/Makefile:1.8    Fri Oct  8 18:55:06 2021
+++ pkgsrc/security/age/Makefile        Sat Oct  9 10:41:09 2021
@@ -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"

Index: pkgsrc/security/amass/Makefile
diff -u pkgsrc/security/amass/Makefile:1.17 pkgsrc/security/amass/Makefile:1.18
--- pkgsrc/security/amass/Makefile:1.17 Fri Oct  8 18:55:06 2021
+++ pkgsrc/security/amass/Makefile      Sat Oct  9 10:41:09 2021
@@ -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
 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
 

Index: pkgsrc/security/go-mkcert/Makefile
diff -u pkgsrc/security/go-mkcert/Makefile:1.29 pkgsrc/security/go-mkcert/Makefile:1.30
--- pkgsrc/security/go-mkcert/Makefile:1.29     Fri Oct  8 18:55:06 2021
+++ pkgsrc/security/go-mkcert/Makefile  Sat Oct  9 10:41:09 2021
@@ -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/v
 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"
 

Index: pkgsrc/sysutils/lf/Makefile
diff -u pkgsrc/sysutils/lf/Makefile:1.41 pkgsrc/sysutils/lf/Makefile:1.42
--- pkgsrc/sysutils/lf/Makefile:1.41    Fri Oct  8 18:55:09 2021
+++ pkgsrc/sysutils/lf/Makefile Sat Oct  9 10:41:10 2021
@@ -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-ru
 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"

Index: pkgsrc/www/caddy/Makefile
diff -u pkgsrc/www/caddy/Makefile:1.44 pkgsrc/www/caddy/Makefile:1.45
--- pkgsrc/www/caddy/Makefile:1.44      Fri Oct  8 18:55:06 2021
+++ pkgsrc/www/caddy/Makefile   Sat Oct  9 10:41:09 2021
@@ -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"

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.54 pkgsrc/www/grafana/Makefile:1.55
--- pkgsrc/www/grafana/Makefile:1.54    Fri Oct  8 18:55:07 2021
+++ pkgsrc/www/grafana/Makefile Sat Oct  9 10:41:10 2021
@@ -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}/li
 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

Index: pkgsrc/www/pup/Makefile
diff -u pkgsrc/www/pup/Makefile:1.41 pkgsrc/www/pup/Makefile:1.42
--- pkgsrc/www/pup/Makefile:1.41        Fri Oct  8 18:55:06 2021
+++ pkgsrc/www/pup/Makefile     Sat Oct  9 10:41:09 2021
@@ -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 li
 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"

Prev by Date: CVS commit: pkgsrc/devel/golint
Next by Date: CVS commit: pkgsrc/textproc/py-cElementTree
Previous by Thread: CVS commit: pkgsrc/devel/golint
Next by Thread: CVS commit: pkgsrc/textproc/py-cElementTree
Indexes:

Home | Main Index | Thread Index | Old Index