Convert most ports using cloud.github.com to GHC.

Convert a couple to github, and use some options helpers on the way.

Sponsored by:	Absolight

31 files changed, 101 insertions, 55 deletions

diff --git a/audio/acoustid-fingerprinter/Makefile b/audio/acoustid-fingerprinter/Makefile
index 64a4708..e2e8781 100644
--- a/audio/acoustid-fingerprinter/Makefile
+++ b/audio/acoustid-fingerprinter/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	0.6
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://bitbucket.org/acoustid/${PORTNAME}/downloads/ \
-		http://cloud.github.com/downloads/lalinsky/${PORTNAME}/
+		GHC
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	AcoustID audio fingerprint submission tool
@@ -19,6 +19,9 @@ LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint \
 USES=		cmake
 USE_QT4=	gui network \
 		qmake_build moc_build rcc_build uic_build
+USE_GITHUB=	yes
+GH_ACCOUNT=	lalinsky
+
 INSTALLS_ICONS=	yes
 
 post-patch:
diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile
index b250de2..50d255f 100644
--- a/audio/libcoverart/Makefile
+++ b/audio/libcoverart/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	libcoverart
 PORTVERSION=	1.0.0
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	https://cloud.github.com/downloads/metabrainz/${PORTNAME}/
+MASTER_SITES=	GHC
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Library for accessing the MusicBrainz cover art archive
@@ -16,6 +16,8 @@ LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
 
 USES=		cmake
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	metabrainz
 
 # {PROJECT_VERSION} is not a variable nor a typo, just part of the directory name
 WRKSRC=		${WRKDIR}/${PORTNAME}-{PROJECT_VERSION}
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 22ff08a..4b1b794 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mous
 PORTVERSION=	1.1a
 PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	http://cloud.github.com/downloads/bsdelf/mous/
+MASTER_SITES=	GHC
 
 MAINTAINER=	shen.elf@gmail.com
 COMMENT=	Simple yet powerful audio player
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		cmake
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	bsdelf
 
 OPTIONS_DEFINE=		ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \
 			MACDECODER MPG123 NCURSES OSS QT4 SDK TAGLIB VORBIS \
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index 1d79536..a3ddb9c 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	shairport
 PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://cloud.github.com/downloads/miks/${PORTNAME}/
-DISTNAME=	miks-${PORTNAME}-${REV}
 
 MAINTAINER=	miks.mikelsons@gmail.com
 COMMENT=	Airtunes emulator
@@ -23,6 +21,9 @@ RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
 USES=		gmake perl5 pkgconfig
 USE_PERL5=	run
 USE_OPENSSL=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	miks
+GH_TAGNAME=	b1cb9ea
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST=	PERL=${PERL}
@@ -30,8 +31,6 @@ SUB_LIST=	PERL=${PERL}
 PLIST_FILES=	bin/${PORTNAME} bin/hairtunes bin/${PORTNAME}.pl
 PORTDOCS=	README.md
 
-REV=		b1cb9ea
-
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
diff --git a/audio/shairport/distinfo b/audio/shairport/distinfo
index 5fbdac0..b4afd2c 100644
--- a/audio/shairport/distinfo
+++ b/audio/shairport/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miks-shairport-b1cb9ea.tar.gz) = daf55530ba1fecb5a6b5a4c770c97e44cb0ca59a58cd87451975635197e1304f
-SIZE (miks-shairport-b1cb9ea.tar.gz) = 40425
+SHA256 (miks-shairport-0.05-b1cb9ea_GH0.tar.gz) = 0e38b57a90c170a8cd798efe6df00beace91fc30a97da9e6f5568a2e06f6499f
+SIZE (miks-shairport-0.05-b1cb9ea_GH0.tar.gz) = 40413
diff --git a/deskutils/devd-notifier/Makefile b/deskutils/devd-notifier/Makefile
index 6b6dedb..2ea7451 100644
--- a/deskutils/devd-notifier/Makefile
+++ b/deskutils/devd-notifier/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	devd-notifier
 PORTVERSION=	0.1
 CATEGORIES=	deskutils
-MASTER_SITES=	https://cloud.github.com/downloads/funglaub/devd-notifier/\
-		http://roladder.net/~flo/dist/
+MASTER_SITES=	GHC http://roladder.net/~flo/dist/
 
 MAINTAINER=	f.unglaub@googlemail.com
 COMMENT=	Daemon notifying the user about devd(8) events \
@@ -19,6 +18,8 @@ LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 USES=		pkgconfig
 PLIST_FILES=	bin/devd-notifier \
 		man/man1/devd-notifier.1.gz
