Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2015 16:37:50 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387743 - in head: databases/leofs emulators/ppsspp net/syncthing-cli net/syncthing-discosrv sysutils/consul sysutils/osquery sysutils/serf textproc/consul-template
Message-ID:  <201505281637.t4SGboDe021000@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu May 28 16:37:49 2015
New Revision: 387743
URL: https://svnweb.freebsd.org/changeset/ports/387743

Log:
  Convert a few ports to use the new multi-github framework.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/databases/leofs/Makefile
  head/databases/leofs/distinfo
  head/emulators/ppsspp/Makefile
  head/net/syncthing-cli/Makefile
  head/net/syncthing-cli/distinfo
  head/net/syncthing-discosrv/Makefile
  head/net/syncthing-discosrv/distinfo
  head/sysutils/consul/Makefile
  head/sysutils/consul/distinfo
  head/sysutils/osquery/Makefile
  head/sysutils/osquery/distinfo
  head/sysutils/serf/Makefile
  head/sysutils/serf/distinfo
  head/textproc/consul-template/Makefile
  head/textproc/consul-template/distinfo

Modified: head/databases/leofs/Makefile
==============================================================================
--- head/databases/leofs/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/databases/leofs/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -11,7 +11,6 @@ COMMENT=	Highly scalable, fault-tolerant
 LICENSE=	APACHE20
 
 DISTFILES=	leofs-${PORTVERSION}.tar.gz
-EXTRACT_ONLY=	leofs-${PORTVERSION}.tar.gz
 
 DIST_SUBDIR=	${PORTNAME}
 
@@ -66,75 +65,66 @@ MAKE_JOBS_UNSAFE=yes
 MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang17/bin:${PATH}
 
 LEOFS_DEPS=	\
-	leo-project/leo_gateway=${PORTVERSION}?5396417:leo_gateway \
-	leo-project/leo_manager=${PORTVERSION}?bf32076:leo_manager \
-	leo-project/leo_storage=${PORTVERSION}?42e8f25:leo_storage \
-	DeadZen/goldrush=0.1.6?71e6321:goldrush \
-	basho/bitcask=2.0.0?c74d0c4:bitcask \
-	basho/cuttlefish=2.0.1?c92c832:cuttlefish \
-	basho/eleveldb=2.1.0?a36dbd6:eleveldb \
-	basho/lager=2.0.3?b6b6ceb:lager \
-	basho/leveldb=2.0.0?d1a95db:leveldb \
-	davisp/jiffy=0.13.3?137d3d9:jiffy \
-	eproxus/meck=0.8.2?dde7590:meck \
-	extend/cowlib=1.0.0?d544a49:cowlib \
-	extend/ranch=1.0.0?adf1822:ranch \
-	ferd/recon=2.2.1?3578fa8:recon \
-	jcomellas/getopt=v0.4.3?659a28f:getopt \
-	leo-project/bear=0.8.2-for-leofs?7344c93:bear \
-	leo-project/elarm=d237636?d237636:elarm \
-	leo-project/erlang-lz4=0.2.2?80a5777:lz4 \
-	leo-project/erpcgen=0.2.3?b35d6b8:erpcgen \
-	leo-project/folsom=0.8.2-for-leofs?26a935b:folsom \
-	leo-project/leo_backend_db=1.1.8?1cef70a:leo_backend_db \
-	leo-project/leo_cache=0.6.3?c0f4edc:leo_cache \
-	leo-project/leo_commons=1.1.1?aac81f7:leo_commons \
-	leo-project/leo_dcerl=0.2.12?c0a7da2:leo_dcerl \
-	leo-project/leo_logger=1.1.5?80a4688:leo_logger \
-	leo-project/leo_mcerl=0.4.1?addcda0:leo_mcerl \
-	leo-project/leo_mq=1.3.9?a1aecec:leo_mq \
-	leo-project/leo_object_storage=1.2.7?516a9ea:leo_object_storage \
-	leo-project/leo_ordning_reda=1.0.0?e4ad331:leo_ordning_reda \
-	leo-project/leo_pod=0.6.3?898e544:leo_pod \
-	leo-project/leo_redundant_manager=1.9.13?06f0837:leo_redundant_manager \
-	leo-project/leo_rpc=0.10.1?10a43d4:leo_rpc \
-	leo-project/leo_s3_libs=1.1.7?0cf4f99:leo_s3_libs \
-	leo-project/leo_statistics=1.1.4?bfe20d6:leo_statistics \
-	leo-project/leo_watchdog=0.8.0?be74dfb:leo_watchdog \
-	leo-project/libcutil=0.4.3?36b02d9:libcutil \
-	leo-project/nfs_rpc_server=0.2.3?9451e87:nfs_rpc_server \
-	leo-project/savanna_agent=0.4.7?23306e9:savanna_agent \
-	leo-project/savanna_commons=0.8.10?173d346:savanna_commons \
-	manopapad/proper=7d535ac?7d535ac:proper \
-	ninenines/cowboy=1.0.0?021f4f6:cowboy \
-	project-fifo/fifo_utils=0.1.8?a0b5786:fifo_utils \
-	seancribbs/neotoma=1.7.2?760928e:neotoma \
+	leo-project/leo_gateway=${PORTVERSION}:leo_gateway \
+	leo-project/leo_manager=${PORTVERSION}:leo_manager \
+	leo-project/leo_storage=${PORTVERSION}:leo_storage \
+	DeadZen/goldrush=0.1.6:goldrush \
+	basho/bitcask=2.0.0:bitcask \
+	basho/cuttlefish=2.0.1:cuttlefish \
+	basho/eleveldb=2.1.0:eleveldb \
+	basho/lager=2.0.3:lager \
+	basho/leveldb=2.0.0:leveldb \
+	davisp/jiffy=0.13.3:jiffy \
+	eproxus/meck=0.8.2:meck \
+	extend/cowlib=1.0.0:cowlib \
+	extend/ranch=1.0.0:ranch \
+	ferd/recon=2.2.1:recon \
+	jcomellas/getopt=v0.4.3:getopt \
+	leo-project/bear=0.8.2-for-leofs:bear \
+	leo-project/elarm=d237636:elarm \
+	leo-project/erlang-lz4=0.2.2:lz4 \
+	leo-project/erpcgen=0.2.3:erpcgen \
+	leo-project/folsom=0.8.2-for-leofs:folsom \
+	leo-project/leo_backend_db=1.1.8:leo_backend_db \
+	leo-project/leo_cache=0.6.3:leo_cache \
+	leo-project/leo_commons=1.1.1:leo_commons \
+	leo-project/leo_dcerl=0.2.12:leo_dcerl \
+	leo-project/leo_logger=1.1.5:leo_logger \
+	leo-project/leo_mcerl=0.4.1:leo_mcerl \
+	leo-project/leo_mq=1.3.9:leo_mq \
+	leo-project/leo_object_storage=1.2.7:leo_object_storage \
+	leo-project/leo_ordning_reda=1.0.0:leo_ordning_reda \
+	leo-project/leo_pod=0.6.3:leo_pod \
+	leo-project/leo_redundant_manager=1.9.13:leo_redundant_manager \
+	leo-project/leo_rpc=0.10.1:leo_rpc \
+	leo-project/leo_s3_libs=1.1.7:leo_s3_libs \
+	leo-project/leo_statistics=1.1.4:leo_statistics \
+	leo-project/leo_watchdog=0.8.0:leo_watchdog \
+	leo-project/libcutil=0.4.3:libcutil \
+	leo-project/nfs_rpc_server=0.2.3:nfs_rpc_server \
+	leo-project/savanna_agent=0.4.7:savanna_agent \
+	leo-project/savanna_commons=0.8.10:savanna_commons \
+	manopapad/proper=7d535ac:proper \
+	ninenines/cowboy=1.0.0:cowboy \
+	project-fifo/fifo_utils=0.1.8:fifo_utils \
+	seancribbs/neotoma=1.7.2:neotoma \
 
 .for dep in ${LEOFS_DEPS}
-.for account in ${dep:C,/.*$,,}
-.for project in ${dep:C,^[^/]+/([^=]+)=.*$,\1,}
-.for tagname in ${dep:C,^[^=]+=([^\?]+)\?.*$,\1,}
-.for commit in ${dep:C,^[^\?]+\?([^:]+):.*$,\1,}
-.for label in ${dep:C,^.*:,,}
-MASTER_SITES+=	https://codeload.github.com/${account}/${project}/legacy.tar.gz/${commit}?dummy=/:${label}
-DISTFILES+=	${project}-${tagname}.tar.gz:${label}
-.endfor
-.endfor
-.endfor
-.endfor
-.endfor
+account=	${dep:C,/.*$,,}
+project=	${dep:C,^[^/]+/([^=]+)=.*$,\1,}
+tagname=	${dep:C,^[^=]+=([^:]+):.*$,\1,}
+label=		${dep:C,^.*:,,}
+GH_ACCOUNT:=	${GH_ACCOUNT} ${account}:${label}
+GH_PROJECT:=	${GH_PROJECT} ${project}:${label}
+GH_TAGNAME:=	${GH_TAGNAME} ${tagname}:${label}
 .endfor
 
 post-extract:
 .for dep in ${LEOFS_DEPS}
-.for account in ${dep:C,/.*$,,}
-.for project in ${dep:C,^[^/]+/([^=]+)=.*$,\1,}
 .for tagname in ${dep:C,^[^=]+=([^\?]+)\?.*$,\1,}
