Index: head/sysutils/consul/Makefile
===================================================================
--- head/sysutils/consul/Makefile	(revision 446102)
+++ head/sysutils/consul/Makefile	(revision 446103)
@@ -1,55 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	consul
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.5
 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} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
 		-ldflags "\
+		-X github.com/hashicorp/consul/version.Version=${PORTVERSION}  \
 		-X github.com/hashicorp/consul/version.VersionPrerelease=  \
 		-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 <bsd.port.pre.mk>
 
 # 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 <bsd.port.post.mk>
Index: head/sysutils/consul/distinfo
===================================================================
--- head/sysutils/consul/distinfo	(revision 446102)
+++ head/sysutils/consul/distinfo	(revision 446103)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494608318
-SHA256 (hashicorp-consul-v0.8.3_GH0.tar.gz) = 8088ae2f4259a736400211eed63f6df3b5264f3a18d31b31845c4a4481b349ac
-SIZE (hashicorp-consul-v0.8.3_GH0.tar.gz) = 6513579
+TIMESTAMP = 1500310152
+SHA256 (hashicorp-consul-v0.8.5_GH0.tar.gz) = 3049ac26e6226b61af2d631d5705669cadb8bf3b0c7860e169590ce1472c6b64
+SIZE (hashicorp-consul-v0.8.5_GH0.tar.gz) = 6630059