+USE_GITHUB=	yes
+GH_ACCOUNT=	funglaub
 
 pre-everything::
 	@${ECHO_MSG} "You can build devd-notifier with your own config.h using the DEVD-NOTIFIER_CONF knob:"
diff --git a/devel/dbus-sharp-glib/Makefile b/devel/dbus-sharp-glib/Makefile
index a489d47..78ced14 100644
--- a/devel/dbus-sharp-glib/Makefile
+++ b/devel/dbus-sharp-glib/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	dbus-sharp-glib
 PORTVERSION=	0.5.0
 CATEGORIES=	devel
-MASTER_SITES=	http://cloud.github.com/downloads/mono/dbus-sharp/
+MASTER_SITES=	GHC
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	D-Bus for .NET: GLib integration module
@@ -12,6 +12,10 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/deve
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
 
 USES=		gmake pathfix pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	mono
+GH_PROJECT=	dbus-sharp
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index c07523b..dd92c89 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7.0
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
-MASTER_SITES=	http://cloud.github.com/downloads/mono/${PORTNAME}/
+MASTER_SITES=	GHC
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono interface to the D-BUS messaging system
@@ -16,6 +16,8 @@ LICENSE=	MIT
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
 USES=		gmake mono pathfix pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	mono
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/libcli/Makefile b/devel/libcli/Makefile
index 6c7a649..fee8116 100644
--- a/devel/libcli/Makefile
+++ b/devel/libcli/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	libcli
 PORTVERSION=	1.9.6
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	 http://cloud.github.com/downloads/dparrish/libcli/
+MASTER_SITES=	GHC
 
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Emulates a Cisco style command-line interface
@@ -13,6 +13,8 @@ LICENSE=	LGPL21
 
 USES=		gmake
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	dparrish
 
 PLIST_FILES=	lib/libcli.so \
 		lib/libcli.so.1.9.6 \
diff --git a/dns/p5-pgeodns/Makefile b/dns/p5-pgeodns/Makefile
index fa369a5..85b3a09 100644
--- a/dns/p5-pgeodns/Makefile
+++ b/dns/p5-pgeodns/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	pgeodns
 PORTVERSION=	1.41
 PORTREVISION=	2
 CATEGORIES=	dns perl5
-MASTER_SITES=	http://cloud.github.com/downloads/abh/pgeodns/
+MASTER_SITES=	GHC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -18,5 +18,7 @@ TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
+USE_GITHUB=	yes
+GH_ACCOUNT=	abh
 
 .include <bsd.port.mk>
diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 6f3a2e9..44836e4 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	apvlv
 PORTVERSION=	0.1.4
 PORTREVISION=	6
 CATEGORIES=	graphics
-MASTER_SITES=	http://cloud.github.com/downloads/naihe2010/apvlv/
+MASTER_SITES=	GHC
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	xors@mailup.net
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USE_GNOME=	gtk20
 USES=		cmake pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	naihe2010
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc \
 		-DMANDIR=${MANPREFIX}/man \
 		-DDOCDIR=${DOCSDIR} \
diff --git a/graphics/glosm/Makefile b/graphics/glosm/Makefile
index 9b88274..1218069 100644
--- a/graphics/glosm/Makefile
+++ b/graphics/glosm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	glosm
 PORTVERSION=	0.0.2
 PORTREVISION=	5
 CATEGORIES=	graphics geography
-MASTER_SITES=	http://cloud.github.com/downloads/AMDmi3/glosm/ \
-		http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	GHC http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D OpenGL renderer for OpenStreetMap
@@ -17,6 +16,8 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 USES=		tar:bzip2 cmake
 USE_GL=		gl
 USE_SDL=	sdl
+USE_GITHUB=	yes
+GH_ACCOUNT=	AMDmi3
 
 PORTDOCS=	README ChangeLog
 
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 98b47c2..45137fe 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ibus-skk
 PORTVERSION=	1.4.1
 PORTREVISION=	3
 CATEGORIES=	japanese
-MASTER_SITES=	http://cloud.github.com/downloads/ueno/ibus-skk/
+MASTER_SITES=	GHC
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese SKK input engine for IBus
@@ -16,6 +16,8 @@ LIB_DEPENDS=	libskk.so:${PORTSDIR}/japanese/libskk \
 
 USES=		gettext gmake pkgconfig python
 USE_GNOME=	intltool