-.for commit in ${dep:C,^[^\?]+\?([^:]+):.*$,\1,}
 .for label in ${dep:C,^.*:,,}
-	@${MKDIR} ${WRKSRC}/deps/${label}
-	@${TAR} -C ${WRKSRC}/deps/${label} --strip-components 1 \
-		-xzf ${DISTDIR}/${DIST_SUBDIR}/${project}-${tagname}.tar.gz
+	@${MKDIR} ${WRKSRC}/deps
+	@${LN} -s ${WRKSRC_${label}} ${WRKSRC}/deps/${label}
 	@if [ -f "${WRKSRC}/deps/${label}/src/${label}.app.src" ]; then \
 	    ${REINPLACE_CMD} -e "s|{vsn, *git}|{vsn, \"${tagname}\"}|" \
 		"${WRKSRC}/deps/${label}/src/${label}.app.src"; \
@@ -142,9 +132,6 @@ post-extract:
 .endfor
 .endfor
 .endfor
-.endfor
-.endfor
-.endfor
 	@(cd ${WRKSRC}/deps/eleveldb/c_src && ${LN} -s ../../leveldb)
 	@(cd ${WRKSRC}/deps/leo_mcerl/c_src && ${LN} -s ../../libcutil)
 	@(cd ${WRKSRC}/deps/leo_dcerl/c_src && ${LN} -s ../../libcutil)

Modified: head/databases/leofs/distinfo
==============================================================================
--- head/databases/leofs/distinfo	Thu May 28 16:37:01 2015	(r387742)
+++ head/databases/leofs/distinfo	Thu May 28 16:37:49 2015	(r387743)
@@ -1,88 +1,90 @@
 SHA256 (leofs/leofs-1.2.10.tar.gz) = 8a4dd5a52fd9152e4dafce20c76c573bf679e30b70195a2eb3c1b738733e7d44
 SIZE (leofs/leofs-1.2.10.tar.gz) = 292069
