svn commit: r511570 - head/sysutils/consul-replicate

[Tobias Kortkamp]

Author: tobik
Date: Sun Sep  8 12:24:20 2019
New Revision: 511570
URL: https://svnweb.freebsd.org/changeset/ports/511570

Log:
  sysutils/consul-replicate: Unbreak with go1.13
  
  ===>  Building for consul-replicate-0.4.0
  WORK=/tmp/go-build989497025
  /usr/local/go/src/net/http/h2_bundle.go:49:2: use of vendored package not allowed
  ../../../vendor/golang.org/x/net/http2/transport.go:31:2: use of vendored package not allowed
  *** Error code 1
  
  - Remove custom targets
  
  PR:		240173
  Submitted by:	Dmitri Goutnik <dg at syrec.org>
  Pointy hat:	jlaffaye

Modified:
  head/sysutils/consul-replicate/Makefile

Modified: head/sysutils/consul-replicate/Makefile
==============================================================================
--- head/sysutils/consul-replicate/Makefile	Sun Sep  8 12:18:47 2019	(r511569)
+++ head/sysutils/consul-replicate/Makefile	Sun Sep  8 12:24:20 2019	(r511570)
@@ -11,14 +11,18 @@ COMMENT=	Consul cross-DC KV replication daemon
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build
+USES=		go
 
-USES=		compiler go
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="\
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
+		"
+
 USE_RC_SUBR=	consul-replicate
 
 PLIST_FILES=	bin/${PORTNAME}
@@ -26,29 +30,4 @@ PLIST_FILES=	bin/${PORTNAME}
 USERS=		consul
 GROUPS=		consul
 
-post-extract:
-	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
-		${SETENV} CGO_ENABLED=0 ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
-		go build -v -x -ldflags "\
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION}  \
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2  \
-		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \
-		" -o bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go fails.
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>