+USE_GITHUB=	yes
+GH_ACCOUNT=	ueno
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	DATADIRNAME=share
 
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index a025ff2..73922d5 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	rhino
 DISTVERSION=	1_7R4
 CATEGORIES=	lang java
-MASTER_SITES=	http://cloud.github.com/downloads/mozilla/rhino/:rhino \
+MASTER_SITES=	GHC \
 		LOCAL/nivit/${PORTNAME}/:swingex \
 		APACHE/xmlbeans/binaries/:xmlbeans
-DISTFILES=	${PORTNAME}${DISTVERSION}.zip:rhino \
+DISTFILES=	${PORTNAME}${DISTVERSION}.zip \
 		src.zip:swingex \
 		xmlbeans-2.5.0.zip:xmlbeans
 DIST_SUBDIR=	${PORTNAME}
@@ -35,6 +35,8 @@ OPTIONS_DEFAULT=	LINEDIT
 OPTIONS_DEFINE=	LINEDIT
 
 USES=		zip
+USE_GITHUB=	yes
+GH_ACCOUNT=	mozilla
 
 .include <bsd.port.options.mk>
 
diff --git a/math/liblbfgs/Makefile b/math/liblbfgs/Makefile
index f534700..b69e3c2 100644
--- a/math/liblbfgs/Makefile
+++ b/math/liblbfgs/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	liblbfgs
 PORTVERSION=	1.10
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	http://cloud.github.com/downloads/chokkan/liblbfgs/
+MASTER_SITES=	GHC
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno
@@ -14,6 +14,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	chokkan
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env
 
diff --git a/net/libnfs/Makefile b/net/libnfs/Makefile
index 547e625..e6707d9 100644
--- a/net/libnfs/Makefile
+++ b/net/libnfs/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	libnfs
 PORTVERSION=	1.3.0
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://cloud.github.com/downloads/sahlberg/${PORTNAME}/
+MASTER_SITES=	GHC
 
 MAINTAINER=	manuel.creach@icloud.com
 COMMENT=	Client library for accessing NFS shares over a network
@@ -17,6 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	sahlberg
 
 post-patch:
 	${REINPLACE_CMD} 's|$$(libdir)/\(pkgconfig\)|$$(prefix)/libdata/\1|' \
diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile
index 3bff737..529e2fb 100644
--- a/net/mrouted/Makefile
+++ b/net/mrouted/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mrouted
 PORTVERSION=	3.9.6
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://cloud.github.com/downloads/troglobit/mrouted/
+MASTER_SITES=	GHC
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Multicast routing daemon providing DVMRP for IPv4
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_RC_SUBR=	mrouted
 USES=		gmake tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	troglobit
 MAKE_ARGS=	sysconfdir=${PREFIX}/etc \
 		mandir=${MAN8PREFIX}/man/man8
 PORTDOCS=	README AUTHORS ChangeLog
diff --git a/security/samba-virusfilter/Makefile b/security/samba-virusfilter/Makefile
index 61725f0..f0921ed 100644
--- a/security/samba-virusfilter/Makefile
+++ b/security/samba-virusfilter/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	samba-virusfilter
 PORTVERSION=	0.1.3
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://cloud.github.com/downloads/fumiyas/samba-virusfilter/
+MASTER_SITES=	GHC
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	On-access anti-virus filter for Samba
@@ -16,6 +16,9 @@ RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
 GNU_CONFIGURE=	yes
 USES=		gmake shebangfix tar:bzip2
 SHEBANG_FILES=	bin/svf-notify.ksh
+USE_GITHUB=	yes
+GH_ACCOUNT=	fumiyas
+
 ALL_TARGET=	# should empty
 CONFIGURE_ARGS=	--with-samba-source=`cd ${PORTSDIR}/net/${SAMBA_PORT}; ${MAKE} -VWRKSRC` \
 		--with-clamd=${PREFIX}/sbin/clamd --with-savdid=${PREFIX}/bin/savdid
diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index 7ac1dbb..6d5d31c 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	autojump
 PORTVERSION=	13
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/joelthelion/autojump/ \
-		http://www.vermatech.com/distfiles/
+MASTER_SITES=	GHC http://www.vermatech.com/distfiles/
 DISTNAME=	autojump_v${PORTVERSION}
 
 MAINTAINER=	neeraj.verma.ports@vermatech.com
@@ -17,6 +16,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 NO_BUILD=	yes
 USES=		python:run
+USE_GITHUB=	yes
+GH_ACCOUNT=	joelthelion
 SUB_FILES=	pkg-install
 
 PLIST_FILES=	bin/autojump \
