Convert a few ports to use the new multi-github framework.

With hat:	portmgr
Sponsored by:	Absolight

2 files changed, 47 insertions, 63 deletions

diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 4e85d7bf4242..db04089ca78f 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -4,33 +4,7 @@ PORTNAME=	serf
 PORTVERSION=	0.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	GH \
-		https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \
-		https://github.com/armon/go-metrics/archive/eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz?dummy=/:group3 \
-		https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group4 \
-		https://github.com/hashicorp/go-syslog/archive/ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz?dummy=/:group5 \
-		https://github.com/hashicorp/logutils/archive/23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz?dummy=/:group6 \
-		https://github.com/hashicorp/memberlist/archive/9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz?dummy=/:group7 \
-		https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz?dummy=/:group8 \
-		https://github.com/hashicorp/mdns/archive/eb98accb64ea232136b5344464ed1d66d40f6196.tar.gz?dummy=/:group9 \
-		https://github.com/mitchellh/cli/archive/e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz?dummy=/:group10 \
-		https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group11 \
-		https://github.com/miekg/dns/archive/b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz?dummy=/:group12 \
-		https://github.com/hashicorp/go.net/archive/cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz?dummy=/:group13
 PKGNAMEPREFIX=	hashicorp-
-DISTFILES=	${DISTNAME}.tar.gz \
-		armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \
-		armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz:group3 \
-		hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group4 \
-		hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz:group5 \
-		hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz:group6 \
-		hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz:group7 \
-		mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz:group8 \
-		hashicorp_mdns_eb98accb64ea232136b5344464ed1d66d40f6196.tar.gz:group9 \
-		mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz:group10 \
-		ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group11 \
-		miekg_dns_b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz:group12 \
-		hashicorp_go.net_cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz:group13
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
@@ -40,7 +14,17 @@ LICENSE=	MPL
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp
+GH_ACCOUNT=	hashicorp:DEFAULT,go_msgpack,go_syslog,go_net,logutils,mdns,memberlist \
+		armon:circbuf,go_metrics miekg:dns mitchellh:cli,mapstructure \
+		ryanuber:columnize
+GH_PROJECT=	circbuf:circbuf cli:cli columnize:columnize dns:dns \
+		go-metrics:go_metrics go-msgpack:go_msgpack \
+		go-syslog:go_syslog go.net:go_net logutils:logutils \
+		mapstructure:mapstructure mdns:mdns memberlist:memberlist
+GH_TAGNAME=	23b0af5:logutils 442e588:mapstructure 44cb478:columnize \
+		71c2886:go_msgpack 9a1e242:memberlist ac3963b:go_syslog \
+		b65f52f:dns cbad13b:go_net e3c2e3d:cli eb0af21:go_metrics \
+		eb98acc:mdns f092b4f:circbuf
 
 USE_RC_SUBR=	serf
 
@@ -64,29 +48,29 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/miekg
 	@${MKDIR} ${WRKSRC}/src/github.com/ryanuber
 	@${MKDIR} ${WRKSRC}/src/code.google.com/p/go.net
-	@${MV} ${WRKDIR}/circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf \
+	@${MV} ${WRKSRC_circbuf} \
 		${WRKSRC}/src/github.com/armon/circbuf
-	@${MV} ${WRKDIR}/go-metrics-eb0af217e5e9747e41dd5303755356b62d28e3ec \
+	@${MV} ${WRKSRC_go_metrics} \
 		${WRKSRC}/src/github.com/armon/go-metrics
-	@${MV} ${WRKDIR}/go-msgpack-71c2886f5a673a35f909803f38ece5810165097b \
+	@${MV} ${WRKSRC_go_msgpack} \
 		${WRKSRC}/src/github.com/hashicorp/go-msgpack
-	@${MV} ${WRKDIR}/go-syslog-ac3963b72ac367e48b1e68a831e62b93fb69091c \
+	@${MV} ${WRKSRC_go_syslog} \
 		${WRKSRC}/src/github.com/hashicorp/go-syslog
-	@${MV} ${WRKDIR}/logutils-23b0af5510a2d1442103ef83ffcf53eb82f3debc \
+	@${MV} ${WRKSRC_logutils} \
 		${WRKSRC}/src/github.com/hashicorp/logutils
-	@${MV} ${WRKDIR}/memberlist-9a1e242e454d2443df330bdd51a436d5a9058fc4 \
+	@${MV} ${WRKSRC_memberlist} \
 		${WRKSRC}/src/github.com/hashicorp/memberlist
-	@${MV} ${WRKDIR}/mapstructure-442e588f213303bec7936deba67901f8fc8f18b1 \
+	@${MV} ${WRKSRC_mapstructure} \
 		${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKDIR}/mdns-eb98accb64ea232136b5344464ed1d66d40f6196 \
+	@${MV} ${WRKSRC_mdns} \
 		${WRKSRC}/src/github.com/hashicorp/mdns
-	@${MV} ${WRKDIR}/cli-e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0 \
+	@${MV} ${WRKSRC_cli} \
 		${WRKSRC}/src/github.com/mitchellh/cli
-	@${MV} ${WRKDIR}/columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a \
+	@${MV} ${WRKSRC_columnize} \
 		${WRKSRC}/src/github.com/ryanuber/columnize
-	@${MV} ${WRKDIR}/dns-b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641 \
+	@${MV} ${WRKSRC_dns} \
 		${WRKSRC}/src/github.com/miekg/dns
