127 files changed, 194 insertions, 315 deletions

diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 7fce9ff26bf0..512ce9fef2b3 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -14,7 +14,6 @@ LICENSE=	LGPL3
 USE_GITHUB=	yes
 GH_ACCOUNT=	lyricat
 GH_PROJECT=	Hotot
-GH_COMMIT=	1f68d33
 
 USES=		cmake gettext python
 USE_GNOME=	intltool
diff --git a/net-im/hotot/distinfo b/net-im/hotot/distinfo
index a21fe0488b0a..e26205303a1f 100644
--- a/net-im/hotot/distinfo
+++ b/net-im/hotot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hotot-0.9.8.14.tar.gz) = 144ee6ce7e43cac6ba9b45b355b21d3d343bd83bf63273de22dcef892f7a29a4
-SIZE (hotot-0.9.8.14.tar.gz) = 1234375
+SHA256 (lyricat-Hotot-0.9.8.14_GH0.tar.gz) = 1e67a8c39cfe250ed86633f9aedf366d25fe8133cca98fb0f28b9c1a0d7edd7b
+SIZE (lyricat-Hotot-0.9.8.14_GH0.tar.gz) = 1234004
diff --git a/net-im/libjreen/Makefile b/net-im/libjreen/Makefile
index 844b406bfb9f..cdb05012b8b9 100644
--- a/net-im/libjreen/Makefile
+++ b/net-im/libjreen/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libjreen
 PORTVERSION=	1.1.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
 MAINTAINER=	akuz84@gmail.com
@@ -13,9 +14,7 @@ LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca \
 		libspeex.so:${PORTSDIR}/audio/speex
 
 GH_ACCOUNT=	euroelessar
-GH_COMMIT=	388621f
 GH_PROJECT=	jreen
-GH_TAGNAME=	v${PORTVERSION}
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/net-im/libjreen/distinfo b/net-im/libjreen/distinfo
index 20e804e22763..813db8216042 100644
--- a/net-im/libjreen/distinfo
+++ b/net-im/libjreen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libjreen-1.1.1.tar.gz) = 7ecd2e4960caa47ca0632efbe234b3623865a7dd128040aaa448dd0747b5e439
-SIZE (libjreen-1.1.1.tar.gz) = 292173
+SHA256 (euroelessar-jreen-v1.1.1_GH0.tar.gz) = 0bd81dc10cc1f7abd48ae0bc400e2232c57f4ac890ddbaf47ea4fd7df0c9af07
+SIZE (euroelessar-jreen-v1.1.1_GH0.tar.gz) = 292082
diff --git a/net-im/libstrophe/Makefile b/net-im/libstrophe/Makefile
index 6fbc84ff41b3..b77eea543849 100644
--- a/net-im/libstrophe/Makefile
+++ b/net-im/libstrophe/Makefile
@@ -14,9 +14,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	strophe
-GH_PROJECT=	libstrophe
-GH_COMMIT=	2093aac
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	2093aac
 USES=		libtool pkgconfig autoreconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
diff --git a/net-im/libstrophe/distinfo b/net-im/libstrophe/distinfo
index 747644826987..4071fb0a3a47 100644
--- a/net-im/libstrophe/distinfo
+++ b/net-im/libstrophe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libstrophe-0.8.7.tar.gz) = 455ee68951a1460d71676ce1e4d50f21a0af07bdca3e3a1c44fd149e5a375bed
-SIZE (libstrophe-0.8.7.tar.gz) = 125960
+SHA256 (strophe-libstrophe-0.8.7-2093aac_GH0.tar.gz) = c8927e72f1d714f36be4169ff45f69c67fb7ac4464b9c7cc488f73840feced74
+SIZE (strophe-libstrophe-0.8.7-2093aac_GH0.tar.gz) = 125937
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index 72b8ed7c203a..c1ce0840c68a 100644
--- a/net-im/proxy65/Makefile
+++ b/net-im/proxy65/Makefile
@@ -13,9 +13,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-op
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmatuska
-GH_COMMIT=	4e76bf2
-GH_PROJECT=     ${PORTNAME}
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	4e76bf2
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE= SERVER
diff --git a/net-im/proxy65/distinfo b/net-im/proxy65/distinfo
index cfb1b435ce04..abecc0260b6a 100644
--- a/net-im/proxy65/distinfo
+++ b/net-im/proxy65/distinfo
@@ -1,2 +1,2 @@
-SHA256 (proxy65-1.2.0.20150210.tar.gz) = ea3c03e0dd5dc14e44ce75335ff6843f8af9c94152654c1cd43ed1f679480f54
-SIZE (proxy65-1.2.0.20150210.tar.gz) = 9416
+SHA256 (mmatuska-proxy65-1.2.0.20150210-4e76bf2_GH0.tar.gz) = ede4367eeb9c7634abce66e11ee316e04c10c2a04558a94457fe0ef1032bff35
+SIZE (mmatuska-proxy65-1.2.0.20150210-4e76bf2_GH0.tar.gz) = 9410
diff --git a/net-im/py-sleekxmpp/Makefile b/net-im/py-sleekxmpp/Makefile
index 0c64da429e07..0436d0222117 100644
--- a/net-im/py-sleekxmpp/Makefile
+++ b/net-im/py-sleekxmpp/Makefile
@@ -16,7 +16,5 @@ USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	fritzy
 GH_PROJECT=	SleekXMPP
-GH_TAGNAME=	1.3.1
-GH_COMMIT=	e558269
 
 .include <bsd.port.mk>
diff --git a/net-im/py-sleekxmpp/distinfo b/net-im/py-sleekxmpp/distinfo
index 6905f51b6a3f..2d23ea7901b7 100644
--- a/net-im/py-sleekxmpp/distinfo
+++ b/net-im/py-sleekxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sleekxmpp-1.3.1.tar.gz) = e5ed93b6c4bc302573396bfc8a8bcbe3bfa6d90eca7d5ace8655843890983f13
-SIZE (sleekxmpp-1.3.1.tar.gz) = 1014109
+SHA256 (fritzy-SleekXMPP-1.3.1_GH0.tar.gz) = 72f2887ccb29bd53f9bbf09225274d11d75e88507ea3ddee97cef0b289bcb04f
+SIZE (fritzy-SleekXMPP-1.3.1_GH0.tar.gz) = 1014004
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index b9707cad4539..f2fa30c15671 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qTox
 PORTVERSION=	0.150426
+PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -38,7 +39,7 @@ pre-everything::
 	@${ECHO_MSG}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_COMMIT}"|' \
+	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \
 		${WRKSRC}/qtox.pro
 	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "/usr/local/include|' \
 		${WRKSRC}/qtox.pro
diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index 4f9f98089ffb..e7955568fbe5 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	qxmpp
 PORTVERSION=	0.8.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
-MASTER_SITES=	GHL
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	QXmpp is an xmpp client library based on Qt & C++
@@ -17,8 +17,6 @@ USE_QT4=	gui network qtestlib xml uic_build moc_build \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qxmpp-project
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	cc09061
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|g' \
diff --git a/net-im/qxmpp/distinfo b/net-im/qxmpp/distinfo
index aef14fa22478..0f1348d042fc 100644
--- a/net-im/qxmpp/distinfo
+++ b/net-im/qxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qxmpp-0.8.0.tar.gz) = 030ca763d778d4b8e01a7697a8f6de0a3d31734384c524c458b1456ff7b867e4
-SIZE (qxmpp-0.8.0.tar.gz) = 275656
+SHA256 (qxmpp-project-qxmpp-v0.8.0_GH0.tar.gz) = 00aa821ab9e18d33ad15f12ae80aca8c3d9180e40d419ae34a90bfab91a78b02
+SIZE (qxmpp-project-qxmpp-v0.8.0_GH0.tar.gz) = 275638
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index 3e9b297f5629..12b43ed38163 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	sendxmpp
-PORTVERSION=	1.24.0
+PORTVERSION=	1.24
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im perl5
 
 MAINTAINER=	mek@mek.uz.ua
@@ -15,8 +16,6 @@ RUN_DEPENDS=	p5-Getopt-Long>0.0:${PORTSDIR}/devel/p5-Getopt-Long
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lhost
-GH_TAGNAME=	v1.24
-GH_COMMIT=	f596346
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-im/sendxmpp/distinfo b/net-im/sendxmpp/distinfo
index dd4e80cbf09c..fb118a31786f 100644
--- a/net-im/sendxmpp/distinfo
+++ b/net-im/sendxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sendxmpp-1.24.0.tar.gz) = 8126125accf11014d6b4f1963d951ccbe2fc1a7f1ed9fe6dee207600f66183ee
-SIZE (sendxmpp-1.24.0.tar.gz) = 9662
+SHA256 (lhost-sendxmpp-v1.24_GH0.tar.gz) = dfaf735b4585efd6b3b0f95db31203f9ab0fe607b50e75c6951bc18a6269837d
+SIZE (lhost-sendxmpp-v1.24_GH0.tar.gz) = 9657
diff --git a/net-im/sigram/Makefile b/net-im/sigram/Makefile
index f17d1c5a4648..d93468b0d981 100644
--- a/net-im/sigram/Makefile
+++ b/net-im/sigram/Makefile
@@ -13,8 +13,7 @@ LICENSE=	GPLv3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sialan-labs
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	ce3fb15
+GH_TAGNAME=	ce3fb15
 
 USE_OPENSSL=	yes
 USE_QT5=	core gui network opengl xml widgets buildtools_build graphicaleffects \
