Index: head/sysutils/consul/pkg-plist =================================================================== --- head/sysutils/consul/pkg-plist (revision 437793) +++ head/sysutils/consul/pkg-plist (nonexistent) @@ -1 +0,0 @@ -bin/consul Property changes on: head/sysutils/consul/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/consul/Makefile =================================================================== --- head/sysutils/consul/Makefile (revision 437793) +++ head/sysutils/consul/Makefile (revision 437794) @@ -1,45 +1,53 @@ # $FreeBSD$ PORTNAME= consul PORTVERSION= 0.7.5 +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 +PLIST_FILES= bin/consul + USERS= consul GROUPS= consul post-extract: @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ + +post-patch: + @${REINPLACE_CMD} \ + -e "s!%%VERSION%%!${PORTVERSION}!g" \ + ${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}" \ -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/files/patch-version_version.go =================================================================== --- head/sysutils/consul/files/patch-version_version.go (revision 437793) +++ head/sysutils/consul/files/patch-version_version.go (revision 437794) @@ -1,13 +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 = "0.7.1" ++ Version = "%%VERSION%%" + VersionPrerelease = "" ) // GetHumanVersion composes the parts of the version in a way that's suitable