From owner-svn-ports-head@freebsd.org Sun Sep 8 12:24:21 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 947F0F1D38; Sun, 8 Sep 2019 12:24:21 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46R9TK3N2sz3Lxf; Sun, 8 Sep 2019 12:24:21 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 574881DE63; Sun, 8 Sep 2019 12:24:21 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x88COL3E043146; Sun, 8 Sep 2019 12:24:21 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x88COLfG043145; Sun, 8 Sep 2019 12:24:21 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201909081224.x88COLfG043145@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 8 Sep 2019 12:24:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511570 - head/sysutils/consul-replicate X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/sysutils/consul-replicate X-SVN-Commit-Revision: 511570 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2019 12:24:21 -0000 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 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 - -# 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 +.include