@@ -32,8 +33,6 @@ OPTIONS_DEFAULT=	ZSH
 ZSH_RUN_DEPENDS=	zsh:${PORTSDIR}/shells/zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_j
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e '/#!\/usr\/bin/s|python|env &|' \
 		${WRKSRC}/autojump
@@ -41,10 +40,10 @@ post-patch:
 do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${SH} ./install.sh \
 		--prefix ${STAGEDIR}${PREFIX})
-.if ${PORT_OPTIONS:MZSH}
+
+do-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/_j \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
-.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/bsdinfo/Makefile b/sysutils/bsdinfo/Makefile
index 6296de2..539a5cc 100644
--- a/sysutils/bsdinfo/Makefile
+++ b/sysutils/bsdinfo/Makefile
@@ -5,11 +5,13 @@ PORTNAME=	bsdinfo
 PORTVERSION=	0.22
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/samupl/bsdinfo/
+MASTER_SITES=	GHC
 
 MAINTAINER=	freebsd-ports@samu.pl
 COMMENT=	Simple utility to display system-based information
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	samupl
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	X256
diff --git a/sysutils/confctl/Makefile b/sysutils/confctl/Makefile
index e26cc88..92d0337 100644
--- a/sysutils/confctl/Makefile
+++ b/sysutils/confctl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	confctl
 PORTVERSION=	1.2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/trasz/confctl/ \
+MASTER_SITES=	GHC \
 		LOCAL/trasz
 
 MAINTAINER=	trasz@FreeBSD.org
@@ -12,6 +12,8 @@ COMMENT=	Utility to parse and modify C-like configuration files
 
 LICENSE=	BSD2CLAUSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	trasz
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/confctl \
 		man/man1/confctl.1.gz
diff --git a/sysutils/zfs-stats/Makefile b/sysutils/zfs-stats/Makefile
index 6070a84..0abcb8b 100644
--- a/sysutils/zfs-stats/Makefile
+++ b/sysutils/zfs-stats/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	zfs-stats
 PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/mmatuska/zfs-stats/
+MASTER_SITES=	GHC
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Display human-readable ZFS statistics
@@ -13,6 +13,8 @@ COMMENT=	Display human-readable ZFS statistics
 LICENSE=	BSD2CLAUSE
 
 USES=		perl5 shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	mmatuska
 
 NO_BUILD=	yes
 SHEBANG_FILES=	zfs-*
diff --git a/textproc/tidyp/Makefile b/textproc/tidyp/Makefile
index c4e0b8a..9c0d754 100644
--- a/textproc/tidyp/Makefile
+++ b/textproc/tidyp/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tidyp
 PORTVERSION=	1.04
 PORTREVISION=	2
 CATEGORIES=	textproc www
-MASTER_SITES=	http://cloud.github.com/downloads/petdance/tidyp/ \
-		LOCAL/sunpoet
+MASTER_SITES=	GHC LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library and program to validate and fix HTML
@@ -16,6 +15,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	petdance
 
 OPTIONS_DEFINE=	ACCESS DEBUG
 ACCESS_DESC=	Accessibility checks
diff --git a/www/ach/Makefile b/www/ach/Makefile
index dfa5821..5823f17 100644
--- a/www/ach/Makefile
+++ b/www/ach/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ACH
 PORTVERSION=	1.0.3
 CATEGORIES=	www
-MASTER_SITES=	http://cloud.github.com/downloads/Burton/Analysis-of-Competing-Hypotheses/
+MASTER_SITES=	GHC
 EXTRACT_SUFX=	-alpha.tar
 
 MAINTAINER=	danilo@FreeBSD.org
@@ -14,6 +14,9 @@ LICENSE=	GPLv3
 
 USE_MYSQL=	yes
 USE_PHP=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	Burton
+GH_PROJECT=	Analysis-of-Competing-Hypotheses
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha
 NO_BUILD=	yes
diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile
index ff720ac..93ee1086 100644
--- a/www/gaeutilities/Makefile
+++ b/www/gaeutilities/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	gaeutilities
 PORTVERSION=	1.4
 PORTREVISION=	0
 CATEGORIES=	www devel
-MASTER_SITES=	http://cloud.github.com/downloads/joerussbowman/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,8 +13,9 @@ COMMENT=	Utility classes to make working with Google App Engine easier
 RUN_DEPENDS=	google-appengine>=1.2.4_1:${PORTSDIR}/www/google-appengine
 
 USES=		python:2 # same as www/google-appengine
