svn commit: r507342 - head/databases/pgmetrics

[Tobias Kortkamp]

Author: tobik
Date: Fri Jul 26 07:30:33 2019
New Revision: 507342
URL: https://svnweb.freebsd.org/changeset/ports/507342

Log:
  databases/pgmetrics: Switch to USES=go:modules
  
  - Remove unneeded targets
  - Drop nop BUILD_AS_NON_ROOT while here
  - Fix build with go1.13beta1
  
  ===>  Building for pgmetrics-1.7.0
  $GOPATH/go.mod exists but should not
  *** Error code 1
  
  PR:		238930
  Submitted by:	Dmitri Goutnik <dg at syrec.org>
  Approved by:	girgen (maintainer timeout, 24 days)

Modified:
  head/databases/pgmetrics/Makefile

Modified: head/databases/pgmetrics/Makefile
==============================================================================
--- head/databases/pgmetrics/Makefile	Fri Jul 26 07:25:19 2019	(r507341)
+++ head/databases/pgmetrics/Makefile	Fri Jul 26 07:30:33 2019	(r507342)
@@ -11,30 +11,23 @@ COMMENT=	Collect and display info & stats from a runni
 
 LICENSE=	APACHE20
 
-USES=		go
+USES=		go:modules
 
 USE_GITHUB=	yes
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GH_ACCOUNT=	rapidloop
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}
-GH_TUPLE=	dustin:go-humanize:bb3d318650d4:go_humanize/src/github.com/dustin/go-humanize \
-		howeyc:gopass:bf9dde6d0d2c:gopass/src/github.com/howeyc/gopass \
-		pborman:getopt:7148bc3a4c30:getopt/src/github.com/pborman/getopt \
-		rapidloop:pq:40e32c5:pq/src/github.com/rapidloop/pq \
-		xdg-go:stringprep:v1.0.0:stringprepgo/src/github.com/xdg-go/stringprep \
-		xdg:stringprep:v1.0.0:stringprepxdg/src/github.com/xdg/stringprep \
-		golang:sys:37707fdb30a5:sys/src/golang.org/x/sys \
-		golang:crypto:432090b8f568:crypto/src/golang.org/x/crypto \
-		golang:text:v0.3.0:text/src/golang.org/x/text
+GH_TUPLE=	dustin:go-humanize:bb3d318650d4:go_humanize/vendor/github.com/dustin/go-humanize \
+		howeyc:gopass:bf9dde6d0d2c:gopass/vendor/github.com/howeyc/gopass \
+		pborman:getopt:7148bc3a4c30:getopt/vendor/github.com/pborman/getopt \
+		rapidloop:pq:40e32c5:pq/vendor/github.com/rapidloop/pq \
+		xdg-go:stringprep:v1.0.0:stringprepgo/vendor/github.com/xdg-go/stringprep \
+		xdg:stringprep:v1.0.0:stringprepxdg/vendor/github.com/xdg/stringprep \
+		golang:sys:37707fdb30a5:sys/vendor/golang.org/x/sys \
+		golang:crypto:432090b8f568:crypto/vendor/golang.org/x/crypto \
+		golang:text:v0.3.0:text/vendor/golang.org/x/text
 
-BUILD_AS_NON_ROOT=yes
-GO_ENV+=	"CGO_ENABLED=0"
-
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR}; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -ldflags "-s -w -X main.version=${PORTVERSION}" ./cmd/${PORTNAME}
-
-do-install:
-	@cd ${WRKSRC}/${GH_SUBDIR}; ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+GO_TARGET=	./cmd/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="-s -w -X main.version=${PORTVERSION}"
+CGO_ENABLED=	0
 
 .include <bsd.port.mk>