diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile index 3fe8ed001f19..621fb4296060 100644 --- a/sysutils/consul/Makefile +++ b/sysutils/consul/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 0.8.1 +PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -34,8 +34,11 @@ post-patch: ${WRKSRC}/version/version.go do-build: - @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ - -ldflags "-X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION}" \ + @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ + -ldflags "\ + -X github.com/hashicorp/consul/version.VersionPrerelease= \ + -X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION} \ + " \ -o bin/consul do-install: diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo index 1401c700cd0c..8e7c62c2276e 100644 --- a/sysutils/consul/distinfo +++ b/sysutils/consul/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492544138 -SHA256 (hashicorp-consul-v0.8.1_GH0.tar.gz) = 202ac732d076f43eb4cf0cccd21c6d8ccae4c4dcf4ef8223fbf08dd0e7d7cec6 -SIZE (hashicorp-consul-v0.8.1_GH0.tar.gz) = 5103830 +TIMESTAMP = 1494608318 +SHA256 (hashicorp-consul-v0.8.3_GH0.tar.gz) = 8088ae2f4259a736400211eed63f6df3b5264f3a18d31b31845c4a4481b349ac +SIZE (hashicorp-consul-v0.8.3_GH0.tar.gz) = 6513579 diff --git a/sysutils/consul/files/patch-version_version.go b/sysutils/consul/files/patch-version_version.go deleted file mode 100644 index a941f15780ec..000000000000 --- a/sysutils/consul/files/patch-version_version.go +++ /dev/null @@ -1,13 +0,0 @@ ---- version/version.go.orig 2016-11-10 20:33:01 UTC -+++ version/version.go -@@ -13,8 +13,8 @@ var ( - - // Release versions of the build. These will be filled in by one of the - // build tag-specific files. -- Version = "unknown" -- VersionPrerelease = "unknown" -+ Version = "%%VERSION%%" -+ VersionPrerelease = "" - ) - - // GetHumanVersion composes the parts of the version in a way that's suitable