-SHA256 (leofs/leo_gateway-1.2.10.tar.gz) = f869820e235a49e167f9f90d41b44b95e07f992e95ed5b1031dcee71175c43b3
-SIZE (leofs/leo_gateway-1.2.10.tar.gz) = 614890
-SHA256 (leofs/leo_manager-1.2.10.tar.gz) = 95df9bae8b1ea705e1f63dc45a50710d25d5dd9f23ef4cb44e9e130debc6b897
-SIZE (leofs/leo_manager-1.2.10.tar.gz) = 594097
-SHA256 (leofs/leo_storage-1.2.10.tar.gz) = ededa764c252a7f537d5bcd71702efe644719dbd95fd47d80edb7f7205bd495f
-SIZE (leofs/leo_storage-1.2.10.tar.gz) = 576311
-SHA256 (leofs/goldrush-0.1.6.tar.gz) = 69d71c31c52a60df31730604c52df47fee541210d7d18f9876bbc8168e007f8e
-SIZE (leofs/goldrush-0.1.6.tar.gz) = 19457
-SHA256 (leofs/bitcask-2.0.0.tar.gz) = 4799db5a1d759c2b983dda7770c1f654ae19ca73c2776fbc7fd5c81bcd9550f7
-SIZE (leofs/bitcask-2.0.0.tar.gz) = 967222
-SHA256 (leofs/cuttlefish-2.0.1.tar.gz) = b8a2782a7b106c0141f23de68796abd402ed9c179baf5fd0af9fa3f22dd88f57
-SIZE (leofs/cuttlefish-2.0.1.tar.gz) = 231009
-SHA256 (leofs/eleveldb-2.1.0.tar.gz) = 86cfb4175fdbb339fd5de0dfe6fe382307d9de9ac5819dbd23845ebd5f8a18e2
-SIZE (leofs/eleveldb-2.1.0.tar.gz) = 1749227
-SHA256 (leofs/lager-2.0.3.tar.gz) = 18b38223625c2f8e34d8229bb0d17746f567c23b30e3bf0085fd9aca7974f483
-SIZE (leofs/lager-2.0.3.tar.gz) = 238080
-SHA256 (leofs/leveldb-2.0.0.tar.gz) = f71839c1cee76e0530971ff7d2a89fdbc99cd9407fd7ab3562e4a2988f71fbbd
-SIZE (leofs/leveldb-2.0.0.tar.gz) = 290172
-SHA256 (leofs/jiffy-0.13.3.tar.gz) = cb6b22df1db28d3d93e7222ed19382c3d3d71f1a1ab2e7f927e40f7f363b5075
-SIZE (leofs/jiffy-0.13.3.tar.gz) = 1852547
-SHA256 (leofs/meck-0.8.2.tar.gz) = b624c6a3cbdcc0670ac18d05a931928fe76123335b1eb8041c611656f8e141c8
-SIZE (leofs/meck-0.8.2.tar.gz) = 208706
-SHA256 (leofs/cowlib-1.0.0.tar.gz) = 17143608573abe00903548f66059cfdb59d9c2a1b1b262570e384b4a2e1bf006
-SIZE (leofs/cowlib-1.0.0.tar.gz) = 41548
-SHA256 (leofs/ranch-1.0.0.tar.gz) = 41b4883e8fba89814edb083c9e090669b733a7f7374eacbec2f618c278740133
-SIZE (leofs/ranch-1.0.0.tar.gz) = 41126
-SHA256 (leofs/recon-2.2.1.tar.gz) = cda93cbd7184d8daf4c811ee7b27fd88eacba5664a7bb7f2c85b5d8fa4d6932e
-SIZE (leofs/recon-2.2.1.tar.gz) = 202362
-SHA256 (leofs/getopt-v0.4.3.tar.gz) = 4a24b5621a985b9f5bbda5f2678e6b808e7d69adacee0186d4c419916a38b319
-SIZE (leofs/getopt-v0.4.3.tar.gz) = 13988
-SHA256 (leofs/bear-0.8.2-for-leofs.tar.gz) = d9380817c693601aebcebad419bf78e1c3794951fd6d916954aa8e288864b4ed
-SIZE (leofs/bear-0.8.2-for-leofs.tar.gz) = 110538
-SHA256 (leofs/elarm-d237636.tar.gz) = 261a8ce0c1ec517bc375f10849c7ead8d6103fa54f1f425e3e1a217452b59191
-SIZE (leofs/elarm-d237636.tar.gz) = 23498
-SHA256 (leofs/erlang-lz4-0.2.2.tar.gz) = b7a974210f2bfe57708934cbd8930b85d0784bf449dea37dd47c6ef7af395e9e
-SIZE (leofs/erlang-lz4-0.2.2.tar.gz) = 170494
-SHA256 (leofs/erpcgen-0.2.3.tar.gz) = 6e28e86ed11eabbfb136d6ba53418dc1fe2d79911cd09b19728a89b3f129526f
-SIZE (leofs/erpcgen-0.2.3.tar.gz) = 205139
-SHA256 (leofs/folsom-0.8.2-for-leofs.tar.gz) = f74dd414d9998151d29f0cb882d45d02fc2272e0515b887fa5a50a0eb7fc4536
-SIZE (leofs/folsom-0.8.2-for-leofs.tar.gz) = 174990
-SHA256 (leofs/leo_backend_db-1.1.8.tar.gz) = c270e260b253d147c57f882e79b83357841cc7654c6fd37123b697df714a1eb2
-SIZE (leofs/leo_backend_db-1.1.8.tar.gz) = 194086
-SHA256 (leofs/leo_cache-0.6.3.tar.gz) = eeff030d11c524837e3675e097abc0205827f9cc1d3e36fb2d45f147f0264d72
-SIZE (leofs/leo_cache-0.6.3.tar.gz) = 186676
-SHA256 (leofs/leo_commons-1.1.1.tar.gz) = b19400df643aa4803add64fa61c4a72bfae7f975f79832af37b1880ca4b754c2
-SIZE (leofs/leo_commons-1.1.1.tar.gz) = 195559
-SHA256 (leofs/leo_dcerl-0.2.12.tar.gz) = a023c4c2478c734caaacd2716fe918d3ea2bd8cecc94384fd77dd126bde3a8ca
-SIZE (leofs/leo_dcerl-0.2.12.tar.gz) = 192083
-SHA256 (leofs/leo_logger-1.1.5.tar.gz) = 712888699e56d8c1434330ca9920dfd5fd98fc154e1b3f678c8caf6a4b4f10a8
-SIZE (leofs/leo_logger-1.1.5.tar.gz) = 210824
-SHA256 (leofs/leo_mcerl-0.4.1.tar.gz) = b3b1a1c187d8e1586587400d09f42d9b08bc8c0ea8a350223d77ac2063d2516c
-SIZE (leofs/leo_mcerl-0.4.1.tar.gz) = 184449
-SHA256 (leofs/leo_mq-1.3.9.tar.gz) = 6038570272cda621b6b54f5168254ef328a0ea9f676eec006b5ef8fa2e31f92e
-SIZE (leofs/leo_mq-1.3.9.tar.gz) = 192967
-SHA256 (leofs/leo_object_storage-1.2.7.tar.gz) = f7d70a4f430d18346f6e09065e42f8a90c65d76a45146cc2e00a202cc6c5b11f
-SIZE (leofs/leo_object_storage-1.2.7.tar.gz) = 572477
-SHA256 (leofs/leo_ordning_reda-1.0.0.tar.gz) = 3b4b36d2e88d6f7f290b04ad54c493bcc45bfbb03e8700f2cdf4aaef99db5cfc
-SIZE (leofs/leo_ordning_reda-1.0.0.tar.gz) = 189156
-SHA256 (leofs/leo_pod-0.6.3.tar.gz) = 6443dfaed3abbd6127a6f998b58abeefc078df39a84b8b799526af66d47510f6
-SIZE (leofs/leo_pod-0.6.3.tar.gz) = 170315
-SHA256 (leofs/leo_redundant_manager-1.9.13.tar.gz) = 4a1d050f94008c8bb5d3e331c3181e41d8da418ec69ceb1220d231bc93824a81
-SIZE (leofs/leo_redundant_manager-1.9.13.tar.gz) = 237657
-SHA256 (leofs/leo_rpc-0.10.1.tar.gz) = 01181e4f4b9f45ba0f3ff8a9e75c900605052f33096e4ebcf87b266414d71ed1
-SIZE (leofs/leo_rpc-0.10.1.tar.gz) = 197603
-SHA256 (leofs/leo_s3_libs-1.1.7.tar.gz) = 0d5ce5684793f9a3f5975a1578ec6549e0c5972f60a98b9c7e68c8036f915920
-SIZE (leofs/leo_s3_libs-1.1.7.tar.gz) = 203365
-SHA256 (leofs/leo_statistics-1.1.4.tar.gz) = aca6db343457c51e8284a09c869297f7861d995eb6887ff49b3b049649582417
-SIZE (leofs/leo_statistics-1.1.4.tar.gz) = 190235
-SHA256 (leofs/leo_watchdog-0.8.0.tar.gz) = 5b71476a059d1126cd960a5c9b310eac2ac0bf518d3481d4c9ccdc97bb561aef
-SIZE (leofs/leo_watchdog-0.8.0.tar.gz) = 199628
-SHA256 (leofs/libcutil-0.4.3.tar.gz) = 3dc660d3d506b5e39cfa366977ba8719ae6bc86aca78e84c901548c574b090b2
-SIZE (leofs/libcutil-0.4.3.tar.gz) = 23101
-SHA256 (leofs/nfs_rpc_server-0.2.3.tar.gz) = 6e54c99a298e65b51340fbc97424414289000817adb616b80d2e8770118104a5
-SIZE (leofs/nfs_rpc_server-0.2.3.tar.gz) = 196842
-SHA256 (leofs/savanna_agent-0.4.7.tar.gz) = 7aa44c088638cbdf17cafa2241197490b3011c08f97de00fcd2540513df62876
-SIZE (leofs/savanna_agent-0.4.7.tar.gz) = 187016
-SHA256 (leofs/savanna_commons-0.8.10.tar.gz) = 6ec3480b21f8688e08cf51a354bc98bc22c8e0d8520518389d90bcd6fe4e5c8c
-SIZE (leofs/savanna_commons-0.8.10.tar.gz) = 197827
-SHA256 (leofs/proper-7d535ac.tar.gz) = 169a8a535c65ac66af73312dfee7daa4ac222bfd5bf66ec9334311ab49132f77
-SIZE (leofs/proper-7d535ac.tar.gz) = 283344
-SHA256 (leofs/cowboy-1.0.0.tar.gz) = 62e0c37dd96094914d9d565b15c8f8c02a72514dd32ffefb36fea6f9ab3c7f60
-SIZE (leofs/cowboy-1.0.0.tar.gz) = 4790037
-SHA256 (leofs/fifo_utils-0.1.8.tar.gz) = b267912090acb7fe70dd1e54319e10167cbad61461b54be29a63c30e32565b79
-SIZE (leofs/fifo_utils-0.1.8.tar.gz) = 175444
-SHA256 (leofs/neotoma-1.7.2.tar.gz) = 99f2e1933bf82e9dff5aaf4160d6cebf5516c7ba15d783bba19284534d66e196
-SIZE (leofs/neotoma-1.7.2.tar.gz) = 181952
+SHA256 (leofs/leo-project-leofs-1.2.10_GH0.tar.gz) = 8a4dd5a52fd9152e4dafce20c76c573bf679e30b70195a2eb3c1b738733e7d44
+SIZE (leofs/leo-project-leofs-1.2.10_GH0.tar.gz) = 292069
+SHA256 (leofs/leo-project-leo_gateway-1.2.10_GH0.tar.gz) = a482ea1de48b277c5fecb2414ce93ded0e19b491bdd17fa885501eb871c49d2a
+SIZE (leofs/leo-project-leo_gateway-1.2.10_GH0.tar.gz) = 614835
+SHA256 (leofs/leo-project-leo_manager-1.2.10_GH0.tar.gz) = 00c0e4a554fa678325384f74678d745a0dbdbaaf14de8ed4a989a313efdb7dfa
+SIZE (leofs/leo-project-leo_manager-1.2.10_GH0.tar.gz) = 594038
+SHA256 (leofs/leo-project-leo_storage-1.2.10_GH0.tar.gz) = 9e2f5a4521d5f12dd520d6aacf4aef6ca798e534c786791bfdbaced3cc57c54a
+SIZE (leofs/leo-project-leo_storage-1.2.10_GH0.tar.gz) = 576273
+SHA256 (leofs/DeadZen-goldrush-0.1.6_GH0.tar.gz) = 554f36983e19fcf2ebee18b5c0ff502af4fc1b853b49041c7a9821d7043e349f
+SIZE (leofs/DeadZen-goldrush-0.1.6_GH0.tar.gz) = 19445
+SHA256 (leofs/basho-bitcask-2.0.0_GH0.tar.gz) = 8a8ab6c2040873f00ca8559d9171cd7630c4c3451d569d861d21f8372f2b85bd
+SIZE (leofs/basho-bitcask-2.0.0_GH0.tar.gz) = 967163
+SHA256 (leofs/basho-cuttlefish-2.0.1_GH0.tar.gz) = 958aa5269dacef62aa28e0706a5fe1c0abaa543ce15e61c6999420bd76a769f7
+SIZE (leofs/basho-cuttlefish-2.0.1_GH0.tar.gz) = 230990
+SHA256 (leofs/basho-eleveldb-2.1.0_GH0.tar.gz) = e102b7825b8462492b1688dfdeb555ce9274c8a17ff5fbd506e56edff4dcfed4
+SIZE (leofs/basho-eleveldb-2.1.0_GH0.tar.gz) = 1749221
+SHA256 (leofs/basho-lager-2.0.3_GH0.tar.gz) = e6f4ef80c98fbb7e4edb235ebd613d9718678ff05c99b52905b059a5228c1c97
+SIZE (leofs/basho-lager-2.0.3_GH0.tar.gz) = 238048
+SHA256 (leofs/basho-leveldb-2.0.0_GH0.tar.gz) = 1709e6476dfefdceec93669ec7901b95b14ef65d490b2585ef5fec5a909d39f3
+SIZE (leofs/basho-leveldb-2.0.0_GH0.tar.gz) = 290137
+SHA256 (leofs/davisp-jiffy-0.13.3_GH0.tar.gz) = e61c8c7c026e6d82ecb07418a340efadb25e3e11b9af51e9dfe9fcc19959e3a8
+SIZE (leofs/davisp-jiffy-0.13.3_GH0.tar.gz) = 1852537
+SHA256 (leofs/eproxus-meck-0.8.2_GH0.tar.gz) = dc1ad985b1c994c69b645f5cfd159bf9ba71d10a2984ce354500adb4ff0ae473
+SIZE (leofs/eproxus-meck-0.8.2_GH0.tar.gz) = 208694
+SHA256 (leofs/extend-cowlib-1.0.0_GH0.tar.gz) = 48a8784ae7d266724276f9842b3a06cfbbfe69469f58c27237c602232f7ebe5a
+SIZE (leofs/extend-cowlib-1.0.0_GH0.tar.gz) = 41538
+SHA256 (leofs/extend-ranch-1.0.0_GH0.tar.gz) = ec75e8876bf25df2e1f5156909d51cf11f2e98dd76a3be2090fa30ebefc8062f
+SIZE (leofs/extend-ranch-1.0.0_GH0.tar.gz) = 41121
+SHA256 (leofs/ferd-recon-2.2.1_GH0.tar.gz) = f5175ce0944bb0349f6fb766888ee230a91dfe05ba1b8f7a6e4d5380049e354f
+SIZE (leofs/ferd-recon-2.2.1_GH0.tar.gz) = 202344
+SHA256 (leofs/jcomellas-getopt-v0.4.3_GH0.tar.gz) = c6d8eee263f0a719251a9b753ca6180a829022e577a78b2b153e7f9815a6b669
+SIZE (leofs/jcomellas-getopt-v0.4.3_GH0.tar.gz) = 13980
+SHA256 (leofs/leo-project-bear-0.8.2-for-leofs_GH0.tar.gz) = 3c547fb59f1d5ba830a3b24cefc600c9ac42b5b41ee9180ebbd2cad7d8899ecd
+SIZE (leofs/leo-project-bear-0.8.2-for-leofs_GH0.tar.gz) = 110538
+SHA256 (leofs/leo-project-elarm-d237636_GH0.tar.gz) = 5942c3f1b09095799eefc9d8e3571d91cb5e5d75bb0a8d1fb6f2ba774bb5974e
+SIZE (leofs/leo-project-elarm-d237636_GH0.tar.gz) = 23475
+SHA256 (leofs/leo-project-erlang-lz4-0.2.2_GH0.tar.gz) = 8f12635ea5d65497b3b2d4f99783af92abada9fe5e6f65849321befe1f6f4025
+SIZE (leofs/leo-project-erlang-lz4-0.2.2_GH0.tar.gz) = 170449
+SHA256 (leofs/leo-project-erpcgen-0.2.3_GH0.tar.gz) = c309e919a0c6b2f7d4cf2184c05aebebf112349afbea0398549d412fe176a84d
+SIZE (leofs/leo-project-erpcgen-0.2.3_GH0.tar.gz) = 205099
+SHA256 (leofs/leo-project-folsom-0.8.2-for-leofs_GH0.tar.gz) = fad850337a7f4331a46246c7911d9353b0e42966158561138d95ca1f52ed0d09
+SIZE (leofs/leo-project-folsom-0.8.2-for-leofs_GH0.tar.gz) = 174986
+SHA256 (leofs/leo-project-leo_backend_db-1.1.8_GH0.tar.gz) = c1560b7ac27efd3fb6ec02f94a996c3bfde596041016c544ded70a25adf8a888
+SIZE (leofs/leo-project-leo_backend_db-1.1.8_GH0.tar.gz) = 194087
+SHA256 (leofs/leo-project-leo_cache-0.6.3_GH0.tar.gz) = 98160e41dbdcb386915cce768746875a1ba14b4a65a4cb8781eb19400956bd85
+SIZE (leofs/leo-project-leo_cache-0.6.3_GH0.tar.gz) = 186658
+SHA256 (leofs/leo-project-leo_commons-1.1.1_GH0.tar.gz) = fcd99890ced115001d10f507453efe8482c6ae34c796f0f50528547c870bcdc3
+SIZE (leofs/leo-project-leo_commons-1.1.1_GH0.tar.gz) = 195544
+SHA256 (leofs/leo-project-leo_dcerl-0.2.12_GH0.tar.gz) = 6d5bd8fb395c485ea6407137f0d73a9985f9f4874caf3e400bc45ad3e26fc805
+SIZE (leofs/leo-project-leo_dcerl-0.2.12_GH0.tar.gz) = 192059
+SHA256 (leofs/leo-project-leo_logger-1.1.5_GH0.tar.gz) = 3c9dad617b758b0c9d43707564feedaf761324f4806f9ee074ba073502fc17d0
+SIZE (leofs/leo-project-leo_logger-1.1.5_GH0.tar.gz) = 210803
+SHA256 (leofs/leo-project-leo_mcerl-0.4.1_GH0.tar.gz) = 42a704dee612fdd32ebd194eb7887de286eeff567ab7ecd0e7a9f87bbcac7fda
+SIZE (leofs/leo-project-leo_mcerl-0.4.1_GH0.tar.gz) = 184427
+SHA256 (leofs/leo-project-leo_mq-1.3.9_GH0.tar.gz) = 82e7c5c3e1572be3fd84aea8d475e6c6d4984358d7e5bd2ac7eff83d23910a77
+SIZE (leofs/leo-project-leo_mq-1.3.9_GH0.tar.gz) = 192955
+SHA256 (leofs/leo-project-leo_object_storage-1.2.7_GH0.tar.gz) = 8556c0da623d823bcd9048b4dc0d3996043566d353c49581239213b6ef3ae2e2
+SIZE (leofs/leo-project-leo_object_storage-1.2.7_GH0.tar.gz) = 572460
+SHA256 (leofs/leo-project-leo_ordning_reda-1.0.0_GH0.tar.gz) = c4179ece03be1db9e8289cb593edd4d354a2e59723f07b35dc7153ec4f55118d
+SIZE (leofs/leo-project-leo_ordning_reda-1.0.0_GH0.tar.gz) = 189147
+SHA256 (leofs/leo-project-leo_pod-0.6.3_GH0.tar.gz) = 204ca54bd46ac6c55b37d7a545114c1344faf15f3a64949118c8100c9815fb9f
+SIZE (leofs/leo-project-leo_pod-0.6.3_GH0.tar.gz) = 170305
+SHA256 (leofs/leo-project-leo_redundant_manager-1.9.13_GH0.tar.gz) = eaeb9d4cfbf43a2e9cc52d04bf4c4492407fbc1ae8c988cc69690c037bebd052
+SIZE (leofs/leo-project-leo_redundant_manager-1.9.13_GH0.tar.gz) = 237633
+SHA256 (leofs/leo-project-leo_rpc-0.10.1_GH0.tar.gz) = 5f1c7494f58ba0ed7c33cb0116139b44ae6df2a01b91c8096294a56cd4f40fa2
+SIZE (leofs/leo-project-leo_rpc-0.10.1_GH0.tar.gz) = 197593
+SHA256 (leofs/leo-project-leo_s3_libs-1.1.7_GH0.tar.gz) = ba4401bd9f33966942a2605d88a3bf8dfc0f64c892f59f6e1676cb26dacf70dd
+SIZE (leofs/leo-project-leo_s3_libs-1.1.7_GH0.tar.gz) = 203353
+SHA256 (leofs/leo-project-leo_statistics-1.1.4_GH0.tar.gz) = 42749dbc6a7c55d1e422ff9e205a889f0df14416c963fff269f2960df5cf8a49
+SIZE (leofs/leo-project-leo_statistics-1.1.4_GH0.tar.gz) = 190221
+SHA256 (leofs/leo-project-leo_watchdog-0.8.0_GH0.tar.gz) = 7f260e5f211f1f6912ba79f7079d5e93039eafb3db17c62abb879736254a84e5
+SIZE (leofs/leo-project-leo_watchdog-0.8.0_GH0.tar.gz) = 199623
+SHA256 (leofs/leo-project-libcutil-0.4.3_GH0.tar.gz) = b291dfc86e2b9a33c78a6544eb361f3d7bd1289fb32d8d971f0a6e3a398f64e0
+SIZE (leofs/leo-project-libcutil-0.4.3_GH0.tar.gz) = 23090
+SHA256 (leofs/leo-project-nfs_rpc_server-0.2.3_GH0.tar.gz) = 642dcb800532f76cbc6632569b8089a98c21178072054fc4d050e86901f4af3f
+SIZE (leofs/leo-project-nfs_rpc_server-0.2.3_GH0.tar.gz) = 196821
+SHA256 (leofs/leo-project-savanna_agent-0.4.7_GH0.tar.gz) = 14c0721bbe8e7a4e957cec29993e257add053c8f3d9f63ed911477b03c6f330f
+SIZE (leofs/leo-project-savanna_agent-0.4.7_GH0.tar.gz) = 186996
+SHA256 (leofs/leo-project-savanna_commons-0.8.10_GH0.tar.gz) = 4564f65f9cd5c12e24a4a09014320b7eeca1eb34a229bc89fa8ff8f074ba82a3
+SIZE (leofs/leo-project-savanna_commons-0.8.10_GH0.tar.gz) = 197811
+SHA256 (leofs/manopapad-proper-7d535ac_GH0.tar.gz) = 7999e3411c0a3f4943629b7a0947dc2d8710dbe5e95fc6c7bfce18dd6b41ec9b
+SIZE (leofs/manopapad-proper-7d535ac_GH0.tar.gz) = 283295
+SHA256 (leofs/ninenines-cowboy-1.0.0_GH0.tar.gz) = d280a6c3e928d8e7520b8d6a3069847518decd38b63695d72a9d7222760517fb
+SIZE (leofs/ninenines-cowboy-1.0.0_GH0.tar.gz) = 4790012
+SHA256 (leofs/project-fifo-fifo_utils-0.1.8_GH0.tar.gz) = 6550cb487184c39bdd674c213707e6eb46dacb28685047d331ca4da4a26c8e39
+SIZE (leofs/project-fifo-fifo_utils-0.1.8_GH0.tar.gz) = 175422
+SHA256 (leofs/seancribbs-neotoma-1.7.2_GH0.tar.gz) = 73c356991b9685e86cd142d3b09e808dc9ef300bd7261113a0463c74de81a6ea
+SIZE (leofs/seancribbs-neotoma-1.7.2_GH0.tar.gz) = 181946