diff --git a/net-im/sigram/distinfo b/net-im/sigram/distinfo
index 955559d5095e..3e2fa1340557 100644
--- a/net-im/sigram/distinfo
+++ b/net-im/sigram/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sigram-0.11182014.tar.gz) = 2860cdce80f86f45344df498b457ad995a2d30818c068c4c22d4694028ef3238
-SIZE (sigram-0.11182014.tar.gz) = 4186107
+SHA256 (sialan-labs-sigram-0.11182014-ce3fb15_GH0.tar.gz) = f304751442fab594f14fea0d17532f7c4e3d005c528b6230b70f393baf613fc5
+SIZE (sialan-labs-sigram-0.11182014-ce3fb15_GH0.tar.gz) = 4185497
diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile
index cdade05a277c..569527ee87e9 100644
--- a/net-im/telegram/Makefile
+++ b/net-im/telegram/Makefile
@@ -17,8 +17,6 @@ LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
 USE_GITHUB=	yes
 GH_ACCOUNT=	vysheng
 GH_PROJECT=	tg
-GH_TAGNAME=	1.0.5.1
-GH_COMMIT=	77bbb4c
 
 USES=		execinfo gmake lua:52 ncurses pkgconfig readline
 USE_OPENSSL=	yes
diff --git a/net-im/telegram/distinfo b/net-im/telegram/distinfo
index 19299696862e..79789ef088a2 100644
--- a/net-im/telegram/distinfo
+++ b/net-im/telegram/distinfo
@@ -1,2 +1,2 @@
-SHA256 (telegram-1.0.5.1.tar.gz) = 42fcb2208a3534f15277fe466f9372db088910e7c5aa550b3e2269b84152aa31
-SIZE (telegram-1.0.5.1.tar.gz) = 390920
+SHA256 (vysheng-tg-1.0.5.1_GH0.tar.gz) = 5a78fd46e978ff450eda6f4664499042dddf053f4fe233fe3157499869646fb8
+SIZE (vysheng-tg-1.0.5.1_GH0.tar.gz) = 390832
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index dc946a444e8c..4f2c23b7dbaa 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	toxic
 PORTVERSION=	0.6.0.150401
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -40,7 +41,7 @@ LDFLAGS+=	-B${LOCALBASE}/bin
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_COMMIT}|'	\
+	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_TAGNAME}|'	\
 		${WRKSRC}/cfg/global_vars.mk
 
 post-install:
diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile
index 8d6780f5cc0c..e0ecdad82dc3 100644
--- a/net-mgmt/arpscan/Makefile
+++ b/net-mgmt/arpscan/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	arpscan
 PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	GHL
-DIST_SUBDIR=	repacked
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple arp scanner
@@ -18,8 +16,7 @@ LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jasonish
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	e59831a
+GH_TAGNAME=	e59831a
 
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 AUTOMAKE_ARGS=	--add-missing --copy
diff --git a/net-mgmt/arpscan/distinfo b/net-mgmt/arpscan/distinfo
index 950b0ddb73ee..50a7ad2d3db4 100644
--- a/net-mgmt/arpscan/distinfo
+++ b/net-mgmt/arpscan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/arpscan-0.5.tar.gz) = e3fc78ef7f6bfa558a5c40025750d4fdc505bc632be6af1bdd83102c2782cfb3
-SIZE (repacked/arpscan-0.5.tar.gz) = 5187
+SHA256 (jasonish-arpscan-0.5-e59831a_GH0.tar.gz) = f7d81c929b8885a56cc104f3a17def4edeb72f1bfecc679d926b1ba2d7e0156a
+SIZE (jasonish-arpscan-0.5-e59831a_GH0.tar.gz) = 5174
diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
index 6e249b8c5e21..da3447371abc 100644
--- a/net-mgmt/ccnet/Makefile
+++ b/net-mgmt/ccnet/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	ccnet
 PORTVERSION=	4.0.6
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-server
 PORTREVISION=	5
 CATEGORIES=	net-mgmt devel
 
@@ -23,8 +25,6 @@ LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
-GH_TAGNAME=	v${PORTVERSION}-server
-GH_COMMIT=	1e1aeae
 
 USES=		autoreconf libtool pkgconfig pathfix python:2
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/net-mgmt/ccnet/distinfo b/net-mgmt/ccnet/distinfo
index 21369cbee60d..1c33db983154 100644
--- a/net-mgmt/ccnet/distinfo
+++ b/net-mgmt/ccnet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccnet-4.0.6.tar.gz) = 4030d931c2aaad5d2d783c4afb2e2cda556a91307c26a378c91602540255b7eb
-SIZE (ccnet-4.0.6.tar.gz) = 218569
+SHA256 (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = d9793715b3473a161f802224dbeac75744e70313f073f8e0b7191b9141c36812
+SIZE (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = 218550
diff --git a/net-mgmt/nagios-check_ports/Makefile b/net-mgmt/nagios-check_ports/Makefile
index 4fa472ad900e..e432511235b3 100644
--- a/net-mgmt/nagios-check_ports/Makefile
+++ b/net-mgmt/nagios-check_ports/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	check_ports
 PORTVERSION=	0.7.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMEPREFIX=	nagios-
@@ -12,8 +13,6 @@ COMMENT=	monitor FreeBSD ports for updates or vulnerabilities
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rfrederick
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	4e039d7
 
 NO_BUILD=	yes
 
diff --git a/net-mgmt/nagios-check_ports/distinfo b/net-mgmt/nagios-check_ports/distinfo
index 44ac5df7e527..0587d568510c 100644
--- a/net-mgmt/nagios-check_ports/distinfo
+++ b/net-mgmt/nagios-check_ports/distinfo
@@ -1,2 +1,2 @@
-SHA256 (check_ports-0.7.1.tar.gz) = 0603c67f999b8d34984b503e683437b76f58e3aac592537ce93db0e98f3ce8f5
-SIZE (check_ports-0.7.1.tar.gz) = 4946
+SHA256 (rfrederick-check_ports-v0.7.1_GH0.tar.gz) = 50a12775138635031cf652632a779014d2365e0e66091daf6fb9ba1f05e3df3e
+SIZE (rfrederick-check_ports-v0.7.1_GH0.tar.gz) = 4941
diff --git a/net-mgmt/nagios-pf-plugin/Makefile b/net-mgmt/nagios-pf-plugin/Makefile
index e9557586ca39..6bcda14724a9 100644
--- a/net-mgmt/nagios-pf-plugin/Makefile
+++ b/net-mgmt/nagios-pf-plugin/Makefile
@@ -5,16 +5,13 @@ PORTNAME=	nagios-pf-plugin
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
-DISTNAME=	check_pf-${PORTVERSION}
 
 MAINTAINER=	rand@iteris.com
 COMMENT=	Nagios plugin for checking PF
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kian
-GH_PROJECT=	nagios-pf-plugin
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	2aba423
+GH_TAGNAME=	2aba423
 
 PLIST_FILES=	libexec/nagios/check_pf
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/nagios-pf-plugin/distinfo b/net-mgmt/nagios-pf-plugin/distinfo
index b56faaf24d81..6971390d96f8 100644
--- a/net-mgmt/nagios-pf-plugin/distinfo
+++ b/net-mgmt/nagios-pf-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (check_pf-0.1.tar.gz) = 5a6a5a2cdfed35bf1f07a8a49b139a7e423fb6cc06403aabc1fc1609c5d8782d
-SIZE (check_pf-0.1.tar.gz) = 3145
+SHA256 (kian-nagios-pf-plugin-0.1-2aba423_GH0.tar.gz) = bc7e115024dc4684f895a3afba236d9b69d7e3f5695ce83fdcaddad5c3526703
+SIZE (kian-nagios-pf-plugin-0.1-2aba423_GH0.tar.gz) = 3142
diff --git a/net-mgmt/ng_ipacct/Makefile b/net-mgmt/ng_ipacct/Makefile
index 57248b4f1f0a..4b83b2ca9c94 100644
--- a/net-mgmt/ng_ipacct/Makefile
+++ b/net-mgmt/ng_ipacct/Makefile
@@ -14,9 +14,6 @@ USE_GITHUB=	yes
 USES=		kmod uidfix
 
 GH_ACCOUNT=	vstakhov
-GH_PROJECT=	ng_ipacct
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	68ff97c
 
 MAKE_ENV=	BINDIR="${PREFIX}/sbin"
 
diff --git a/net-mgmt/ng_ipacct/distinfo b/net-mgmt/ng_ipacct/distinfo
index e78ce7ef381e..531d97226f4c 100644
--- a/net-mgmt/ng_ipacct/distinfo
+++ b/net-mgmt/ng_ipacct/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ng_ipacct-20150304.tar.gz) = 10d0ca1d77cd836edbc0fa258c7db2a428a59a772ec96de4c9213a598e8108cc
-SIZE (ng_ipacct-20150304.tar.gz) = 24569
+SHA256 (vstakhov-ng_ipacct-20150304_GH0.tar.gz) = 4ad4412656d415d0841d5ba30dfa367179fc4e7f70f002990540fafdee3bc784
+SIZE (vstakhov-ng_ipacct-20150304_GH0.tar.gz) = 24567
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index 22fd6785a293..3f9ab7f6d3e3 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	seafile-gui
 PORTVERSION=	4.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
-DISTNAME=	seafile-client-${PORTVERSION}
 
 MAINTAINER=	yan_jingfeng@yahoo.com
 COMMENT=	Seafile desktop client
@@ -20,8 +20,6 @@ LIB_DEPENDS+=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_PROJECT=	seafile-client
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	74817c4	
 
 USES=		cmake pkgconfig
 USE_QT4=	corelib dbus gui network \
diff --git a/net-mgmt/seafile-gui/distinfo b/net-mgmt/seafile-gui/distinfo
index 41b946709dd6..ce8aae31724b 100644
--- a/net-mgmt/seafile-gui/distinfo
+++ b/net-mgmt/seafile-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seafile-client-4.1.0.tar.gz) = 7de5d09fa969c18a37d3f71ccafa82f7e678440616ce61819e245a98aded768d
-SIZE (seafile-client-4.1.0.tar.gz) = 1002057
+SHA256 (haiwen-seafile-client-v4.1.0_GH0.tar.gz) = 3e50ad0b3885b794e96c289aa90d138ab3ac09e82417f88cb48822916e8fca13
+SIZE (haiwen-seafile-client-v4.1.0_GH0.tar.gz) = 1002135
diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index f7a5fefa7cb3..a66311246889 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	seafile
 PORTVERSION=	4.0.6
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-server
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	yan_jingfeng@yahoo.com
@@ -25,8 +27,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestin
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
-GH_TAGNAME=	v${PORTVERSION}-server
-GH_COMMIT=	adf9a87
 
 USES=		autoreconf iconv libtool pathfix pkgconfig python:2 shebangfix
 SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh
diff --git a/net-mgmt/seafile/distinfo b/net-mgmt/seafile/distinfo
index fa9aa289dc0e..6f2aadde96a7 100644
--- a/net-mgmt/seafile/distinfo
+++ b/net-mgmt/seafile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seafile-4.0.6.tar.gz) = af1b568905a85ba2da06593f93a70226526ad310320c071bd70356fb77106bc9
-SIZE (seafile-4.0.6.tar.gz) = 1082450
+SHA256 (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 3f9aacc53c67aa165c66a4546a6f8c7ad3a002f741578a538b0c0965a73317bf
+SIZE (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 1082453
diff --git a/net-p2p/bitmessage/Makefile b/net-p2p/bitmessage/Makefile
index 06c58d549755..c2c30f112366 100644
--- a/net-p2p/bitmessage/Makefile
+++ b/net-p2p/bitmessage/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	bitmessage
 PORTVERSION=	0.4.4
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-p2p
-MASTER_SITES=	GHL
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Secure P2P communications client
@@ -19,8 +19,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Bitmessage
 GH_PROJECT=	PyBitmessage
-GH_COMMIT=	c9c301a
-GH_TAGNAME=	v${PORTVERSION}
 
 USES=		python
 USE_OPENSSL=	yes
diff --git a/net-p2p/bitmessage/distinfo b/net-p2p/bitmessage/distinfo
index c4a6f9912070..27c2d7f94d52 100644
--- a/net-p2p/bitmessage/distinfo
+++ b/net-p2p/bitmessage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitmessage-0.4.4.tar.gz) = c3defe802abfb45d73e26b38fd949595d8ff8c412b82aef64f3747904a7895da
-SIZE (bitmessage-0.4.4.tar.gz) = 611592
+SHA256 (Bitmessage-PyBitmessage-v0.4.4_GH0.tar.gz) = 2fe2b1ad4d7426c8777fb429129b7a07c717ea5f00cc3041a03ac19fd3259b3a
+SIZE (Bitmessage-PyBitmessage-v0.4.4_GH0.tar.gz) = 611490
diff --git a/net-p2p/digitalcoin/Makefile b/net-p2p/digitalcoin/Makefile
index 9b63c7dc7ee3..4bd47dac3ea6 100644
--- a/net-p2p/digitalcoin/Makefile
+++ b/net-p2p/digitalcoin/Makefile
@@ -12,13 +12,9 @@ COMMENT=	Alternative Bitcoin peer-to-peer currency client
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libminiupnpc.so:${PORTSDIR}/net/miniupnpc
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_COMMIT}
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	baritus
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	96b098a
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	96b098a
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/net-p2p/digitalcoin/distinfo b/net-p2p/digitalcoin/distinfo
index 07b98f945f07..9748419facab 100644
--- a/net-p2p/digitalcoin/distinfo
+++ b/net-p2p/digitalcoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (digitalcoin-1.0.0.0b.tar.gz) = 5ef55e55eb0fc6ec6b86aa559a93cca9e23f1f0cba10b6635527d58373679f14
-SIZE (digitalcoin-1.0.0.0b.tar.gz) = 1873811
+SHA256 (baritus-digitalcoin-1.0.0.0b-96b098a_GH0.tar.gz) = e01fecd72ddb66f5c4b318d7349c0d6a843984e8409d43b7a82eb6d4533e3f80
+SIZE (baritus-digitalcoin-1.0.0.0b-96b098a_GH0.tar.gz) = 1873408
diff --git a/net-p2p/dogecoin/Makefile b/net-p2p/dogecoin/Makefile
index 9df2a07bf7a3..6fa9bd3d7911 100644
--- a/net-p2p/dogecoin/Makefile
+++ b/net-p2p/dogecoin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dogecoin
 PORTVERSION=	1.8.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	swills@FreeBSD.org
@@ -22,9 +23,6 @@ UPNP_DESC=	Build with UPNP support
 QRCODES_DESC=	Build with QR code display
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME}
-GH_COMMIT=	c4209a3
-GH_TAGNAME=	v${PORTVERSION}
 
 USES=		gmake compiler:c++11-lib pkgconfig autoreconf
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/dogecoin/distinfo b/net-p2p/dogecoin/distinfo
index 1f8279ade49c..85c902976b99 100644
--- a/net-p2p/dogecoin/distinfo
+++ b/net-p2p/dogecoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dogecoin-1.8.0.tar.gz) = 8eb2d30175cda6065f9dc8e2b6a937eb0e638119fec3966ed3ec0afa87743680
-SIZE (dogecoin-1.8.0.tar.gz) = 8049394
+SHA256 (dogecoin-dogecoin-v1.8.0_GH0.tar.gz) = 8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935
+SIZE (dogecoin-dogecoin-v1.8.0_GH0.tar.gz) = 8049653
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index e95cd5c9fb20..c51d70cc3338 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	litecoin
 PORTVERSION=	0.8.6.2
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-p2p finance
-MASTER_SITES=	LOCAL/swills \
-		GHL
+MASTER_SITES=	LOCAL/swills
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Virtual Peer-to-Peer Currency Software
@@ -15,8 +15,6 @@ LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	litecoin-project
-GH_COMMIT=	fa2cfea
-GH_TAGNAME=	v${PORTVERSION}
 
 USE_OPENSSL=	yes
 USE_BDB=	yes
diff --git a/net-p2p/litecoin/distinfo b/net-p2p/litecoin/distinfo
index ef46c993a379..0ccb91dd56e3 100644
--- a/net-p2p/litecoin/distinfo
+++ b/net-p2p/litecoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (litecoin-0.8.6.2.tar.gz) = 74aabe6e02e8adfadcb982f2cab542248c991ceb7e9ec84db9d99e6886761b9a
-SIZE (litecoin-0.8.6.2.tar.gz) = 4806869
+SHA256 (litecoin-project-litecoin-v0.8.6.2_GH0.tar.gz) = 724d4729f869337a334a95f72acceca815531dcce906c92a76e7686a75235c97
+SIZE (litecoin-project-litecoin-v0.8.6.2_GH0.tar.gz) = 4806593
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index 5e61a96c3614..1733e8078a2f 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	namecoin
 PORTVERSION=	Q.3.72
+DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	net-p2p dns
-MASTER_SITES=	GHL
 
 MAINTAINER=	milios@ccsys.com
 COMMENT=	Decentralized, open DNS system and general purpose key/value store
@@ -21,8 +21,6 @@ QRCODES_DESC=	Build with QR code display
 USE_GITHUB=	yes
 GH_ACCOUNT=	namecoinq
 GH_PROJECT=	namecoinq
-GH_COMMIT=	cdf052b
-GH_TAGNAME=	v${PORTVERSION}
 
 USES=		gmake compiler:c++11-lib
 USE_OPENSSL=	yes
diff --git a/net-p2p/namecoin/distinfo b/net-p2p/namecoin/distinfo
index 1b3ea336c2e0..deb4b537b2b5 100644
--- a/net-p2p/namecoin/distinfo
+++ b/net-p2p/namecoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (namecoin-Q.3.72.tar.gz) = 426b6c10b999ed11f436b2d8a56715a4355d30af41e13a1fd6e6ee5dd8348775
-SIZE (namecoin-Q.3.72.tar.gz) = 1453900
+SHA256 (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 74d088f96735b3397b9a71bc10bbbe1211cd2594baf593c4b9062457c1d4b869
+SIZE (namecoinq-namecoinq-vQ.3.72_GH0.tar.gz) = 1453901
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index 92e156c4c9c8..2d0c2a452717 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	zetacoin
 PORTVERSION=	0.9.2.4
 CATEGORIES=	net-p2p finance
-MASTER_SITES=	GHL
 
 MAINTAINER=	daniel@morante.net
 COMMENT=	Peer-to-Peer crypto currency with quick transactions
@@ -15,9 +14,6 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME}
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	22ddb9b
 GH_TAGNAME=	22ddb9b
 
 OPTIONS_DEFINE=	X11 UPNP WALLET CLI TEST
diff --git a/net-p2p/zetacoin/distinfo b/net-p2p/zetacoin/distinfo
index 019c8d0cea8a..affd17b22c29 100644
--- a/net-p2p/zetacoin/distinfo
+++ b/net-p2p/zetacoin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zetacoin-0.9.2.4.tar.gz) = 792f3caab9b19d2c4f7fc8c3aff2fe8dce8f8f59182b9167aeb7a754a7841a50
-SIZE (zetacoin-0.9.2.4.tar.gz) = 4265872
+SHA256 (zetacoin-zetacoin-0.9.2.4-22ddb9b_GH0.tar.gz) = daa9138be4d893ec10bdc429928d4fa6c2f935c0489fdd855cc1e4aaaf65a6f8
+SIZE (zetacoin-zetacoin-0.9.2.4-22ddb9b_GH0.tar.gz) = 4265754
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index c3fc3e160cbf..6d8e7e8dbeb9 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	6tunnel
 DISTVERSION=	0.11rc2.20130525
 CATEGORIES=	net ipv6
