Date: Sat, 12 Nov 2016 23:40:14 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426001 - in head/sysutils/consul: . files Message-ID: <201611122340.uACNeER3079622@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Nov 12 23:40:13 2016 New Revision: 426001 URL: https://svnweb.freebsd.org/changeset/ports/426001 Log: sysutils/consul: fix version string While here, remove web ui from distfile Reported by: Douglas Thrift <douglas@douglasthrift.net> Added: head/sysutils/consul/files/patch-version_version.go (contents, props changed) Modified: head/sysutils/consul/Makefile head/sysutils/consul/distinfo Modified: head/sysutils/consul/Makefile ============================================================================== --- head/sysutils/consul/Makefile Sat Nov 12 23:20:06 2016 (r426000) +++ head/sysutils/consul/Makefile Sat Nov 12 23:40:13 2016 (r426001) @@ -2,6 +2,7 @@ PORTNAME= consul PORTVERSION= 0.7.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -30,7 +31,8 @@ post-extract: do-build: @cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ - -ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/consul + -ldflags "-X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION}" \ + -o bin/consul do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/consul/bin/consul ${STAGEDIR}${PREFIX}/bin/consul Modified: head/sysutils/consul/distinfo ============================================================================== --- head/sysutils/consul/distinfo Sat Nov 12 23:20:06 2016 (r426000) +++ head/sysutils/consul/distinfo Sat Nov 12 23:40:13 2016 (r426001) @@ -1,5 +1,3 @@ TIMESTAMP = 1478821632 -SHA256 (consul_0.7.1_web_ui.zip) = 1b793c60e1af24cc470421d0411e13748f451b51d8a6ed5fcabc8d00bfb84264 -SIZE (consul_0.7.1_web_ui.zip) = 255257 SHA256 (hashicorp-consul-v0.7.1_GH0.tar.gz) = d1498c851df8aa150c7b4398fdbb74467af4949d20ce5b4840b88095fce71135 SIZE (hashicorp-consul-v0.7.1_GH0.tar.gz) = 4003354 Added: head/sysutils/consul/files/patch-version_version.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/consul/files/patch-version_version.go Sat Nov 12 23:40:13 2016 (r426001) @@ -0,0 +1,13 @@ +--- 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 = "" ++ VersionPrerelease = "" + ) + + // GetHumanVersion composes the parts of the version in a way that's suitable
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611122340.uACNeER3079622>