From owner-svn-ports-all@freebsd.org  Wed Apr  5 15:28:42 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84D1ED2F4B3;
 Wed,  5 Apr 2017 15:28:42 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56C7DA33;
 Wed,  5 Apr 2017 15:28:42 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v35FSfsM027926;
 Wed, 5 Apr 2017 15:28:41 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v35FSfQm027924;
 Wed, 5 Apr 2017 15:28:41 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201704051528.v35FSfQm027924@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 5 Apr 2017 15:28:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r437794 - in head/sysutils/consul: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Apr 2017 15:28:42 -0000

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 = ""
  )