Modified: head/emulators/ppsspp/Makefile
==============================================================================
--- head/emulators/ppsspp/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/emulators/ppsspp/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -5,15 +5,6 @@ PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	emulators
-.ifndef GITHUB_GROUPS
-MASTER_SITES=	https://codeload.github.com/${GH_ACCOUNT}/${PORTNAME}-lang/tar.gz/52c757e?dummy=/:lang \
-		https://codeload.github.com/${GH_ACCOUNT}/native/tar.gz/52ce9c1?dummy=/:native \
-		https://codeload.github.com/Kingcom/armips/tar.gz/a0b878f?dummy=/:ext_armips
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
-		${GH_ACCOUNT}-${PORTNAME}-lang-52c757e_GH${_GITHUB_REV}${EXTRACT_SUFX}:lang \
-		${GH_ACCOUNT}-native-52ce9c1_GH${_GITHUB_REV}${EXTRACT_SUFX}:native \
-		Kingcom-armips-a0b878f_GH${_GITHUB_REV}${EXTRACT_SUFX}:ext_armips
-.endif
 
 PATCH_SITES=	https://projects.archlinux.org/svntogit/community.git/plain/trunk/
 PATCHFILES=	${PORTNAME}-ffmpeg.patch?id=f2b9251:-p1
@@ -27,13 +18,9 @@ LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/m
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USE_GITHUB=	yes
-.ifndef GITHUB_GROUPS
-GH_ACCOUNT=	hrydgard
-.else # XXX D2608 version, groups are converted to paths later
 GH_ACCOUNT=	hrydgard:DEFAULT,lang,native Kingcom:ext_armips
 GH_PROJECT=	${PORTNAME}-lang:lang native:native armips:ext_armips
 GH_TAGNAME=	52c757e:lang 52ce9c1:native a0b878f:ext_armips
