aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2017-04-05 23:28:41 +0800
committerswills <swills@FreeBSD.org>2017-04-05 23:28:41 +0800
commitbcbc6560eb1fca5edfbe3a9a3f077b4f3fde59b9 (patch)
treefe644f093a4a7e8575ef53061c2bf88eccfd4fd5 /sysutils
parent55db2204f966a188b42af045753e096eb51e249d (diff)
downloadfreebsd-ports-gnome-bcbc6560eb1fca5edfbe3a9a3f077b4f3fde59b9.tar.gz
freebsd-ports-gnome-bcbc6560eb1fca5edfbe3a9a3f077b4f3fde59b9.tar.zst
freebsd-ports-gnome-bcbc6560eb1fca5edfbe3a9a3f077b4f3fde59b9.zip
sysutils/consul: fix version
PR: 218340 Submitted by: Dave Cottlehuber <dch@skunkwerks.at>
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/consul/Makefile8
-rw-r--r--sysutils/consul/files/patch-version_version.go2
-rw-r--r--sysutils/consul/pkg-plist1
3 files changed, 9 insertions, 2 deletions
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 722fb127f232..9271d6ee420d 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -2,6 +2,7 @@
PORTNAME= consul
PORTVERSION= 0.7.5
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
@@ -20,12 +21,19 @@ 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}" \
diff --git a/sysutils/consul/files/patch-version_version.go b/sysutils/consul/files/patch-version_version.go
index 0fafb3b6a8c8..a941f15780ec 100644
--- a/sysutils/consul/files/patch-version_version.go
+++ b/sysutils/consul/files/patch-version_version.go
@@ -6,7 +6,7 @@
// build tag-specific files.
- Version = "unknown"
- VersionPrerelease = "unknown"
-+ Version = "0.7.1"
++ Version = "%%VERSION%%"
+ VersionPrerelease = ""
)
diff --git a/sysutils/consul/pkg-plist b/sysutils/consul/pkg-plist
deleted file mode 100644
index 9cd52cd81b38..000000000000
--- a/sysutils/consul/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/consul