-MASTER_SITES=	GHL \
+MASTER_SITES=	GH \
 		LOCAL/bdrewery/${PORTNAME}/
 
 MAINTAINER=	bdrewery@FreeBSD.org
@@ -18,9 +18,7 @@ ALL_TARGET=	default
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wojtekka
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	2d33461
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	2d33461
 
 PLIST_FILES=	bin/6tunnel \
 		man/man1/6tunnel.1.gz
diff --git a/net/6tunnel/distinfo b/net/6tunnel/distinfo
index 3ce5b434dffd..4827d03e1d69 100644
--- a/net/6tunnel/distinfo
+++ b/net/6tunnel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (6tunnel-0.11rc2.20130525.tar.gz) = 81511ae63d1fdd41e0c0c245ba5db7d9a870aee305eb20318b7c6fa7a164810c
-SIZE (6tunnel-0.11rc2.20130525.tar.gz) = 17864
+SHA256 (wojtekka-6tunnel-0.11rc2.20130525-2d33461_GH0.tar.gz) = 818a44a53c8a203595cd3611771dd154ae9f8e893433ffe6ba88b6771dfe6452
+SIZE (wojtekka-6tunnel-0.11rc2.20130525-2d33461_GH0.tar.gz) = 17861
diff --git a/net/beanstalkd/Makefile b/net/beanstalkd/Makefile
index c078eeb03c1a..3854f08916ff 100644
--- a/net/beanstalkd/Makefile
+++ b/net/beanstalkd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	beanstalkd
 PORTVERSION=	1.9
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -15,8 +16,6 @@ USE_RC_SUBR=	beanstalkd
 
 GH_ACCOUNT=	kr
 GH_PROJECT=	beanstalkd
-GH_COMMIT=	f40e005
-GH_TAGNAME=	v${PORTVERSION}
 
 MAKE_ARGS+=	CC="${CC}" CFLAGS="${CFLAGS}"
 
diff --git a/net/beanstalkd/distinfo b/net/beanstalkd/distinfo
index ff2117778410..db751ba2cbfa 100644
--- a/net/beanstalkd/distinfo
+++ b/net/beanstalkd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (beanstalkd-1.9.tar.gz) = fa5f12f52986caeef0f647f4933d1be74e5258c4fae177ba810210c34c4226d7
-SIZE (beanstalkd-1.9.tar.gz) = 63820
+SHA256 (kr-beanstalkd-v1.9_GH0.tar.gz) = 158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb
+SIZE (kr-beanstalkd-v1.9_GH0.tar.gz) = 63794
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index 3d61cc8469d6..7e7fbb9c2121 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bmon
 PORTVERSION=	3.3
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net
 
@@ -17,8 +18,6 @@ CONFLICTS_INSTALL=	bmon-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tgraf
-GH_COMMIT=	ad62e66
-GH_TAGNAME=	v${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf ncurses pkgconfig:build
diff --git a/net/bmon/distinfo b/net/bmon/distinfo
index 1af5a7422ad8..21ed71186ff5 100644
--- a/net/bmon/distinfo
+++ b/net/bmon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bmon-3.3.tar.gz) = b94e531a00325aaa84a63053b43552ba742b00a377373443f9403826b3cb5c2e
-SIZE (bmon-3.3.tar.gz) = 57352
+SHA256 (tgraf-bmon-v3.3_GH0.tar.gz) = 1d62451178d3d682a6cf2778ebade7e63f2a9bebe3d35aef20cf94b51679dcca
+SIZE (tgraf-bmon-v3.3_GH0.tar.gz) = 57331
diff --git a/net/dhcprelya/Makefile b/net/dhcprelya/Makefile
index 9728e20dec6e..043b01ec6348 100644
--- a/net/dhcprelya/Makefile
+++ b/net/dhcprelya/Makefile
@@ -13,8 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sem-hub
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	32d3356
+GH_TAGNAME=	32d3356
 
 USE_RC_SUBR=	dhcprelya
 
diff --git a/net/dhcprelya/distinfo b/net/dhcprelya/distinfo
index d6c00fdc4b69..2237b332acf5 100644
--- a/net/dhcprelya/distinfo
+++ b/net/dhcprelya/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcprelya-4.8.tar.gz) = 4a224a6f2ba35df54e9c2d4b399c7b9b279522dd6ac9c65d3dae4bfba7a5fc9c
-SIZE (dhcprelya-4.8.tar.gz) = 24212
+SHA256 (sem-hub-dhcprelya-4.8-32d3356_GH0.tar.gz) = e381d9616c36c1f6f3d7dedb1c9d596712e1c06397c56a7a52466017c765c062
+SIZE (sem-hub-dhcprelya-4.8-32d3356_GH0.tar.gz) = 24194
diff --git a/net/dropbox-api-command/Makefile b/net/dropbox-api-command/Makefile
index d13b34a88c0f..ca6b7f5f7cc7 100644
--- a/net/dropbox-api-command/Makefile
+++ b/net/dropbox-api-command/Makefile
@@ -20,8 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	s-aska
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	1c843ed
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/dropbox-api-command/distinfo b/net/dropbox-api-command/distinfo
index c854537bb152..2d1103eca84b 100644
--- a/net/dropbox-api-command/distinfo
+++ b/net/dropbox-api-command/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dropbox-api-command-1.13.tar.gz) = db42fa3d8a1788866d11f97e7422d221d606ea745c1398a5f6165f0364ef92a8
-SIZE (dropbox-api-command-1.13.tar.gz) = 11327
+SHA256 (s-aska-dropbox-api-command-1.13_GH0.tar.gz) = 8ffb0efc200a381cb834bfab7a77f35c4d47f749ed31c95da839171023d04df8
+SIZE (s-aska-dropbox-api-command-1.13_GH0.tar.gz) = 11326
diff --git a/net/dropbox-uploader/Makefile b/net/dropbox-uploader/Makefile
index 8d3310d8a485..ec0277592d1f 100644
--- a/net/dropbox-uploader/Makefile
+++ b/net/dropbox-uploader/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	andreafabrizi
-GH_COMMIT=	3e5aef0
 GH_PROJECT=	Dropbox-Uploader
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	3e5aef0
 
 NO_BUILD=	yes
 
diff --git a/net/dropbox-uploader/distinfo b/net/dropbox-uploader/distinfo
index 49cb77962c17..ccb4c56827aa 100644
--- a/net/dropbox-uploader/distinfo
+++ b/net/dropbox-uploader/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dropbox-uploader-0.12.tar.gz) = 4afd856bd2ad2038ddccf5684adfe48089745dba555402cd17d2f6dc05e1544e
-SIZE (dropbox-uploader-0.12.tar.gz) = 25341
+SHA256 (andreafabrizi-Dropbox-Uploader-0.12-3e5aef0_GH0.tar.gz) = 1d559896f5280dbcc2c18421933089925a01fdb5a4ff9cb7144ac670dd45827e
+SIZE (andreafabrizi-Dropbox-Uploader-0.12-3e5aef0_GH0.tar.gz) = 25327
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index 124345963470..7b685c4bed9a 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -24,8 +24,7 @@ USES=		python
 
 GH_ACCOUNT=	USArmyResearchLab
 GH_PROJECT=	Dshell
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	46e691c
+GH_TAGNAME=	46e691c
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/dshell/distinfo b/net/dshell/distinfo
index fd54b281a13d..9f045170c544 100644
--- a/net/dshell/distinfo
+++ b/net/dshell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dshell-3.0.20150220.tar.gz) = c2e796082b2d3fc531d7f826965627a1dd526c541522b508fdbbebbcb0b36a69
-SIZE (dshell-3.0.20150220.tar.gz) = 70850
+SHA256 (USArmyResearchLab-Dshell-3.0.20150220-46e691c_GH0.tar.gz) = 90044ca346c5663aafe27af915fe96734d799350f5cfbcbcba1af716117eb45e
+SIZE (USArmyResearchLab-Dshell-3.0.20150220-46e691c_GH0.tar.gz) = 70814
diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index a48365a58128..b668c768d075 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	exabgp
 PORTVERSION=	3.4.8
 CATEGORIES=	net
-MASTER_SITES=	GHL \
+MASTER_SITES=	GH \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi@FreeBSD.org
@@ -14,9 +14,6 @@ LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	70c4305
-GH_REVNUM=	5375472
 USES=		tar:tgz python:2
 SUB_FILES=	pkg-message exabgp.sh
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
@@ -31,8 +28,6 @@ OPTIONS_DEFINE=	EXAMPLES
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${LN} -s ${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_REVNUM} \
-		${WRKSRC}
 	@${MV} -f ${WRKSRC}/etc/systemd ${WRKSRC}
 
 do-build:
diff --git a/net/exabgp/distinfo b/net/exabgp/distinfo
index ecd156ca0768..30283200009a 100644
--- a/net/exabgp/distinfo
+++ b/net/exabgp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (exabgp-3.4.8.tgz) = ec4141ab2ef4407af3bb39e2da06d7ab74eefaaeb2d643fb47ee997d00287a17
-SIZE (exabgp-3.4.8.tgz) = 528560
+SHA256 (Exa-Networks-exabgp-3.4.8_GH0.tgz) = 40bd72dbeb447b87ed2968c2963e75f1209bdc13e52235604e2fe4c8735f59e7
+SIZE (Exa-Networks-exabgp-3.4.8_GH0.tgz) = 528594
diff --git a/net/exaddos/Makefile b/net/exaddos/Makefile
index 19b3a52c521a..62d39c16955c 100644
--- a/net/exaddos/Makefile
+++ b/net/exaddos/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	exaddos
 PORTVERSION=	0.4.0
 CATEGORIES=	net