-.endif
 
 USES=		compiler:c++11-lib pkgconfig
 USE_GL=		glu
@@ -63,20 +50,11 @@ PORTDATA+=	assets ${PORTNAME}
 .endif
 
 post-extract:
-.ifndef GITHUB_GROUPS
-	@${RMDIR} ${WRKSRC}/lang
-	@${MV} ${WRKDIR}/${PORTNAME}-lang-52c757e ${WRKSRC}/lang
-	@${RMDIR} ${WRKSRC}/native
-	@${MV} ${WRKDIR}/native-52ce9c1 ${WRKSRC}/native
-	@${RMDIR} ${WRKSRC}/ext/armips
-	@${MV} ${WRKDIR}/armips-a0b878f ${WRKSRC}/ext/armips
-.else # XXX D2608 version
 # Convert USE_GITHUB groups to git-submodule(1) paths
 .for group in ${GH_PROJECT:C/.*://}
 	@${RMDIR} ${WRKSRC}/${group:S,_,/,g}
 	@${MV} ${WRKSRC_${group}} ${WRKSRC}/${group:S,_,/,g}
 .endfor
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \

Modified: head/net/syncthing-cli/Makefile
==============================================================================
--- head/net/syncthing-cli/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/net/syncthing-cli/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -5,12 +5,6 @@ PORTNAME=	syncthing-cli
 PORTVERSION=	0.1.0.2015050601
 PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	GH \
-		https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
-		https://codeload.github.com/AudriusButkevicius/cli/legacy.tar.gz/7f561c7?dummy=/:group3
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
-		AudriusButkevicius-cli-7f561c7${EXTACT_SUFX}:group3
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Syncthing CLI
@@ -18,9 +12,9 @@ COMMENT=	Syncthing CLI
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing
-GH_PROJECT=	syncthing-cli
-GH_TAGNAME=	51ec7bb30c3ccb92a3c4616ef00be3b3db739afe
+GH_ACCOUNT=	syncthing AudriusButkevicius:audrius
+GH_PROJECT=	syncthing:st cli:audrius
+GH_TAGNAME=	51ec7bb v${SYNCTHING_VER}:st 7f561c7:audrius
 
 SYNCTHING_VER=	0.11.5
 
@@ -34,17 +28,17 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/code.google.com/p
 	@${MKDIR} ${WRKSRC}/src/golang.org/x
 	@${MKDIR} ${WRKSRC}/src/github.com/bkaradzic
-	@${MV} ${WRKDIR}/AudriusButkevicius-cli-7f561c7 \
+	@${MV} ${WRKSRC_audrius} \
 		${WRKSRC}/src/github.com/AudriusButkevicius/cli
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/crypto \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/crypto \
 		${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/text \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/text \
 		${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
 		${WRKSRC}/src/github.com/bkaradzic
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/calmh \
 		${WRKSRC}/src/github.com/calmh
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \
+	@${MV} ${WRKSRC_st} \
 		${WRKSRC}/src/github.com/syncthing/syncthing
 	@${MV} ${WRKSRC}/src/github.com/syncthing/syncthing/Godeps/_workspace/src/github.com/syncthing/protocol \
 		${WRKSRC}/src/github.com/syncthing/protocol

Modified: head/net/syncthing-cli/distinfo
==============================================================================
--- head/net/syncthing-cli/distinfo	Thu May 28 16:37:01 2015	(r387742)
+++ head/net/syncthing-cli/distinfo	Thu May 28 16:37:49 2015	(r387743)
@@ -1,6 +1,6 @@
-SHA256 (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb30c3ccb92a3c4616ef00be3b3db739afe_GH0.tar.gz) = aeb4e6a5588391e0b0645f23684e2fb11ccaff3a5b20abf7dea3a4a45f7d69a3
-SIZE (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb30c3ccb92a3c4616ef00be3b3db739afe_GH0.tar.gz) = 9202
-SHA256 (syncthing-0.11.5.tar.gz) = 59dd89ea64f51cc5481e59d7849dc6616286b9dbff5ac3724adc119592e09144
-SIZE (syncthing-0.11.5.tar.gz) = 3159523
-SHA256 (AudriusButkevicius-cli-7f561c7) = ad64f151c314333f714ef600f65a4fb512ce7242bc2100074775581a56ad439a
-SIZE (AudriusButkevicius-cli-7f561c7) = 14736
+SHA256 (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb_GH0.tar.gz) = c22a842d8647fca8bdfb9d48ca61f3c5bdfee3573aeec0364f3b1c0f4bd304a3
+SIZE (syncthing-syncthing-cli-0.1.0.2015050601-51ec7bb_GH0.tar.gz) = 9201
+SHA256 (AudriusButkevicius-cli-7f561c7_GH0.tar.gz) = 8d6c282b2737c5ae17c3ba4ce81037762f46aa5a05d0095c0d481639d081110c
+SIZE (AudriusButkevicius-cli-7f561c7_GH0.tar.gz) = 14722
+SHA256 (syncthing-syncthing-v0.11.5_GH0.tar.gz) = 59dd89ea64f51cc5481e59d7849dc6616286b9dbff5ac3724adc119592e09144
+SIZE (syncthing-syncthing-v0.11.5_GH0.tar.gz) = 3159523

Modified: head/net/syncthing-discosrv/Makefile
==============================================================================
--- head/net/syncthing-discosrv/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/net/syncthing-discosrv/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -5,11 +5,6 @@ PORTNAME=	syncthing-discosrv
 PORTVERSION=	0.0.0.2015022401
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
-		https://codeload.github.com/golang/groupcache/legacy.tar.gz/${GROUPCACHE_COMMIT}?dummy=/:group3
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
-		golang-groupcache-${GROUPCACHE_COMMIT}${EXTRACT_SUFX}:group3
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
@@ -17,12 +12,11 @@ COMMENT=	Discovery server for syncthing
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing
-GH_PROJECT=	discosrv
-GH_TAGNAME=	4e1240a610bcc2ef8772eb2641492822b4ec4f88
+GH_ACCOUNT=	syncthing golang:gc
+GH_PROJECT=	discosrv syncthing:st groupcache:gc
+GH_TAGNAME=	4e1240a v${SYNCTHING_VER}:st d2a1805:gc
 
 SYNCTHING_VER=	0.11.5
-GROUPCACHE_COMMIT=	d2a1805
 
 PLIST_FILES=	bin/syncthing-discosrv
 
@@ -40,25 +34,25 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/syncthing
 	@${MKDIR} ${WRKSRC}/src/github.com/syndtr
 	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/calmh \
 		${WRKSRC}/src/github.com
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
 		${WRKSRC}/src/github.com/bkaradzic
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/juju/ratelimit \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/juju/ratelimit \
 		${WRKSRC}/src/github.com/juju
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/goleveldb \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/syndtr/goleveldb \
 		${WRKSRC}/src/github.com/syndtr
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/gosnappy \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/github.com/syndtr/gosnappy \
 		${WRKSRC}/src/github.com/syndtr
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/crypto \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/crypto \
 		${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/golang.org/x/text \
+	@${MV} ${WRKSRC_st}/Godeps/_workspace/src/golang.org/x/text \
 		${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \
+	@${MV} ${WRKSRC_st} \
 		${WRKSRC}/src/github.com/syncthing/syncthing
 	@${MV} ${WRKSRC}/src/github.com/syncthing/syncthing/Godeps/_workspace/src/github.com/syncthing/protocol \
 		${WRKSRC}/src/github.com/syncthing/protocol
-	@${MV} ${WRKDIR}/golang-groupcache-${GROUPCACHE_COMMIT} \
+	@${MV} ${WRKSRC_gc} \
 		${WRKSRC}/src/github.com/golang/groupcache
 
 do-build:

Modified: head/net/syncthing-discosrv/distinfo
==============================================================================
--- head/net/syncthing-discosrv/distinfo	Thu May 28 16:37:01 2015	(r387742)
+++ head/net/syncthing-discosrv/distinfo	Thu May 28 16:37:49 2015	(r387743)
@@ -1,6 +1,6 @@
-SHA256 (syncthing-discosrv-0.0.0.2015022401-4e1240a610bcc2ef8772eb2641492822b4ec4f88_GH0.tar.gz) = 70ddebacddb8c3de9019f83e1e63cb95d36731433068480b2499d491dcdd45e7
-SIZE (syncthing-discosrv-0.0.0.2015022401-4e1240a610bcc2ef8772eb2641492822b4ec4f88_GH0.tar.gz) = 16841
-SHA256 (syncthing-0.11.5.tar.gz) = 59dd89ea64f51cc5481e59d7849dc6616286b9dbff5ac3724adc119592e09144
-SIZE (syncthing-0.11.5.tar.gz) = 3159523
-SHA256 (golang-groupcache-d2a1805.tar.gz) = be22ff0c07a589fdb4665637787a2693e685e824a4ccb2bcfe8d9811d0c822a3
-SIZE (golang-groupcache-d2a1805.tar.gz) = 24094
+SHA256 (syncthing-discosrv-0.0.0.2015022401-4e1240a_GH0.tar.gz) = a0b1865793da2a780a50ddf112515e3467ddb04741562a761437f434a453fde7
+SIZE (syncthing-discosrv-0.0.0.2015022401-4e1240a_GH0.tar.gz) = 16804
+SHA256 (golang-groupcache-d2a1805_GH0.tar.gz) = 4589876f2e8830663a2d19bb4d7ca2e3993e8e8d2710dd3c1941b6d0d5e6de34
+SIZE (golang-groupcache-d2a1805_GH0.tar.gz) = 24089
+SHA256 (syncthing-syncthing-v0.11.5_GH0.tar.gz) = 59dd89ea64f51cc5481e59d7849dc6616286b9dbff5ac3724adc119592e09144
+SIZE (syncthing-syncthing-v0.11.5_GH0.tar.gz) = 3159523

Modified: head/sysutils/consul/Makefile
==============================================================================
--- head/sysutils/consul/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/sysutils/consul/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -2,77 +2,10 @@
 
 PORTNAME=	consul
 PORTVERSION=	0.5.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
-		https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \
-		https://github.com/golang/protobuf/archive/5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz?dummy=/:group3 \
-	 	https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz?dummy=/:group4 \
-		https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz?dummy=/:group5 \
-		https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz?dummy=/:group6 \
-		https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz?dummy=/:group7 \
-		https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group8 \
-		https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz?dummy=/:group9 \
-		https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz?dummy=/:group10 \
-		https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz?dummy=/:group11 \
-		https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz?dummy=/:group12 \
-		https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz?dummy=/:group13 \
-		https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz?dummy=/:group14 \
-		https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz?dummy=/:group15 \
-		https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz?dummy=/:group16 \
-		https://github.com/hashicorp/serf/archive/320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz?dummy=/:group17 \
-		https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz?dummy=/:group18 \
-		https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz?dummy=/:group19 \
-		https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz?dummy=/:group20 \
-		https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz?dummy=/:group21 \
-		https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz?dummy=/:group22 \
-		https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz?dummy=/:group23 \
-		https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group24 \
-		https://github.com/ugorji/go/archive/e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz?dummy=/:group25 \
-		https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz?dummy=/:group26 \
-		https://github.com/matttproud/golang_protobuf_extensions/archive/ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz?dummy=/:group27 \
-		https://github.com/prometheus/client_golang/archive/38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz?dummy=/:group28 \
-		https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz?dummy=/:group29 \
-		https://github.com/prometheus/procfs/archive/92faa308558161acab0ada1db048e9996ecec160.tar.gz?dummy=/:group30 \
-		https://dl.bintray.com/mitchellh/consul/:group31 \
-		https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz?dummy=/:group32 \
-		https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz?dummy=/:group33 \
-		https://github.com/hashicorp/consul-migrate/archive/4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz?dummy=/:group34 \
-		https://github.com/golang/crypto/archive/74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz?dummy=/:group35
-DISTFILES=	consul-${PORTVERSION}.tar.gz:group1 \
-		armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \
-		golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz:group3 \
-		armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz:group4 \
-		armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz:group5 \
-		armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz:group6 \
-		hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz:group7 \
-		hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group8 \
-		hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz:group9 \
-		hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz:group10 \
-		hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz:group11 \
-		hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz:group12 \
-		hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz:group13 \
-		hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz:group14 \
-		hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz:group15 \
-		hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz:group16 \
-		hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz:group17 \
-		hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz:group18 \
-		hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz:group19 \
-		inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz:group20 \
-		miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz:group21 \
-		mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz:group22 \
-		mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz:group23 \
-		ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group24 \
-		ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz:group25 \
-		net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz:group26 \
-		golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz:group27 \
-		prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz:group28 \
-		prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz:group29 \
-		prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz:group30 \
-		${PORTVERSION}_web_ui.zip:group31 \
-		hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz:group32 \
-		boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz:group33 \
-		hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz:group34 \
-		golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz:group35
+MASTER_SITES=	https://dl.bintray.com/mitchellh/consul/:web_ui
+DISTFILES=	${PORTVERSION}_web_ui.zip:web_ui
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
@@ -84,16 +17,42 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:${POR
 USES=		compiler
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp
-GH_TAGNAME=	v${PORTVERSION}
+GH_ACCOUNT=	hashicorp:DEFAULT,go_checkpoint,go_msgpack,go_multierror,go_syslog,golang_lru,hcl,logutils,memberlist,raft,raft_mdb,serf,scada,yamux,migrate,msgpackrpc,boltdb \
+		armon:circbuf,go_metrics,go_radix,gomdb golang:protobuf,crypto \
+		boltdb:bolt inconshreveable:muxado matttproud:protobuf_ext \
+		miekg:dns mitchellh:cli mitchellh:mapstructure \
+		prometheus:client_golang,client_model,procfs \
+		ryanuber:columnize ugorji:go
+GH_PROJECT=	circbuf:circbuf protobuf:protobuf go-metrics:go_metrics \
+		go-radix:go_radix gomdb:gomdb go-checkpoint:go_checkpoint \
+		go-msgpack:go_msgpack go-multierror:go_multierror \
+		go-syslog:go_syslog golang-lru:golang_lru hcl:hcl \
+		logutils:logutils memberlist:memberlist raft:raft \
+		raft-mdb:raft_mdb serf:serf scada-client:scada yamux:yamux \
+		consul-migrate:migrate net-rpc-msgpackrpc:msgpackrpc \
+		raft-boltdb:boltdb crypto:crypto bolt:bolt muxado:muxado \
+		golang_protobuf_extensions:protobuf_ext dns:dns cli:cli \
+		mapstructure:mapstructure client_golang:client_golang \
+		client_model:client_model procfs:procfs columnize:columnize \
+		go:go
+GH_TAGNAME=	f092b4f:circbuf 5677a0e:protobuf a54701e:go_metrics \
+		0bab926:go_radix 151f2e0:gomdb 88326f6:go_checkpoint \
+		71c2886:go_msgpack fcdddc3:go_multierror 42a2b57:go_syslog \
+		995efda:golang_lru 513e04c:hcl 367a65d:logutils \
+		6025015:memberlist a8065f2:raft 4ec3694:raft_mdb 320787d:serf \
+		c26580c:scada b2e5585:yamux 4977886:migrate \
+		d377902:msgpackrpc d1e82c1:boltdb 74f810a:crypto 2c04100:bolt \
+		f693c7e:muxado ba7d65a:protobuf_ext bb1103f:dns 6cc8bc5:cli \
+		442e588:mapstructure 38dbb2e:client_golang \
+		fa8ad6f:client_model 92faa30:procfs 44cb478:columnize \
+		e906e39:go
+
 
 USE_RC_SUBR=	consul
 
 USERS=		consul
 GROUPS=		consul
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 STRIP=		# stripping can break go binaries
 
 post-patch:
@@ -116,69 +75,69 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/matttproud
 	@${MKDIR} ${WRKSRC}/src/github.com/prometheus
 	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKDIR}/circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf \
+	@${MV} ${WRKSRC_circbuf} \
 		${WRKSRC}/src/github.com/armon/circbuf
-	@${MV} ${WRKDIR}/go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6 \
+	@${MV} ${WRKSRC_go_metrics} \
 		${WRKSRC}/src/github.com/armon/go-metrics
-	@${MV} ${WRKDIR}/go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c \
+	@${MV} ${WRKSRC_go_radix} \
 		${WRKSRC}/src/github.com/armon/go-radix
-	@${MV} ${WRKDIR}/gomdb-151f2e08ef45cb0e57d694b2562f351955dff572 \
+	@${MV} ${WRKSRC_gomdb} \
 		${WRKSRC}/src/github.com/armon/gomdb
-	@${MV} ${WRKDIR}/protobuf-5677a0e3d5e89854c9974e1256839ee23f8233ca \
+	@${MV} ${WRKSRC_protobuf} \
 		${WRKSRC}/src/github.com/golang/protobuf
-	@${MV} ${WRKDIR}/go-msgpack-71c2886f5a673a35f909803f38ece5810165097b \
+	@${MV} ${WRKSRC_go_msgpack} \
 		${WRKSRC}/src/github.com/hashicorp/go-msgpack
-	@${MV} ${WRKDIR}/go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e \
+	@${MV} ${WRKSRC_go_multierror} \
 		${WRKSRC}/src/github.com/hashicorp/go-multierror
-	@${MV} ${WRKDIR}/go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d \
+	@${MV} ${WRKSRC_go_checkpoint} \
 		${WRKSRC}/src/github.com/hashicorp/go-checkpoint
-	@${MV} ${WRKDIR}/go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba \
+	@${MV} ${WRKSRC_go_syslog} \
 		${WRKSRC}/src/github.com/hashicorp/go-syslog
-	@${MV} ${WRKDIR}/golang-lru-995efda3e073b6946b175ed93901d729ad47466a \
+	@${MV} ${WRKSRC_golang_lru} \
 		${WRKSRC}/src/github.com/hashicorp/golang-lru
-	@${MV} ${WRKDIR}/hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84 \
+	@${MV} ${WRKSRC_hcl} \
 		${WRKSRC}/src/github.com/hashicorp/hcl
-	@${MV} ${WRKDIR}/logutils-367a65d59043b4f846d179341d138f01f988c186 \
+	@${MV} ${WRKSRC_logutils} \
 		${WRKSRC}/src/github.com/hashicorp/logutils
-	@${MV} ${WRKDIR}/memberlist-6025015f2dc659ca2c735112d37e753bda6e329d \
+	@${MV} ${WRKSRC_memberlist} \
 		${WRKSRC}/src/github.com/hashicorp/memberlist
-	@${MV} ${WRKDIR}/raft-a8065f298505708bf60f518c09178149f3c06f21 \
+	@${MV} ${WRKSRC_raft} \
 		${WRKSRC}/src/github.com/hashicorp/raft
-	@${MV} ${WRKDIR}/raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0 \
+	@${MV} ${WRKSRC_raft_mdb} \
 		${WRKSRC}/src/github.com/hashicorp/raft-mdb
-	@${MV} ${WRKDIR}/serf-320787d8567bdcf9d77f8c5d65031fcb19e71ebc \
+	@${MV} ${WRKSRC_serf} \
 		${WRKSRC}/src/github.com/hashicorp/serf
-	@${MV} ${WRKDIR}/scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae \
+	@${MV} ${WRKSRC_scada} \
 		${WRKSRC}/src/github.com/hashicorp/scada-client
-	@${MV} ${WRKDIR}/yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d \
+	@${MV} ${WRKSRC_yamux} \
 		${WRKSRC}/src/github.com/hashicorp/yamux
-	@${MV} ${WRKDIR}/muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848 \
+	@${MV} ${WRKSRC_muxado} \
 		${WRKSRC}/src/github.com/inconshreveable/muxado
-	@${MV} ${WRKDIR}/dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1 \
+	@${MV} ${WRKSRC_dns} \
 		${WRKSRC}/src/github.com/miekg/dns
-	@${MV} ${WRKDIR}/cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9 \
+	@${MV} ${WRKSRC_cli} \
 		${WRKSRC}/src/github.com/mitchellh/cli
-	@${MV} ${WRKDIR}/mapstructure-442e588f213303bec7936deba67901f8fc8f18b1 \
+	@${MV} ${WRKSRC_mapstructure} \
 		${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKDIR}/columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a \
+	@${MV} ${WRKSRC_columnize} \
 		${WRKSRC}/src/github.com/ryanuber/columnize
-	@${MV} ${WRKDIR}/net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2 \
+	@${MV} ${WRKSRC_msgpackrpc} \
 		${WRKSRC}/src/github.com/hashicorp/net-rpc-msgpackrpc
-	@${MV} ${WRKDIR}/golang_protobuf_extensions-ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c \
+	@${MV} ${WRKSRC_protobuf_ext} \
 		${WRKSRC}/src/github.com/matttproud/golang_protobuf_extensions
-	@${MV} ${WRKDIR}/client_golang-38dbb2e26868d15db0275ddbaac0cbe450ec03de \
+	@${MV} ${WRKSRC_client_golang} \
 		${WRKSRC}/src/github.com/prometheus/client_golang
-	@${MV} ${WRKDIR}/client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6 \
+	@${MV} ${WRKSRC_client_model} \
 		${WRKSRC}/src/github.com/prometheus/client_model
-	@${MV} ${WRKDIR}/procfs-92faa308558161acab0ada1db048e9996ecec160 \
+	@${MV} ${WRKSRC_procfs} \
 		${WRKSRC}/src/github.com/prometheus/procfs
-	@${MV} ${WRKDIR}/raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee \
+	@${MV} ${WRKSRC_boltdb} \
 		${WRKSRC}/src/github.com/hashicorp/raft-boltdb
-	@${MV} ${WRKDIR}/bolt-2c04100eb9793f2b8541d243494e2909d2112325 \
+	@${MV} ${WRKSRC_bolt} \
 		${WRKSRC}/src/github.com/boltdb/bolt
-	@${MV} ${WRKDIR}/consul-migrate-4977886fc950a0db1a6f0bbadca56dfabf170f9c \
+	@${MV} ${WRKSRC_migrate} \
 		${WRKSRC}/src/github.com/hashicorp/consul-migrate
-	@${MV} ${WRKDIR}/crypto-74f810a0152f4c50a16195f6b9ff44afc35594e8 \
+	@${MV} ${WRKSRC_crypto} \
 		${WRKSRC}/src/golang.org/x/crypto
 
 do-build:

Modified: head/sysutils/consul/distinfo
==============================================================================
--- head/sysutils/consul/distinfo	Thu May 28 16:37:01 2015	(r387742)
+++ head/sysutils/consul/distinfo	Thu May 28 16:37:49 2015	(r387743)
@@ -1,70 +1,70 @@
-SHA256 (consul-0.5.2.tar.gz) = acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6
-SIZE (consul-0.5.2.tar.gz) = 1821228
-SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52
-SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748
-SHA256 (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 683d5562625ed05baaffc265bfda73a6f9afa04fc1436c98df2c9bba2f3667f1
-SIZE (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 133649
-SHA256 (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3
-SIZE (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 11268
-SHA256 (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331
-SIZE (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = 5446
-SHA256 (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68
-SIZE (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = 100298
-SHA256 (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae
-SIZE (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = 9830
-SHA256 (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8
-SIZE (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = 49485
-SHA256 (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3
-SIZE (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = 8058
-SHA256 (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907
-SIZE (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 4397
-SHA256 (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2
-SIZE (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = 7872
-SHA256 (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2
-SIZE (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 28692
-SHA256 (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c
-SIZE (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 7704
-SHA256 (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 7b808ff100db2e484e6cf338d32ed55512f4c371c5cbba498aeca632f21c830f
-SIZE (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 51853
-SHA256 (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = a952ce8348085be36a1accbb7555e8c5a1a1c2292066d1966f17994ec90276ef
-SIZE (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = 56934
-SHA256 (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1
-SIZE (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9811
-SHA256 (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 65806140d10ef5e7922acd1b89a7b3024c9feca64dd26a25601059821061e7a4
-SIZE (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 572427
-SHA256 (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7
-SIZE (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 15805
-SHA256 (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = e4ca04b27f2899bd04033d4bb8cf2c5d0eac6e916c87851ded9cfa57d1f70b5f
-SIZE (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = 19249
-SHA256 (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01
-SIZE (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 25816
-SHA256 (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 4b539f47f2ccf7fffd35490b4840fa4503506223bdb25ce957797b5a373d2743
-SIZE (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 117777
-SHA256 (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 87d7f733c0f2e778fa72951c55a7fe65ea8694f2a1f621c368ecffb111098b05
-SIZE (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 12690
-SHA256 (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2
-SIZE (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = 12220
-SHA256 (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f
-SIZE (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 3680
-SHA256 (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 035386ecdb37ee268507890c627f222960839db2757b22a9e64c4947f9f06c4d
-SIZE (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 58411
-SHA256 (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 0eb8244654cf9e461ce6338cdb7c6ab28dc118d425497e5f6045808e24932a0f
-SIZE (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 2805
-SHA256 (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9f44314e29e16bf598392f0815ea8d1ba4ba519c10cfa085330c41ea41b17da9
-SIZE (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9806
-SHA256 (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = af20838f56cdfcbbd5e4d6989b28dad69ddd80682a2d0332b85093ffe36a1afb
-SIZE (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = 103898
-SHA256 (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9
-SIZE (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = 54855
-SHA256 (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = fafefa92613aec2aa2f411d98c7f677c7beb7cb3bc78f961a900ae5b49af061c
-SIZE (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = 11214
 SHA256 (0.5.2_web_ui.zip) = ad883aa52e1c0136ab1492bbcedad1210235f26d59719fb6de3ef6464f1ff3b1
 SIZE (0.5.2_web_ui.zip) = 252584
-SHA256 (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e
-SIZE (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 8881
-SHA256 (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = c0cdbaa6ec724c73799003ba166a4c9f1c6f1cc1b9760f98ef2d2a2a431577da
-SIZE (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = 69587
-SHA256 (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 5a2334dd710f775a50ccffe8b02431e43ef30ad71d4eedb184fa0c77a24b4365
-SIZE (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 12871
-SHA256 (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 432fd0fd3e7c2701e1111147af13f1f6b566ed674342d417c0d8eec503e79989
-SIZE (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 864744
+SHA256 (hashicorp-consul-v0.5.2_GH0.tar.gz) = acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6
+SIZE (hashicorp-consul-v0.5.2_GH0.tar.gz) = 1821228
+SHA256 (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 49133eeca2707d2c025219f261dd3ebd8155fe22907c412445b8ffc7a4137755
+SIZE (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 9826
+SHA256 (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 052a52b77e262daa6f4bb618970d6673dd77713be031c6da18bd3aff5bc1448d
+SIZE (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 49479
+SHA256 (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = e730020ed331e0fed430a5f725de4c5f61aa7f240258f797833d1689efb178b0
+SIZE (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = 8064
+SHA256 (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = c092db8da3dc2c7279b4ad6afbb6ee7c4daae9ac3020a591096be59f94330544
+SIZE (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = 4394
+SHA256 (hashicorp-golang-lru-995efda_GH0.tar.gz) = d67757033d551d5d4949b099c1f5933aaeb2931c3398c1509eb4948cb2623b15
+SIZE (hashicorp-golang-lru-995efda_GH0.tar.gz) = 7871
+SHA256 (hashicorp-hcl-513e04c_GH0.tar.gz) = 9cb1e4a7fb176da78d8e9d001faf4290ed3717659f663e37ee5937544f22ee3c
+SIZE (hashicorp-hcl-513e04c_GH0.tar.gz) = 28683
+SHA256 (hashicorp-logutils-367a65d_GH0.tar.gz) = 8d5c3590f17c3bd5cb11d3edf93ee082fe3fb18a05edfddca4aaa2e7c064cd1e
+SIZE (hashicorp-logutils-367a65d_GH0.tar.gz) = 7703
+SHA256 (hashicorp-memberlist-6025015_GH0.tar.gz) = 41f025ceeb51b7a21a3cfe2dd82af937d7b5059e16d6abf0b5daf01503bb3a26
+SIZE (hashicorp-memberlist-6025015_GH0.tar.gz) = 51849
+SHA256 (hashicorp-raft-a8065f2_GH0.tar.gz) = d501b00077052522db41515c213c4eb095a6df03950e0461607fcd39e99f379b
+SIZE (hashicorp-raft-a8065f2_GH0.tar.gz) = 56862
+SHA256 (hashicorp-raft-mdb-4ec3694_GH0.tar.gz) = 5bfbd917fc4cb650d6420adfc0887a8da0e5c55d77868c305aeb2b2003f745e3
+SIZE (hashicorp-raft-mdb-4ec3694_GH0.tar.gz) = 9809
+SHA256 (hashicorp-serf-320787d_GH0.tar.gz) = 5879495cdc54bf6b022d06ff1ff5c84c4d12a0c16f4af38d192ac7873225cb55
+SIZE (hashicorp-serf-320787d_GH0.tar.gz) = 572308
+SHA256 (hashicorp-scada-client-c26580c_GH0.tar.gz) = 5690d7ba2f01a39693571eecf8dcdd16a588efced8f140ea19dbee8aaefe5b36
+SIZE (hashicorp-scada-client-c26580c_GH0.tar.gz) = 15800
+SHA256 (hashicorp-yamux-b2e5585_GH0.tar.gz) = 38e3b567240898d870c5134cace538bfc7df9105d2d0cdd487fb1bd5e8e895f4
+SIZE (hashicorp-yamux-b2e5585_GH0.tar.gz) = 19245
+SHA256 (hashicorp-consul-migrate-4977886_GH0.tar.gz) = 39d0caf52c03debdc25f827686e5c18d173dca95e8d1403dff23ae714137109a
+SIZE (hashicorp-consul-migrate-4977886_GH0.tar.gz) = 12845
+SHA256 (hashicorp-net-rpc-msgpackrpc-d377902_GH0.tar.gz) = 2d57363825d8da1ce2f1608f67bdef99c3db10b56294f8c9bc3a1ffe3060cf4e
+SIZE (hashicorp-net-rpc-msgpackrpc-d377902_GH0.tar.gz) = 2806
+SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
+SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
+SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b
+SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744
+SHA256 (armon-go-metrics-a54701e_GH0.tar.gz) = 31550ea79de7e4e5beadfa6d3b43dd58a1ce144cbda29c74970cc6ebb956cd05
+SIZE (armon-go-metrics-a54701e_GH0.tar.gz) = 11259
+SHA256 (armon-go-radix-0bab926_GH0.tar.gz) = 2ff6c92d418018e16078ce5b51287cb429f79d73dca62b63f77c37b66fbdf9d1
+SIZE (armon-go-radix-0bab926_GH0.tar.gz) = 5447
+SHA256 (armon-gomdb-151f2e0_GH0.tar.gz) = 52a16b34c6b609276977e005d829604b214869c3745fb63b2017124c3039906f
+SIZE (armon-gomdb-151f2e0_GH0.tar.gz) = 100222
+SHA256 (golang-protobuf-5677a0e_GH0.tar.gz) = 90ec47cb66083182e2ba8bf69adf751ed41c778248b421e691bcd70d01a50d06
+SIZE (golang-protobuf-5677a0e_GH0.tar.gz) = 133568
+SHA256 (golang-crypto-74f810a_GH0.tar.gz) = 25e0c9cb7c6d6a5935aa318c9792fa6e18c8e0238994b5be039f90c8d58fd680
+SIZE (golang-crypto-74f810a_GH0.tar.gz) = 864642
+SHA256 (boltdb-bolt-2c04100_GH0.tar.gz) = 569f48d921b5df3796fe2dc6768506c4cada55c7d8a441885e2c3ab362bcfc3d
+SIZE (boltdb-bolt-2c04100_GH0.tar.gz) = 69541
+SHA256 (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 2ef25a734872d8beb7740fbf58598f56653d6c47d0ee971ca950dad90823344d
+SIZE (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 25814
+SHA256 (matttproud-golang_protobuf_extensions-ba7d65a_GH0.tar.gz) = 54a6776542b2c069a63c0f1f34ef9414fa24dc1f7acab03334ca5be22011a879
+SIZE (matttproud-golang_protobuf_extensions-ba7d65a_GH0.tar.gz) = 9806
+SHA256 (miekg-dns-bb1103f_GH0.tar.gz) = f0dda560702df67459697ac05c439a1f65cff3d5ea540dd53a00deb220c9b5e6
+SIZE (miekg-dns-bb1103f_GH0.tar.gz) = 117681
+SHA256 (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 548d9450e53b527aaa494d060769d91449f2daeeed4ae77e818117b169f19937
+SIZE (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 12683
+SHA256 (mitchellh-mapstructure-442e588_GH0.tar.gz) = 5ca01f6ba1175733ae94a13e532e9465b11951519dcdcc6693651842ed1d6205
+SIZE (mitchellh-mapstructure-442e588_GH0.tar.gz) = 12216
+SHA256 (prometheus-client_golang-38dbb2e_GH0.tar.gz) = b54cc041d0b7c7257c095f2fbac58fa197dfc71f63601c841698b6520e44f6e5
+SIZE (prometheus-client_golang-38dbb2e_GH0.tar.gz) = 103905
+SHA256 (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 726ebe6d3aba7c99ffc30788972ef693d0521072c6a33794a9d8ee1f26389466
+SIZE (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 54787
+SHA256 (prometheus-procfs-92faa30_GH0.tar.gz) = a627c3e4c84b3be43dd6dbcba414e6bbcee5817dd216ff3570869e46570ef2e7
+SIZE (prometheus-procfs-92faa30_GH0.tar.gz) = 11214
+SHA256 (ryanuber-columnize-44cb478_GH0.tar.gz) = 6d69bf022706ff59a5e5478da7e437451b62dcc8c614fde10b104d830148644b
+SIZE (ryanuber-columnize-44cb478_GH0.tar.gz) = 3673
+SHA256 (ugorji-go-e906e39_GH0.tar.gz) = a311502741f9c2bb13598711d7275e9756f9b8f6e60704ca3664737a3150aaa9
+SIZE (ugorji-go-e906e39_GH0.tar.gz) = 58379

Modified: head/sysutils/osquery/Makefile
==============================================================================
--- head/sysutils/osquery/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/sysutils/osquery/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -5,10 +5,6 @@ PORTNAME=	osquery
 PORTVERSION=	1.4.5
 PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	GH:ghc \
-		https://codeload.github.com/${PORTNAME}/third-party/tar.gz/${PORTVERSION}?dummy=/:gh
-DISTFILES=	${DISTNAME}.tar.gz:ghc \
-		third-party-${PORTVERSION}.tar.gz:gh
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	SQL powered OS instrumentation, monitoring, and analytics
@@ -39,7 +35,8 @@ CMAKE_ARGS+=	-DFREEBSD=awesome -DCMAKE_S
 BLDDIR=		${WRKDIR}/.build/${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}d
 USE_GITHUB=	yes
-GH_ACCOUNT=	facebook
+GH_ACCOUNT=	facebook ${PORTNAME}:tp
+GH_PROJECT=	third-party:tp
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
@@ -50,7 +47,7 @@ CFLAGS+=	-D_GLIBCXX_USE_C99
 
 post-extract:
 	${RMDIR} ${WRKSRC}/third-party
-	${LN} -sf ${WRKDIR}/third-party-${PORTVERSION} ${WRKSRC}/third-party
+	${LN} -sf ${WRKSRC_tp} ${WRKSRC}/third-party
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/var/osquery|/var/db/osquery|g' \

Modified: head/sysutils/osquery/distinfo
==============================================================================
--- head/sysutils/osquery/distinfo	Thu May 28 16:37:01 2015	(r387742)
+++ head/sysutils/osquery/distinfo	Thu May 28 16:37:49 2015	(r387743)
@@ -1,4 +1,4 @@
 SHA256 (facebook-osquery-1.4.5_GH0.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738
 SIZE (facebook-osquery-1.4.5_GH0.tar.gz) = 412622
-SHA256 (third-party-1.4.5.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f
-SIZE (third-party-1.4.5.tar.gz) = 6073986
+SHA256 (osquery-third-party-1.4.5_GH0.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f
+SIZE (osquery-third-party-1.4.5_GH0.tar.gz) = 6073986

Modified: head/sysutils/serf/Makefile
==============================================================================
--- head/sysutils/serf/Makefile	Thu May 28 16:37:01 2015	(r387742)
+++ head/sysutils/serf/Makefile	Thu May 28 16:37:49 2015	(r387743)
@@ -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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505281637.t4SGboDe021000>