Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Apr 2017 15:28:41 +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: r437794 - in head/sysutils/consul: . files
Message-ID:  <201704051528.v35FSfQm027924@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Apr  5 15:28:41 2017
New Revision: 437794
URL: https://svnweb.freebsd.org/changeset/ports/437794

Log:
  sysutils/consul: fix version
  
  PR:		218340
  Submitted by:	Dave Cottlehuber <dch@skunkwerks.at>

Deleted:
  head/sysutils/consul/pkg-plist
Modified:
  head/sysutils/consul/Makefile
  head/sysutils/consul/files/patch-version_version.go

Modified: head/sysutils/consul/Makefile
==============================================================================
--- head/sysutils/consul/Makefile	Wed Apr  5 15:15:20 2017	(r437793)
+++ head/sysutils/consul/Makefile	Wed Apr  5 15:28:41 2017	(r437794)
@@ -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}/
 
 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}" \

Modified: head/sysutils/consul/files/patch-version_version.go
==============================================================================
--- head/sysutils/consul/files/patch-version_version.go	Wed Apr  5 15:15:20 2017	(r437793)
+++ head/sysutils/consul/files/patch-version_version.go	Wed Apr  5 15:28:41 2017	(r437794)
@@ -6,7 +6,7 @@
  	// build tag-specific files.
 -	Version           = "unknown"
 -	VersionPrerelease = "unknown"
-+	Version           = "0.7.1"
++	Version           = "%%VERSION%%"
 +	VersionPrerelease = ""
  )
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704051528.v35FSfQm027924>