-MASTER_SITES=	GHL \
-		http://mirrors.rit.edu/zi/
+MASTER_SITES=	http://mirrors.rit.edu/zi/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	zi@FreeBSD.org
@@ -18,8 +17,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:${PORTSDIR}/net-mgmt/py-sn
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	4e93fc1
 USES=		python
 SUB_FILES=	pkg-message exaddos.sh exaddos.conf.sample
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
diff --git a/net/exaddos/distinfo b/net/exaddos/distinfo
index c951fde21f20..9a18dbc1e289 100644
--- a/net/exaddos/distinfo
+++ b/net/exaddos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (exaddos-0.4.0.tgz) = e13b4746f089fb13774ac96fcfd4c62e19df94f2491673a50dd0f4145ac1e399
-SIZE (exaddos-0.4.0.tgz) = 358330
+SHA256 (Exa-Networks-exaddos-0.4.0_GH0.tgz) = 00e145142e551dcdf0b45cae6defb8c0c5e112d491e5fbce616efee25fcdadad
+SIZE (Exa-Networks-exaddos-0.4.0_GH0.tgz) = 358296
diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index ceef45235a30..35dcfdb17c82 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	foreman-proxy
 PORTVERSION=	1.7.1
 CATEGORIES=	net
-MASTER_SITES=	GHL
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Foreman Proxy Agent
@@ -24,7 +23,6 @@ PUPPET_DESC=	Depend on Puppet
 USE_GITHUB=	yes
 GH_ACCOUNT=	theforeman
 GH_PROJECT=	smart-proxy
-GH_COMMIT=	c43f68e
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 2520ac613cae..db630077270e 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.7.1.tar.gz) = a5beaedef62e50faf3b16eda933951fd28b601d429aee95297474e3194ceb993
-SIZE (foreman-proxy-1.7.1.tar.gz) = 113955
+SHA256 (theforeman-smart-proxy-1.7.1_GH0.tar.gz) = c838a90b78c7a1a2631be3d952898d6c7b780f97325771b22e5c243e51825220
+SIZE (theforeman-smart-proxy-1.7.1_GH0.tar.gz) = 113977
diff --git a/net/freebsd-uucp/Makefile b/net/freebsd-uucp/Makefile
index 93bf4df53035..1c147d4cb82f 100644
--- a/net/freebsd-uucp/Makefile
+++ b/net/freebsd-uucp/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-uucp
-PORTVERSION=	1.07.3
+DISTVERSIONPREFIX=	r
+DISTVERSION=	1_07_3
 PORTREVISION=	3
 CATEGORIES=	net comms ipv6
 PKGNAMESUFFIX?=	${PAM_SUFFIX}${PKGNAMESUFFIX2}
@@ -14,8 +15,6 @@ USES=		fakeroot
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dinoex
-GH_TAGNAME=     r1_07_3
-GH_COMMIT=	6355e29
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=	uucp
diff --git a/net/freebsd-uucp/distinfo b/net/freebsd-uucp/distinfo
index b941d1a252f2..c386385b5af8 100644
--- a/net/freebsd-uucp/distinfo
+++ b/net/freebsd-uucp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-uucp-1.07.3.tar.gz) = dd5cc4683beff9f50629ed62a85ebebd7a50374ad9f209f7699cc3927422bce1
-SIZE (freebsd-uucp-1.07.3.tar.gz) = 949522
+SHA256 (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 0fba2c87f23e9ba337c907e615500f926b8b54d4d445de954470b5f521d4542a
+SIZE (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 949411
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 05378c79f079..932d5f075df8 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	freerdp
 PORTVERSION=	1.1.0
-DISTVERSIONSUFFIX=	-beta+2013071101
 PORTREVISION=	2
 CATEGORIES=	net comms ipv6
 
@@ -18,9 +17,8 @@ USE_LDCONFIG=	yes
 USES=		alias cmake:outsource cpe pkgconfig compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
-GH_PROJECT=	FreeRDP
-GH_COMMIT=	780d451
-GH_TAGNAME=	${GH_COMMIT}
+GH_PROJECT=	${GH_ACCOUNT}
+GH_TAGNAME=	780d451
 
 CPE_VENDOR=	freerdp_project
 
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index 21000361ec05..25c287b79b14 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freerdp-1.1.0-beta+2013071101.tar.gz) = ead34bb077451190abc177c5fda036b74191dba02045d69b59d0b9f29e9a1b38
-SIZE (freerdp-1.1.0-beta+2013071101.tar.gz) = 6677686
+SHA256 (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 5b74a7d79db896d1b2f8df350f892e7f9aee8ea25a6974185b9cc739dbc0935a
+SIZE (FreeRDP-FreeRDP-1.1.0-780d451_GH0.tar.gz) = 6677660
diff --git a/net/go-amqp/Makefile b/net/go-amqp/Makefile
index 740d285f4cb5..776684fa276c 100644
--- a/net/go-amqp/Makefile
+++ b/net/go-amqp/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	amqp
 PORTVERSION=	0.0.0.20140916
 CATEGORIES=	net
-MASTER_SITES=	GHL
 PKGNAMEPREFIX=	go-
 
 MAINTAINER=	kuriyama@FreeBSD.org
@@ -13,11 +12,9 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	streadway
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	7d6d180
+GH_TAGNAME=	7d6d180
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
diff --git a/net/go-amqp/distinfo b/net/go-amqp/distinfo
index 52fbf51a0834..58f7437e6e40 100644
--- a/net/go-amqp/distinfo
+++ b/net/go-amqp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amqp-0.0.0.20140916.tar.gz) = 29dbd44b1cd66a2d28a6515319842a4256a41b354680435584c6ef9155183614
-SIZE (amqp-0.0.0.20140916.tar.gz) = 76086
+SHA256 (streadway-amqp-0.0.0.20140916-7d6d180_GH0.tar.gz) = e6db5350d333d2c7893511182880d0074e653c98f4e5a0300954cc28222f9383
+SIZE (streadway-amqp-0.0.0.20140916-7d6d180_GH0.tar.gz) = 76070
diff --git a/net/grive/Makefile b/net/grive/Makefile
index fd7f413650f0..f122f47d720a 100644
--- a/net/grive/Makefile
+++ b/net/grive/Makefile
@@ -20,9 +20,7 @@ LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Grive
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	27817e8
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	27817e8
 
 USES=		cmake
 CXXFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/grive/distinfo b/net/grive/distinfo
index ae93b7d2312a..c9c0bb2010b9 100644
--- a/net/grive/distinfo
+++ b/net/grive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grive-0.3.0.tar.gz) = a4e01d76f0e4c3e84fccae0580631117fad7989363c3308a7542b554230f5d76
-SIZE (grive-0.3.0.tar.gz) = 162465
+SHA256 (Grive-grive-0.3.0-27817e8_GH0.tar.gz) = 901bdbb340b07b5fbc759892e6805ad98b60cbed05bf041ab10286c8f35302da
+SIZE (Grive-grive-0.3.0-27817e8_GH0.tar.gz) = 162467
diff --git a/net/libcapn/Makefile b/net/libcapn/Makefile
index 15817c51b870..3352d9bb44f4 100644
--- a/net/libcapn/Makefile
+++ b/net/libcapn/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libcapn
-PORTVERSION=	1.0.0.b3
+DISTVERSION=	1.0.0beta3
 PORTREVISION=	2
 CATEGORIES=	net
 
@@ -15,8 +15,6 @@ LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	adobkin
-GH_TAGNAME=	1.0.0beta3
-GH_COMMIT=	050dfd8
 
 USES=		cmake
 USE_LDCONFIG=	yes
