Index: branches/2020Q3/sysutils/consul/Makefile
===================================================================
--- branches/2020Q3/sysutils/consul/Makefile	(revision 545110)
+++ branches/2020Q3/sysutils/consul/Makefile	(revision 545111)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	consul
-PORTVERSION=	1.7.4
+PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 
 GO_BUILDFLAGS=	-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} \
 		"
 
 USE_RC_SUBR=	consul
 
 PLIST_FILES=	bin/consul
 
 ETCDIR=			${PREFIX}/etc/${PORTNAME}.d
 CONSUL_USER?=		consul
 CONSUL_GROUP?=		consul
 CONSUL_DBDIR?=		/var/db/${PORTNAME}
 
 USERS=		${CONSUL_USER}
 GROUPS=		${CONSUL_GROUP}
 
 SUB_LIST=	CONSUL_DBDIR=${CONSUL_DBDIR} \
-		GROUP=${GROUP} \
-		USER=${USER}
+		GROUP=${CONSUL_GROUP} \
+		USER=${CONSUL_USER}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}
 	${LN} -s ${WRKSRC}/api ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/api
 	${LN} -s ${WRKSRC}/sdk ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/sdk
 
 .include <bsd.port.mk>
Index: branches/2020Q3/sysutils/consul/distinfo
===================================================================
--- branches/2020Q3/sysutils/consul/distinfo	(revision 545110)
+++ branches/2020Q3/sysutils/consul/distinfo	(revision 545111)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591829205
-SHA256 (hashicorp-consul-v1.7.4_GH0.tar.gz) = 2b48f0f2cd38201aed032981626c64aab9cb2920385847f68251af049063b475
-SIZE (hashicorp-consul-v1.7.4_GH0.tar.gz) = 22787889
+TIMESTAMP = 1594045082
+SHA256 (hashicorp-consul-v1.8.0_GH0.tar.gz) = a87925bde6aecddf532dfd050e907b6a0a6447cdd5dc4f49b46d97c9f73b58f9
+SIZE (hashicorp-consul-v1.8.0_GH0.tar.gz) = 24065255
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 545110)
+++ branches/2020Q3	(revision 545111)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r541347