-	@${MV} ${WRKDIR}/go.net-cbad13bf000d0cbdbc71506b26e94bcc72bbe74d \
+	@${MV} ${WRKSRC_go_net} \
 		${WRKSRC}/src/github.com/hashicorp/go.net
 	@${CP} -r ${WRKSRC}/src/github.com/hashicorp/go.net/internal \
 		${WRKSRC}/src/code.google.com/p/go.net
diff --git a/sysutils/serf/distinfo b/sysutils/serf/distinfo
index 31dcaa37e451..2582093f2181 100644
--- a/sysutils/serf/distinfo
+++ b/sysutils/serf/distinfo
@@ -1,26 +1,26 @@
 SHA256 (hashicorp-serf-v0.6.4_GH0.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8
 SIZE (hashicorp-serf-v0.6.4_GH0.tar.gz) = 571489
-SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52
-SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748
-SHA256 (armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz) = fd94820df854d11839891e6d7e8b63e816061d33f8bf45349486ef73482190db
-SIZE (armon_go-metrics_eb0af217e5e9747e41dd5303755356b62d28e3ec.tar.gz) = 10476
-SHA256 (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8
-SIZE (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = 49485
-SHA256 (hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz) = 089a6bda3f17d3a4c0545325581da29572d522a934fa601ff872709d1f2a7304
-SIZE (hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz) = 4389
-SHA256 (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = d07a719321f39c5095f7922888cd798c78bf0268499562de8de3fa30acd8cbb2
-SIZE (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = 7686
-SHA256 (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 5ea2bb19997bce12b1d67a19611535233a76f84714ec8ecf5efb7e7f2faee5d8
-SIZE (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 49719
-SHA256 (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2
-SIZE (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = 12220
-SHA256 (hashicorp_mdns_eb98accb64ea232136b5344464ed1d66d40f6196.tar.gz) = ec4752c85366184a3a2f02c3338540a16a6a8a6fd45f423a5c34e2dd5b11f87e
-SIZE (hashicorp_mdns_eb98accb64ea232136b5344464ed1d66d40f6196.tar.gz) = 10635
-SHA256 (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 0a05aa6d4a4968c00689e6b28575140c3832812bfffe4e909ecbf05e7b7bce8a
-SIZE (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 12189
-SHA256 (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f
-SIZE (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 3680
-SHA256 (miekg_dns_b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz) = e0ab641bcdc92fbba5f18e707f8e49e95a870eb8a69d9bb3171089a3a78a5eac
-SIZE (miekg_dns_b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641.tar.gz) = 112698
-SHA256 (hashicorp_go.net_cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz) = f9ef1dd4099cda25b55fc50337bd2240a7a1e78ef4d7ca0c99eb3bf99f0cdee8
-SIZE (hashicorp_go.net_cbad13bf000d0cbdbc71506b26e94bcc72bbe74d.tar.gz) = 394297
+SHA256 (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 052a52b77e262daa6f4bb618970d6673dd77713be031c6da18bd3aff5bc1448d
+SIZE (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 49479
+SHA256 (hashicorp-go-syslog-ac3963b_GH0.tar.gz) = 0f2f37b490a498a6e8afac326dd5468e85b92d65a88bbd25c0645990fb4ae1ff
+SIZE (hashicorp-go-syslog-ac3963b_GH0.tar.gz) = 4388
+SHA256 (hashicorp-go.net-cbad13b_GH0.tar.gz) = 533f96f0c59fd24a3e552d3963d11a6a34c4e38e76e82e98beb0e48728c80521
+SIZE (hashicorp-go.net-cbad13b_GH0.tar.gz) = 394145
+SHA256 (hashicorp-logutils-23b0af5_GH0.tar.gz) = 357fe9e27ef2ca04df6a80d35d942cc017b426be8f0bcdaeef89b8b1ae0374f3
+SIZE (hashicorp-logutils-23b0af5_GH0.tar.gz) = 7690
+SHA256 (hashicorp-mdns-eb98acc_GH0.tar.gz) = 3a78a2e190ee174525d7c7688578ea1033b77b6a51b43ac8cd9df1db27c296d1
+SIZE (hashicorp-mdns-eb98acc_GH0.tar.gz) = 10626
+SHA256 (hashicorp-memberlist-9a1e242_GH0.tar.gz) = cff946936f358f99766f66032b01a36ad441cd95a256c04a0163ad17c83ef898
+SIZE (hashicorp-memberlist-9a1e242_GH0.tar.gz) = 49729
+SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b
+SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744
+SHA256 (armon-go-metrics-eb0af21_GH0.tar.gz) = cab4c42948fbfe2316ff31e89d9c84b52a377a9259d75c8cf26b33c99a9856fd
+SIZE (armon-go-metrics-eb0af21_GH0.tar.gz) = 10480
+SHA256 (miekg-dns-b65f52f_GH0.tar.gz) = b58d335fd9c0961207d3d7bd173d04f631f0e07bb4dfbe6bd62a8a58a7eb2416
+SIZE (miekg-dns-b65f52f_GH0.tar.gz) = 112584
+SHA256 (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 9042c6d2ad5da705c1ae7d0f12d07dc76e87f6dbea524df52edee0c00982cf36
+SIZE (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 12178
+SHA256 (mitchellh-mapstructure-442e588_GH0.tar.gz) = 5ca01f6ba1175733ae94a13e532e9465b11951519dcdcc6693651842ed1d6205
+SIZE (mitchellh-mapstructure-442e588_GH0.tar.gz) = 12216
+SHA256 (ryanuber-columnize-44cb478_GH0.tar.gz) = 6d69bf022706ff59a5e5478da7e437451b62dcc8c614fde10b104d830148644b
+SIZE (ryanuber-columnize-44cb478_GH0.tar.gz) = 3673