diff --git a/net/libcapn/distinfo b/net/libcapn/distinfo
index da5df764e419..c3dea917ac73 100644
--- a/net/libcapn/distinfo
+++ b/net/libcapn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcapn-1.0.0.b3.tar.gz) = ff2f960c02404fdc7c6ac4155659af1178e90b7a8e62d35e0e4e4a94914a2b18
-SIZE (libcapn-1.0.0.b3.tar.gz) = 348396
+SHA256 (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = e075f391b6040ba7e2436a93b1dce26bc2825b7e5eb8299d0f1fadf003a129c4
+SIZE (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = 348313
diff --git a/net/libutp/Makefile b/net/libutp/Makefile
index 71d573bff026..3c1ba544a9f6 100644
--- a/net/libutp/Makefile
+++ b/net/libutp/Makefile
@@ -14,8 +14,7 @@ LICENSE=	MIT
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:C/-.*//}
 GH_PROJECT=	${PORTNAME:C/.*-//}
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	7c4f19a
+GH_TAGNAME=	7c4f19a
 
 USES=		dos2unix uidfix
 MAKEFILE=	${FILESDIR}/BSDmakefile
diff --git a/net/libutp/distinfo b/net/libutp/distinfo
index 6c847f49f84f..4b3de5dba864 100644
--- a/net/libutp/distinfo
+++ b/net/libutp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bittorrent-libutp-0.20130514.tar.gz) = 305ae8aa43bee7d7d7d1411b07bcde246fab449fbdaf087673cf7b07659cb934
-SIZE (bittorrent-libutp-0.20130514.tar.gz) = 71029
+SHA256 (bittorrent-libutp-0.20130514-7c4f19a_GH0.tar.gz) = 690e9beeb434341d81cc51d2bbd0758e186a519673ef2f391536cdb28c5cee47
+SIZE (bittorrent-libutp-0.20130514-7c4f19a_GH0.tar.gz) = 71011
diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile
index 4cb5e7aeaeba..bf4acee26184 100644
--- a/net/luasocket/Makefile
+++ b/net/luasocket/Makefile
@@ -13,9 +13,7 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	diegonehab
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	v3.0-rc1
-GH_COMMIT=	22cd583
 
 USES=		lua:51 gmake pkgconfig
 
diff --git a/net/luasocket/distinfo b/net/luasocket/distinfo
index bdbecd3f7143..cf2445288ac2 100644
--- a/net/luasocket/distinfo
+++ b/net/luasocket/distinfo
@@ -1,2 +1,2 @@
-SHA256 (luasocket-3.0r1.tar.gz) = 4eeac3e526069dd8fec625364b7a0c83f80de776d53f58d7bbc73d190a5b2d07
-SIZE (luasocket-3.0r1.tar.gz) = 328632
+SHA256 (diegonehab-luasocket-3.0r1-v3.0-rc1_GH0.tar.gz) = 8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1249
+SIZE (diegonehab-luasocket-3.0r1-v3.0-rc1_GH0.tar.gz) = 328598
diff --git a/net/macchanger/Makefile b/net/macchanger/Makefile
index f6e22a6cb079..d4d66002a7fe 100644
--- a/net/macchanger/Makefile
+++ b/net/macchanger/Makefile
@@ -12,7 +12,6 @@ LICENSE=	GPLv3
 
 USE_GITHUB=	true
 GH_ACCOUNT=	alobbs
-GH_COMMIT=	f4f66e1
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf makeinfo
diff --git a/net/macchanger/distinfo b/net/macchanger/distinfo
index 0de432057a38..b3c5a5516d88 100644
--- a/net/macchanger/distinfo
+++ b/net/macchanger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (macchanger-1.7.0.tar.gz) = ec916fa592c445c4c48d420ae0ad5adb942b0a6009d96394d0555fcb967965aa
-SIZE (macchanger-1.7.0.tar.gz) = 306369
+SHA256 (alobbs-macchanger-1.7.0_GH0.tar.gz) = 1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
+SIZE (alobbs-macchanger-1.7.0_GH0.tar.gz) = 306344
diff --git a/net/nfsshell/Makefile b/net/nfsshell/Makefile
index 75deda571844..9da8d03274e7 100644
--- a/net/nfsshell/Makefile
+++ b/net/nfsshell/Makefile
@@ -5,15 +5,13 @@ PORTNAME=	nfsshell
 PORTVERSION=	20130510
 CATEGORIES=	net
 #MASTER_SITES=	http://www.cs.vu.nl/pub/leendert/
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Userland NFS command tool
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NetDirect
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	09cdd52
+GH_TAGNAME=	09cdd52
 
 USES=		readline
 
diff --git a/net/nfsshell/distinfo b/net/nfsshell/distinfo
index 4fdfc2172466..664e922c0798 100644
--- a/net/nfsshell/distinfo
+++ b/net/nfsshell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nfsshell.tar.gz) = f5df3ce7c313b11f0b0d7b7d6a2ecbb1c23761e6a4226cf6d5556ddceb37b25e
-SIZE (nfsshell.tar.gz) = 40129
+SHA256 (NetDirect-nfsshell-20130510-09cdd52_GH0.tar.gz) = 2d6871f7d495902188a8a4b2e99d334e55a9182c8cbdc77720dfe1b211e94461
+SIZE (NetDirect-nfsshell-20130510-09cdd52_GH0.tar.gz) = 40111
diff --git a/net/ntimed/Makefile b/net/ntimed/Makefile
index b9ac132763ff..d7fad4a3d397 100644
--- a/net/ntimed/Makefile
+++ b/net/ntimed/Makefile
@@ -16,8 +16,7 @@ USE_RC_SUBR=	ntimed
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdphk
 GH_PROJECT=	Ntimed
-GH_COMMIT=	db0abbb
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	db0abbb
 
 PLIST_FILES=	sbin/ntimed-client
 
diff --git a/net/ntimed/distinfo b/net/ntimed/distinfo
index 9ff2617a5568..cb4991622974 100644
--- a/net/ntimed/distinfo
+++ b/net/ntimed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntimed-0.0.2015.01.30.tar.gz) = 5b83afda423ea718be0004964119f27e2fd5c2717e2a674958c5c73340759bb3
-SIZE (ntimed-0.0.2015.01.30.tar.gz) = 33595
+SHA256 (bsdphk-Ntimed-0.0.2015.01.30-db0abbb_GH0.tar.gz) = 768c12301a37476f5900c71ea3afe30208694f5baad37534f4e2e455ad2f2b6f
+SIZE (bsdphk-Ntimed-0.0.2015.01.30-db0abbb_GH0.tar.gz) = 33583
diff --git a/net/nyancat/Makefile b/net/nyancat/Makefile
index 234f42a7d55f..c8415a9a68b3 100644
--- a/net/nyancat/Makefile
+++ b/net/nyancat/Makefile
@@ -11,14 +11,10 @@ COMMENT=	Animated telnet server that renders a loop of the nyan cat animation
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	klange
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	89c5bc8
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/nyancat
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_COMMIT}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
diff --git a/net/nyancat/distinfo b/net/nyancat/distinfo
index f1b913d7e932..918b3ec20a76 100644
--- a/net/nyancat/distinfo
+++ b/net/nyancat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nyancat-1.2.tar.gz) = 875f6146c70fece6a54e429762020d8a88918cb39fd798c51a0d72b4db4056d4
-SIZE (nyancat-1.2.tar.gz) = 14099
+SHA256 (klange-nyancat-1.2_GH0.tar.gz) = 619349ead70cbb463eab710b3bd6eb76ab3195e952fb0aa806349d0aa0310176
+SIZE (klange-nyancat-1.2_GH0.tar.gz) = 14082
diff --git a/net/pimd/Makefile b/net/pimd/Makefile
index 209ce2d924bb..3b1de48b7c2f 100644
--- a/net/pimd/Makefile
+++ b/net/pimd/Makefile
@@ -11,7 +11,6 @@ LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	troglobit
-GH_COMMIT=	d8bd641
 
 USES=		tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/net/pimd/distinfo b/net/pimd/distinfo
index d6c12ca2670a..bbb5aa092d64 100644
--- a/net/pimd/distinfo
+++ b/net/pimd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pimd-2.2.0.tar.bz2) = d57b10bad740bcb1ca5a7f542b3d8b29455e0ed6b40a8881e4d8f6a431921bd9
-SIZE (pimd-2.2.0.tar.bz2) = 223065
+SHA256 (troglobit-pimd-2.2.0_GH0.tar.bz2) = a6d969e235323852afdd1c9aebc15a2ff1e4da75e8277a736b3be9b2b484e30e
+SIZE (troglobit-pimd-2.2.0_GH0.tar.bz2) = 223012
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index 1b5b49b1dbe6..880ba53ef661 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	GeoIP
 PORTVERSION=	1.2.8
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net python geography
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-Python-${PORTVERSION}
 
 MAINTAINER=	stefan@FreeBSD.org
 COMMENT=	Mapping of IP addresses/hostnames to country names in Python
@@ -18,8 +18,6 @@ LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	geoip-api-python
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	993f63c
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/net/py-GeoIP/distinfo b/net/py-GeoIP/distinfo
index 5ec98a5d4904..da83ad5fa353 100644
--- a/net/py-GeoIP/distinfo
+++ b/net/py-GeoIP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GeoIP-Python-1.2.8.tar.gz) = b876c23ddf0356dc92f7391ef1ed83a24d8b8c2f3860c73b09c398ec0bfc7dba
-SIZE (GeoIP-Python-1.2.8.tar.gz) = 15755
+SHA256 (maxmind-geoip-api-python-v1.2.8_GH0.tar.gz) = 461f98ac76fadac87350567ac775ec9b4a3729c12594448056d4c2a0311ead96
+SIZE (maxmind-geoip-api-python-v1.2.8_GH0.tar.gz) = 15747
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index 88200d635a5b..8ad1f9a613d2 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gntp
 PORTVERSION=	0.8
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +13,6 @@ COMMENT=	Growl Notification Transport Protocol for Python
 LICENSE=	MIT
 
 GH_ACCOUNT=	kfdm
-GH_COMMIT=	a4c1c69
-GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
diff --git a/net/py-gntp/distinfo b/net/py-gntp/distinfo
index ad4669ac6db9..77be591bd7c0 100644
--- a/net/py-gntp/distinfo
+++ b/net/py-gntp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gntp-0.8.tar.gz) = 31bf2b080cd225cb5c9d6a52194d73609f4b03bba69ca62bab03515c97ec7b6f
-SIZE (gntp-0.8.tar.gz) = 38359
+SHA256 (kfdm-gntp-v0.8_GH0.tar.gz) = 1e646e6b486c7367bb342f14230fa391265b134935b72e9e04b9e6bc372bd655
+SIZE (kfdm-gntp-v0.8_GH0.tar.gz) = 38357
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 3be1286fc206..f0cd84802c77 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -20,8 +20,7 @@ USE_PYTHON=	distutils pythonprefix
 USE_GITHUB=	yes
 GH_ACCOUNT=	allfro
 GH_PROJECT=	pylibnet
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	b2fa552
+GH_TAGNAME=	b2fa552
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git a/net/py-libnet/distinfo b/net/py-libnet/distinfo
index b47bbd13fb6a..c09b56b07906 100644
--- a/net/py-libnet/distinfo
+++ b/net/py-libnet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libnet-1.1.tar.gz) = c15d52f3782b92e799b6cc24d4999a0ee276afe5f9e8d596f08c59debdabc1d2
-SIZE (libnet-1.1.tar.gz) = 73785
+SHA256 (allfro-pylibnet-1.1-b2fa552_GH0.tar.gz) = a9cc100ea911edcc45144df41c7a7783db64e03cb2cb664b06258657b418aed9
+SIZE (allfro-pylibnet-1.1-b2fa552_GH0.tar.gz) = 73736
diff --git a/net/py-pygeoip/Makefile b/net/py-pygeoip/Makefile
index 50b13ae26e68..39a6715f430d 100644
--- a/net/py-pygeoip/Makefile
+++ b/net/py-pygeoip/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pygeoip
 PORTVERSION=	0.3.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net python geography
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -17,8 +18,5 @@ USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	appliedsec
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	7501c93
 
 .include <bsd.port.mk>