-
-WRKSRC=	${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1
+USE_GITHUB=	yes
+GH_ACCOUNT=	joerussbowman
+GH_TAGNAME=	ea3f7e1
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/www/gaeutilities/distinfo b/www/gaeutilities/distinfo
index 8793978..292de8c 100644
--- a/www/gaeutilities/distinfo
+++ b/www/gaeutilities/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gaeutilities-1.4.tar.gz) = 3f6f1cba59da1546d03ab439d59583c747d13676926529a045bcc3ef902f5be3
-SIZE (gaeutilities-1.4.tar.gz) = 779726
+SHA256 (joerussbowman-gaeutilities-1.4-ea3f7e1_GH0.tar.gz) = 3ed7e2e8da8d13266b1fa0a318ed057c0da35cdf2156495737c960eddb8efbd9
+SIZE (joerussbowman-gaeutilities-1.4-ea3f7e1_GH0.tar.gz) = 779718
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index 6e12572..9eb8f31 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mod_xsendfile
 PORTVERSION=	0.12
 PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	https://tn123.org/mod_xsendfile/ \
-		http://cloud.github.com/downloads/potatosalad/mod_xsendfile/
+MASTER_SITES=	https://tn123.org/mod_xsendfile/ GHC
 
 MAINTAINER=	potatosaladx@gmail.com
 COMMENT=	Apache2 module that processes X-SENDFILE headers
@@ -16,5 +15,7 @@ LICENSE=	APACHE20
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	potatosalad
 
 .include <bsd.port.mk>
diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile
index c9f6aa8..94ee716 100644
--- a/www/p5-Ark/Makefile
+++ b/www/p5-Ark/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	Ark
 PORTVERSION=	0.1.r1
 PORTREVISION=	2
 CATEGORIES=	www perl5
-MASTER_SITES=	http://cloud.github.com/downloads/typester/ark-perl/ \
-		LOCAL/kuriyama
+MASTER_SITES=	GHC LOCAL/kuriyama
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Ark-0.001000_001
 
@@ -34,5 +33,8 @@ RUN_DEPENDS=	\
 
 USES=		perl5
 USE_PERL5=	configure
+USE_GITHUB=	yes
+GH_ACCOUNT=	typester
+GH_PROJECT=	ark-perl
 
 .include <bsd.port.mk>
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 6fbc035..834758e 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tDOM
 PORTVERSION=	0.8.3
 CATEGORIES=	www
-MASTER_SITES=	https://cloud.github.com/downloads/tDOM/tdom/ \
-		http://mirrors.rit.edu/zi/
+MASTER_SITES=	GHC http://mirrors.rit.edu/zi/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
@@ -16,6 +15,8 @@ TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 OPTIONS_DEFINE=	DOCS
 
 USES=		gmake tcl tar:tgz
+USE_GITHUB=	yes
+GH_PROJECT=	tdom
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../configure
diff --git a/www/tinymce3/Makefile b/www/tinymce3/Makefile
index 68f9a99..19807a3 100644
--- a/www/tinymce3/Makefile
+++ b/www/tinymce3/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	tinymce
 PORTVERSION=	3.5.8
 CATEGORIES=	www
-MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/ \
-		LOCAL/sunpoet
+MASTER_SITES=	GHC LOCAL/sunpoet
 PKGNAMESUFFIX=	3
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -19,6 +18,7 @@ CONFLICTS_INSTALL=	tinymce-[0-24-9]*
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		cpe zip
+USE_GITHUB=	yes
 
 post-extract:
 	@cd ${WRKSRC}/ && ${FIND} -s * -type d -empty | ${XARGS} -I % ${TOUCH} %/.keepme
diff --git a/www/tinytinyhttpd/Makefile b/www/tinytinyhttpd/Makefile
index 02de8a4a..1ca1514 100644
--- a/www/tinytinyhttpd/Makefile
+++ b/www/tinytinyhttpd/Makefile
@@ -4,11 +4,14 @@
 PORTNAME=	tinytinyhttpd
 PORTVERSION=	0.0.11
 CATEGORIES=	www
-MASTER_SITES=	http://cloud.github.com/downloads/mattn/tinytinyhttpd/
+MASTER_SITES=	GHC
 
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	Tiny tiny httpd
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mattn
+
 HAS_CONFIGURE=	yes
 
 PLIST_FILES=	bin/tthttpd
@@ -16,16 +19,13 @@ SUB_FILES=	example.conf
 PORTDOCS=	README example.conf ChangeLog
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tthttpd ${STAGEDIR}${PREFIX}/bin
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/example.conf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>