git: 3f4e9f1a3abd - main - sysutils/consul: Simplify MASTER_SITES

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f4e9f1a3abdb48f08dbaaaf8336bc5791afe416

commit 3f4e9f1a3abdb48f08dbaaaf8336bc5791afe416
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-05-17 18:20:38 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-05-18 16:09:10 +0000

    sysutils/consul: Simplify MASTER_SITES
    
    - Pet portclippy
---
 sysutils/consul/Makefile | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index f745eaa4f190..e2a61e9dc09c 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -2,18 +2,13 @@ PORTNAME=	consul
 PORTVERSION=	1.15.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/ \
-		https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/:api \
-		https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/:envoyextensions \
-		https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/:proto_public \
-		https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/:sdk \
-		https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/:troubleshoot
+MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
-		api/go.mod:api \
-		envoyextensions/go.mod:envoyextensions \
-		proto-public/go.mod:proto_public \
-		sdk/go.mod:sdk \
-		troubleshoot/go.mod:troubleshoot
+		api/go.mod \
+		envoyextensions/go.mod \
+		proto-public/go.mod \
+		sdk/go.mod \
+		troubleshoot/go.mod
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
@@ -24,11 +19,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 CPE_VENDOR=	hashicorp
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-
-GITID=		5e08e22
 USE_RC_SUBR=	consul
 
 GO_MODULE=	github.com/hashicorp/consul
@@ -42,15 +34,17 @@ SUB_LIST=	CONSUL_DBDIR=${CONSUL_DBDIR} \
 		GROUP=${CONSUL_GROUP} \
 		USER=${CONSUL_USER}
 
-CONSUL_USER?=	consul
-CONSUL_GROUP?=	consul
-CONSUL_DBDIR?=	/var/db/${PORTNAME}
-
 USERS=		${CONSUL_USER}
 GROUPS=		${CONSUL_GROUP}
 
 PLIST_FILES=	bin/consul
 
+CONSUL_USER?=	consul
+CONSUL_GROUP?=	consul
+CONSUL_DBDIR?=	/var/db/${PORTNAME}
+
+GITID=		5e08e22
+
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>