diff --git a/net/py-pygeoip/distinfo b/net/py-pygeoip/distinfo
index 557ebf7a398b..6d57281a1630 100644
--- a/net/py-pygeoip/distinfo
+++ b/net/py-pygeoip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pygeoip-0.3.2.tar.gz) = 0097f43919ff98a72a30989d45eea2842a849a5c5a97ef8de8628805eb725d63
-SIZE (pygeoip-0.3.2.tar.gz) = 31406
+SHA256 (appliedsec-pygeoip-v0.3.2_GH0.tar.gz) = b429a5e908a98c47c36e63fdf9865786d496697f841ace7fe179b654969bdec8
+SIZE (appliedsec-pygeoip-v0.3.2_GH0.tar.gz) = 31395
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 1583f95129b3..59cc89c043e2 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pynsq
 PORTVERSION=	0.5.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -25,8 +26,6 @@ USES=		python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitly
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	b64f3f3
 
 .include <bsd.port.options.mk>
 
diff --git a/net/py-pynsq/distinfo b/net/py-pynsq/distinfo
index 666670b449bc..0961fd06f5a6 100644
--- a/net/py-pynsq/distinfo
+++ b/net/py-pynsq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pynsq-0.5.1.tar.gz) = 78be19617fc4df13ec0d9d466f63c9dd12634ed5eab1a2dd8e1c9b38cab3b893
-SIZE (pynsq-0.5.1.tar.gz) = 25739
+SHA256 (bitly-pynsq-v0.5.1_GH0.tar.gz) = a0c2714faef2401cbebddd3f95bf26bedd34f09e7063e5f15cb1bbf0a40215b2
+SIZE (bitly-pynsq-v0.5.1_GH0.tar.gz) = 25714
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index 95707c463958..41ee32a557f9 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	twitter
 PORTVERSION=	1.15.0
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-tools
@@ -20,8 +21,6 @@ USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	sixohsix
-GH_TAGNAME=	${DISTNAME}
-GH_COMMIT=	bb26b5d
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/net/py-twitter-tools/distinfo b/net/py-twitter-tools/distinfo
index 3ddde18e6381..579b74b0ad63 100644
--- a/net/py-twitter-tools/distinfo
+++ b/net/py-twitter-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (twitter-1.15.0.tar.gz) = f0cf4d8ec60a26bbec9fb9a2455f037c8e47746c12e9a1bc9ce3f373014a1774
-SIZE (twitter-1.15.0.tar.gz) = 41853
+SHA256 (sixohsix-twitter-twitter-1.15.0_GH0.tar.gz) = 36d78af34fc01d695f4c45b23e9183852a57a950c79ddb12f9291f4a83285fce
+SIZE (sixohsix-twitter-twitter-1.15.0_GH0.tar.gz) = 41843
diff --git a/net/qtweetlib/Makefile b/net/qtweetlib/Makefile
index f857c7ab0e0e..c46379a21607 100644
--- a/net/qtweetlib/Makefile
+++ b/net/qtweetlib/Makefile
@@ -13,9 +13,7 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 GH_ACCOUNT=	minimoog
-GH_COMMIT=	2af0b78
 GH_PROJECT=	QTweetLib
-GH_TAGNAME=	${PORTVERSION}
 
 USES=		cmake
 USE_GITHUB=	yes
diff --git a/net/qtweetlib/distinfo b/net/qtweetlib/distinfo
index 8e4b3ddce564..ec66fc66206c 100644
--- a/net/qtweetlib/distinfo
+++ b/net/qtweetlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtweetlib-0.5.tar.gz) = c06d3e35529aa6a5daf27a2a22d6fa99f22488abc4cf2bf5b959adf118691039
-SIZE (qtweetlib-0.5.tar.gz) = 96649
+SHA256 (minimoog-QTweetLib-0.5_GH0.tar.gz) = 36f45a2a082b6b303188e7ea3815e6cd586db89f6b777e86daf1bffdb817e998
+SIZE (minimoog-QTweetLib-0.5_GH0.tar.gz) = 96649
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index ff9a7bc43ea4..61549aa3428d 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq-c
 PORTVERSION=	0.5.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
 
@@ -21,8 +22,6 @@ USES=		cmake python tar:bzip2
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	alanxz
-GH_COMMIT=	bf8e415
-GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=	POPT
 OPTIONS_SUB=	yes
diff --git a/net/rabbitmq-c-devel/distinfo b/net/rabbitmq-c-devel/distinfo
index cbe8fb0daabe..0d0cda37c7bc 100644
--- a/net/rabbitmq-c-devel/distinfo
+++ b/net/rabbitmq-c-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-c-0.5.2.tar.bz2) = d964f7a7c0a0bf602fb4ba74abdf23f1d064495aadf36b51854fd5b09b4f9887
-SIZE (rabbitmq-c-0.5.2.tar.bz2) = 144970
+SHA256 (alanxz-rabbitmq-c-v0.5.2_GH0.tar.bz2) = 418726e830567c296292fd37325d8eeea7b8973c143c4b50b8acf694244ff6a7
+SIZE (alanxz-rabbitmq-c-v0.5.2_GH0.tar.bz2) = 144950
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index b0202a1cc1dd..58ea4260f0c5 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	relayd
 PORTVERSION=	5.5.20140810
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	GHL
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	OpenBSD relay daemon
@@ -12,9 +11,7 @@ COMMENT=	OpenBSD relay daemon
 LICENSE=	ISCL
 
 GH_ACCOUNT=	mmatuska
-GH_COMMIT=	49d1afd
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/src/usr.sbin
 USES=		uidfix
 USE_GITHUB=	yes
 USE_OPENSSL=	yes
diff --git a/net/relayd/distinfo b/net/relayd/distinfo
index fce9cc696726..508e2bd8119a 100644
--- a/net/relayd/distinfo
+++ b/net/relayd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (relayd-5.5.20140810.tar.gz) = 1bdae004e06a3104ec4e9acfb7b9cb009f3974b936e211224b82a79c2b611570
-SIZE (relayd-5.5.20140810.tar.gz) = 179458
+SHA256 (mmatuska-relayd-5.5.20140810_GH0.tar.gz) = 7acde883a8ee35b65dd58ac56d344f374eb15755bfb27310ce2c0bc6ebe87588
+SIZE (mmatuska-relayd-5.5.20140810_GH0.tar.gz) = 179424
diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 45776b34e0b8..ae161f35de6c 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -5,17 +5,14 @@ PORTNAME?=	remmina-plugins
 PORTVERSION=	1.0.0
 PORTREVISION?=	4
 CATEGORIES=	net gnome
-USE_GITHUB=	yes
-GH_ACCOUNT=	FreeRDP
-GH_PROJECT=	remmina
-GH_COMMIT=	356c033
-GH_TAGNAME=	${PORTVERSION}
-DISTNAME=	remmina-${PORTVERSION}
-
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Remmina plugin system
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	FreeRDP
+GH_PROJECT=	Remmina
+
 .if defined(PKGNAMESUFFIX)
 .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
 .else
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index 904b7c5bd3bf..d5904214f343 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -14,7 +14,6 @@ INSTALLS_ICONS=	yes
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${WRKSRC}/remmina/include -I${LOCALBASE}/include -fPIC
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT}
 
 # disable appindicator as it is new feature of gnome 3
 CMAKE_ARGS+=    -DWITH_APPINDICATOR=OFF
diff --git a/net/remmina-plugins/distinfo b/net/remmina-plugins/distinfo
index b22633b3fd3d..e744b3552ce4 100644
--- a/net/remmina-plugins/distinfo
+++ b/net/remmina-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (remmina-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731
-SIZE (remmina-1.0.0.tar.gz) = 540568
+SHA256 (FreeRDP-Remmina-1.0.0_GH0.tar.gz) = 33502e086e5dc95d8d6596dee214fa1499094d558495afe3c1a87df322c56128
+SIZE (FreeRDP-Remmina-1.0.0_GH0.tar.gz) = 540418
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 305c5c4a90b4..047364069456 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -22,10 +22,6 @@ CFLAGS+=	-I${WRKSRC}/remmina/include -I${LOCALBASE}/include -fPIC
 SUB_FILES=	pkg-message
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	356c033
-GH_TAGNAME=	${PORTVERSION}
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT}
 
 OPTIONS_DEFINE=	SSH GCRYPT TERM AVAHI NLS
 OPTIONS_DEFAULT=	SSH GCRYPT TERM AVAHI NLS
