Index: head/sysutils/consul/Makefile =================================================================== --- head/sysutils/consul/Makefile (revision 426000) +++ head/sysutils/consul/Makefile (revision 426001) @@ -1,46 +1,48 @@ # $FreeBSD$ PORTNAME= consul PORTVERSION= 0.7.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org COMMENT= Service discovery and configuration made easy LICENSE= MPL BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go USES= compiler USE_GITHUB= yes GH_ACCOUNT= hashicorp GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} USE_RC_SUBR= consul USERS= consul GROUPS= consul STRIP= # stripping can break go binaries post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ 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 .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 Index: head/sysutils/consul/distinfo =================================================================== --- head/sysutils/consul/distinfo (revision 426000) +++ head/sysutils/consul/distinfo (revision 426001) @@ -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 Index: head/sysutils/consul/files/patch-version_version.go =================================================================== --- head/sysutils/consul/files/patch-version_version.go (nonexistent) +++ head/sysutils/consul/files/patch-version_version.go (revision 426001) @@ -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 Property changes on: head/sysutils/consul/files/patch-version_version.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property