diff --git a/net/remmina/distinfo b/net/remmina/distinfo
index b22633b3fd3d..88b5850ad52b 100644
--- a/net/remmina/distinfo
+++ b/net/remmina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (remmina-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731
-SIZE (remmina-1.0.0.tar.gz) = 540568
+SHA256 (FreeRDP-remmina-1.0.0_GH0.tar.gz) = 33502e086e5dc95d8d6596dee214fa1499094d558495afe3c1a87df322c56128
+SIZE (FreeRDP-remmina-1.0.0_GH0.tar.gz) = 540418
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index 735b6754ac61..c625761cbfdf 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -12,8 +12,6 @@ RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wdas
-GH_COMMIT=	${GH_TAGNAME}
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	6d62d49
 
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/net/reposado/distinfo b/net/reposado/distinfo
index f35d1d43d31f..4df79e0f4c45 100644
--- a/net/reposado/distinfo
+++ b/net/reposado/distinfo
@@ -1,2 +1,2 @@
-SHA256 (reposado-0.0.20150131.tar.gz) = 15299104ab94e8d7828ec0c58bf69509335c42792992c9dad54468fbe4dc6691
-SIZE (reposado-0.0.20150131.tar.gz) = 55190
+SHA256 (wdas-reposado-0.0.20150131-6d62d49_GH0.tar.gz) = ce7c87d2eb63a02b8480ee2b80e7c9d7cc4717151bacae6d5983615839f6eef9
+SIZE (wdas-reposado-0.0.20150131-6d62d49_GH0.tar.gz) = 55188
diff --git a/net/syncthing-cli/Makefile b/net/syncthing-cli/Makefile
index 9d84c0b2a22e..6f45a19eda32 100644
--- a/net/syncthing-cli/Makefile
+++ b/net/syncthing-cli/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	syncthing-cli
 PORTVERSION=	0.1.0.2015032001
 PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
+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=	syncthing-cli-${PORTVERSION}${EXTRACT_SUFX}:group1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
 		AudriusButkevicius-cli-7f561c7${EXTACT_SUFX}:group3
 
@@ -17,15 +17,13 @@ COMMENT=	Syncthing CLI
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
 GH_PROJECT=	syncthing-cli
-GH_COMMIT=	144a17a4794470cc61830eeadeb1ad094b90cbde
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	144a17a4794470cc61830eeadeb1ad094b90cbde
 
 SYNCTHING_VER=	0.10.30
 
-WRKSRC=		${WRKDIR}/syncthing-cli-${GH_COMMIT}
-
 PLIST_FILES=	bin/syncthing-cli
 
 STRIP=		# stripping can break go binaries
@@ -53,7 +51,7 @@ post-patch:
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
-	@${MV} ${WRKSRC}/syncthing-cli-${GH_COMMIT} ${WRKSRC}/syncthing-cli
+	@${MV} ${WRKSRC}/syncthing-cli-${GH_TAGNAME} ${WRKSRC}/syncthing-cli
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-cli ${STAGEDIR}${PREFIX}/bin/
diff --git a/net/syncthing-cli/distinfo b/net/syncthing-cli/distinfo
index 7b7e117191ee..38e99124b5d3 100644
--- a/net/syncthing-cli/distinfo
+++ b/net/syncthing-cli/distinfo
@@ -1,5 +1,5 @@
-SHA256 (syncthing-cli-0.1.0.2015032001.tar.gz) = 089fc9a9a7ceb909cf2722594b83398bba9459062c6028539c1d068a920eb65a
-SIZE (syncthing-cli-0.1.0.2015032001.tar.gz) = 9195
+SHA256 (syncthing-syncthing-cli-0.1.0.2015032001-144a17a4794470cc61830eeadeb1ad094b90cbde_GH0.tar.gz) = 089fc9a9a7ceb909cf2722594b83398bba9459062c6028539c1d068a920eb65a
+SIZE (syncthing-syncthing-cli-0.1.0.2015032001-144a17a4794470cc61830eeadeb1ad094b90cbde_GH0.tar.gz) = 9195
 SHA256 (syncthing-0.10.30.tar.gz) = 0358f8b5edacebb0eacfad424e2fbca32587b0747c7f7060c63e961038289880
 SIZE (syncthing-0.10.30.tar.gz) = 3029635
 SHA256 (AudriusButkevicius-cli-7f561c7) = ad64f151c314333f714ef600f65a4fb512ce7242bc2100074775581a56ad439a
diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
index a3cb621efed7..6d63b5cf2196 100644
--- a/net/syncthing-discosrv/Makefile
+++ b/net/syncthing-discosrv/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	syncthing-discosrv
 PORTVERSION=	0.0.0.2015022401
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
-		https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
+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=	syncthing-discosrv-${PORTVERSION}.tar.gz:group1 \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
 		golang-groupcache-${GROUPCACHE_COMMIT}${EXTRACT_SUFX}:group3
 
@@ -17,16 +16,14 @@ COMMENT=	Discovery server for syncthing
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
 GH_PROJECT=	discosrv
-GH_COMMIT=	4e1240a610bcc2ef8772eb2641492822b4ec4f88
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	4e1240a610bcc2ef8772eb2641492822b4ec4f88
 
 SYNCTHING_VER=	0.10.30
 GROUPCACHE_COMMIT=	d2a1805
 
-WRKSRC=		${WRKDIR}/discosrv-${GH_COMMIT}
-
 PLIST_FILES=	bin/syncthing-discosrv
 
 USE_RC_SUBR=	syncthing-discosrv
@@ -66,7 +63,7 @@ post-patch:
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
-	@${MV} ${WRKSRC}/discosrv-${GH_COMMIT} ${WRKSRC}/syncthing-discosrv
+	@${MV} ${WRKSRC}/discosrv-${GH_TAGNAME} ${WRKSRC}/syncthing-discosrv
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-discosrv ${STAGEDIR}${PREFIX}/bin/
diff --git a/net/syncthing-discosrv/distinfo b/net/syncthing-discosrv/distinfo
index 42d66b74123b..50e8b21f6dbd 100644
--- a/net/syncthing-discosrv/distinfo
+++ b/net/syncthing-discosrv/distinfo
@@ -1,5 +1,5 @@
-SHA256 (syncthing-discosrv-0.0.0.2015022401.tar.gz) = 70ddebacddb8c3de9019f83e1e63cb95d36731433068480b2499d491dcdd45e7
-SIZE (syncthing-discosrv-0.0.0.2015022401.tar.gz) = 16841
+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.10.30.tar.gz) = 0358f8b5edacebb0eacfad424e2fbca32587b0747c7f7060c63e961038289880
 SIZE (syncthing-0.10.30.tar.gz) = 3029635
 SHA256 (golang-groupcache-d2a1805.tar.gz) = be22ff0c07a589fdb4665637787a2693e685e824a4ccb2bcfe8d9811d0c822a3
diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index 84aaaf44a727..0f459560a5a5 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -17,8 +17,6 @@ GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	the-tcpdump-group
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	2837b72
+GH_TAGNAME=	2837b72
 
 .include <bsd.port.mk>
diff --git a/net/tcpslice/distinfo b/net/tcpslice/distinfo
index 11812f3b7d2a..12ea12fc9a86 100644
--- a/net/tcpslice/distinfo
+++ b/net/tcpslice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcpslice-20140407.tar.gz) = d11bc7e6f0bf886d238d994965e5d8757f2fada13873a8a570598a8d9478b8cc
-SIZE (tcpslice-20140407.tar.gz) = 112147
+SHA256 (the-tcpdump-group-tcpslice-20140407-2837b72_GH0.tar.gz) = 97b543100d858aee493c2f32e4caee6ec1ebd98ce5700c44943f0764f9a0871f
+SIZE (the-tcpdump-group-tcpslice-20140407-2837b72_GH0.tar.gz) = 112109
diff --git a/net/whois/Makefile b/net/whois/Makefile
index 6cb1e7ffbf08..90a5837cb2c6 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -22,8 +22,7 @@ NLS_USES=	gettext
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rfc1036
-GH_COMMIT=	d346ca6
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	d346ca6
 
 .include <bsd.port.options.mk>
 
diff --git a/net/whois/distinfo b/net/whois/distinfo
index 1cbb7d418ff7..6be6577b7b9e 100644
--- a/net/whois/distinfo
+++ b/net/whois/distinfo
@@ -1,2 +1,2 @@
-SHA256 (whois-5.1.5.tar.gz) = b488c51677713694468a030d1559f3acbbe9bca0a22ec2649acbcae3f9ea15ca
-SIZE (whois-5.1.5.tar.gz) = 90846
+SHA256 (rfc1036-whois-5.1.5-d346ca6_GH0.tar.gz) = ebdd0afa9a29ee99eee1a81bfa3802eec9672643f9e08e888bb260b392513a74
+SIZE (rfc1036-whois-5.1.5-d346ca6_GH0.tar.gz) = 90812
diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index d7918e59a39d..b7fa079b2e66 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -6,9 +6,7 @@ PORTVERSION=	0.7.0.b20130912
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	GHL
 PKGNAMESUFFIX=	-devel
-DIST_SUBDIR?=	${PORTNAME}
 
 MAINTAINER=	meta+ports@vmeta.jp
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
@@ -22,9 +20,7 @@ USE_RC_SUBR=	xrdp
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_PROJECT=	xrdp
-GH_COMMIT=	64e2291
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	64e2291
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-jpeg
diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo
index 68b44cb46584..2af78ad5acb7 100644
--- a/net/xrdp-devel/distinfo
+++ b/net/xrdp-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xrdp/xrdp-0.7.0.b20130912.tar.gz) = 43e61a1a0d4c0de1da798cceaab115a1e07833de06206daf0520dad509b4e85d
-SIZE (xrdp/xrdp-0.7.0.b20130912.tar.gz) = 2893085
+SHA256 (neutrinolabs-xrdp-0.7.0.b20130912-64e2291_GH0.tar.gz) = 2e21006a2bb09f706a5a63e999487a5eab45ab0c7bfcc3a3e056d288d525d06c
+SIZE (neutrinolabs-xrdp-0.7.0.b20130912-64e2291_GH0.tar.gz) = 2892771
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index d9480b9bfcf3..dd5c4503f992 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -6,8 +6,6 @@ PORTVERSION=	0.6.1
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	GHL
-DIST_SUBDIR?=	${PORTNAME}
 
 MAINTAINER=	meta+ports@vmeta.jp
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
@@ -23,9 +21,7 @@ USE_XORG=	x11 xfixes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_PROJECT=	xrdp
-GH_COMMIT=	5d53758
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	5d53758
 
 CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index 242e53ac6f42..8bf679dcdccf 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xrdp/xrdp-0.6.1.tar.gz) = 5a5316f9404243b2016b02f050648001987e648435927c9c965a804f233daa25
-SIZE (xrdp/xrdp-0.6.1.tar.gz) = 1559511
+SHA256 (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = fd3c9d1c6fb953d71c8184e384f9043039cea514f7791134546fb52444757d5c
+SIZE (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = 1559409