Update ports in the a* categories to not use GH_COMMIT.

With minor cleanups to make things simpler.

With hat:	portmgr
Sponsored by:	Absolight

56 files changed, 74 insertions, 120 deletions

diff --git a/archivers/nwreckdum/Makefile b/archivers/nwreckdum/Makefile
index 6bba1c6449eb..78f8a96eaba8 100644
--- a/archivers/nwreckdum/Makefile
+++ b/archivers/nwreckdum/Makefile
@@ -13,8 +13,7 @@ LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	danfe
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	22cbc47
+GH_TAGNAME=	22cbc47
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/archivers/nwreckdum/distinfo b/archivers/nwreckdum/distinfo
index d315f76378e9..73d4089eef35 100644
--- a/archivers/nwreckdum/distinfo
+++ b/archivers/nwreckdum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nwreckdum-0.0.6.tar.gz) = 21ab8cd85cfb831a65cfe89e4d0d4a04c31a98d319ecf45bc263a46385ffecf7
-SIZE (nwreckdum-0.0.6.tar.gz) = 7844
+SHA256 (danfe-nwreckdum-0.0.6-22cbc47_GH0.tar.gz) = 0fb540d0326032cd571c4cf7acc3a31e85502f157dea75988423a7634ad5101a
+SIZE (danfe-nwreckdum-0.0.6-22cbc47_GH0.tar.gz) = 7840
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile
index 0a48b5a95e27..822bedcb6aca 100644
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@@ -9,14 +9,14 @@ PORTNAME=	snappy
 PORTVERSION=	1.0.4.1
 PORTREVISION=	1
 CATEGORIES=	archivers java
-MASTER_SITES=	GITHUB_LEGACY:source1 \
+MASTER_SITES=	GH:source1 \
 		http://snappy.googlecode.com/files/:source2 \
 		LOCAL/jgh/archivers/${PORTNAME}/:source3
 PKGNAMESUFFIX=	java
-DISTFILES+=	snappy-${PORTVERSION}.tar.gz:source1 \
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}:source1 \
 		snappy-${PORTVERSION:R}.tar.gz:source2 \
 		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz:source3
-EXTRACT_ONLY=	snappy-${PORTVERSION}.tar.gz \
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz
 
 MAINTAINER=	hsn@sendmail.cz
@@ -26,11 +26,10 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	xerial
 GH_PROJECT=	snappy-java
 GH_TAGNAME=	snappy-java-${PORTVERSION}
-GH_COMMIT=	487f82d
-USE_GITHUB=	yes
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7
diff --git a/archivers/snappy-java/distinfo b/archivers/snappy-java/distinfo
index 113194a7e488..2405f86364a1 100644
--- a/archivers/snappy-java/distinfo
+++ b/archivers/snappy-java/distinfo
@@ -1,5 +1,5 @@
-SHA256 (snappy-1.0.4.1.tar.gz) = c8715bc9cb7c3112b6e56bee9368c024ef8bf12d09faaac45bb84f2d3aec3bd6
-SIZE (snappy-1.0.4.1.tar.gz) = 5475060
+SHA256 (xerial-snappy-java-1.0.4.1-snappy-java-1.0.4.1_GH0.tar.gz) = efb6d747d754779113b0c023886803c2daedb585b6ec80dd71ffa6a40a083f14
+SIZE (xerial-snappy-java-1.0.4.1-snappy-java-1.0.4.1_GH0.tar.gz) = 5475057
 SHA256 (snappy-1.0.4.tar.gz) = 4ad91adb1592b6de67ecaad2ade6c34b9cf98a0bbc74ac8786b520b529b3bf61
 SIZE (snappy-1.0.4.tar.gz) = 1676541
 SHA256 (FreeBSD-snappy-1.0.4.1-maven-repository.tar.gz) = 1d258eedabd2ff74954988b7d404ac803f55687b916f697179489c3a4cb0e243
diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index 38cb7365e04c..07af90ef2df5 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	gpscorrelate
 PORTVERSION=	1.6.1
 PORTREVISION=	3
 CATEGORIES=	astro geography
-MASTER_SITES=	GHL
-DIST_SUBDIR=	repacked
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Correlate digital camera photos with GPS data in GPX format
@@ -21,7 +19,6 @@ USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freefoote
-GH_COMMIT=	a36646b
 
 PLIST_FILES=	bin/gpscorrelate bin/gpscorrelate-gui \
 		man/man1/gpscorrelate.1.gz man/man1/gpscorrelate-gui.1.gz
diff --git a/astro/gpscorrelate/distinfo b/astro/gpscorrelate/distinfo
index f4bfa1d345c8..2e50ebfa92b1 100644
--- a/astro/gpscorrelate/distinfo
+++ b/astro/gpscorrelate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/gpscorrelate-1.6.1.tar.gz) = 8c47bc7e5a8c41f5f172cdf740ed06b09144217eaaf79d4254406830f8ce91dd
-SIZE (repacked/gpscorrelate-1.6.1.tar.gz) = 154548
+SHA256 (freefoote-gpscorrelate-1.6.1_GH0.tar.gz) = a34f5f1ef5aefcd8046e4ef6915b9d90d171376e4894b5f17f66a9456956c810
+SIZE (freefoote-gpscorrelate-1.6.1_GH0.tar.gz) = 154511
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 8e8843f7bb93..25a150016c29 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	joto
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	1a5bb26
+GH_TAGNAME=	1a5bb26
 
 CXXFLAGS+=	-I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
diff --git a/astro/osmium/distinfo b/astro/osmium/distinfo
index 90736e576591..aa06c09d3cee 100644
--- a/astro/osmium/distinfo
+++ b/astro/osmium/distinfo
@@ -1,2 +1,2 @@
-SHA256 (osmium-git20130522.tar.gz) = 4d2b79245297091cb25c2d6f57c5c32d455f65afb1285d7a120bae7c4ee4aabf
-SIZE (osmium-git20130522.tar.gz) = 149382
+SHA256 (joto-osmium-git20130522-1a5bb26_GH0.tar.gz) = 27f45cbf05d2f7de83452505d1bf5dbef22c1d413c97e327bdbfa706977e91e2
+SIZE (joto-osmium-git20130522-1a5bb26_GH0.tar.gz) = 149373
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index ad3d21dd5434..085ae8a7b27e 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -10,8 +10,6 @@ PKGNAMESUFFIX=	-player
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_PROJECT=	Clementine
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	c189ee5
 
 MAINTAINER=	sbruno@FreeBSD.org
 COMMENT=	Cross-platform music player based on Amarok 1.4
diff --git a/audio/clementine-player/distinfo b/audio/clementine-player/distinfo
index 3648e87e16a8..5a28830e66d1 100644
--- a/audio/clementine-player/distinfo
+++ b/audio/clementine-player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clementine-1.2.3.tar.gz) = b7e4813b54f2cb586e80c27945240c11d884082459248e87b7359689a0f0dffb
-SIZE (clementine-1.2.3.tar.gz) = 9075813
+SHA256 (clementine-player-Clementine-1.2.3_GH0.tar.gz) = 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf
+SIZE (clementine-player-Clementine-1.2.3_GH0.tar.gz) = 9076977
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 0f8c43ba9522..af7eb63dc810 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.6.0
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	audio
 
@@ -12,9 +13,6 @@ COMMENT=	Console-based music player with really cool features
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME}
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	76421f1
 
 USES=		gmake pkgconfig iconv ncurses
 HAS_CONFIGURE=	yes
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index d6e547116ab2..58f4993d5535 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmus-2.6.0.tar.gz) = 4c751b55594d098fc9768dfd40c15ac6e7f061ebf02276c8f3e0ef7200383839
-SIZE (cmus-2.6.0.tar.gz) = 287867
+SHA256 (cmus-cmus-v2.6.0_GH0.tar.gz) = 0c53c072432e026d682d1749bbe89777507b31107ca04afad21a9bf375208e8e
+SIZE (cmus-cmus-v2.6.0_GH0.tar.gz) = 287834
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 16228a2bc27c..1a3bcab9bd9f 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	creox
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3
 PORTREVISION=	3
 CATEGORIES=	audio kde
 
@@ -16,8 +16,6 @@ LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 USE_GITHUB=	yes
 GH_ACCOUNT=	laudrup
 GH_PROJECT=	Creox4
-GH_TAGNAME=	0.3
-GH_COMMIT=	8e27483
 
 USES=		cmake:outsource
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/audio/creox/distinfo b/audio/creox/distinfo
index ea98b3de943e..fe8fdfb4fd22 100644
--- a/audio/creox/distinfo
+++ b/audio/creox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (creox-0.3.0.tar.gz) = 7ca8ea0d54eeeb50e8df8bbe3832ef0e68880c00bf6f77aee1fd567beb457b23
-SIZE (creox-0.3.0.tar.gz) = 216287
+SHA256 (laudrup-Creox4-0.3_GH0.tar.gz) = c8de084acb219bd5ac40b4802ab1a2d876af8ab9e31d183df82ee4652cbd2c88
+SIZE (laudrup-Creox4-0.3_GH0.tar.gz) = 216273
diff --git a/audio/gtmixer/Makefile b/audio/gtmixer/Makefile
index fd31e501bd2c..a786724a1f3f 100644
--- a/audio/gtmixer/Makefile
+++ b/audio/gtmixer/Makefile
@@ -13,7 +13,6 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	svagner
-GH_COMMIT=	9e22be7
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/audio/gtmixer/distinfo b/audio/gtmixer/distinfo
index c06d97f2408d..ff95a5b90575 100644
--- a/audio/gtmixer/distinfo
+++ b/audio/gtmixer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtmixer-1.0.2.tar.gz) = 5b0a4a2bad6d42bd26362beb49f2ad73d01c3d9d340baab96656f0629ff5ab75
-SIZE (gtmixer-1.0.2.tar.gz) = 126870
+SHA256 (svagner-gtmixer-1.0.2_GH0.tar.gz) = 3c9382074427ba6cb6320c747037baac9e38269e40b8383e17681451c8bfe69e
+SIZE (svagner-gtmixer-1.0.2_GH0.tar.gz) = 126819
diff --git a/audio/hydrogen-devel/Makefile b/audio/hydrogen-devel/Makefile
index bf75247c79d4..c3d5ead06a67 100644
--- a/audio/hydrogen-devel/Makefile
+++ b/audio/hydrogen-devel/Makefile
@@ -1,11 +1,11 @@
 # Created by: Shane Ambler <FreeBSD@ShaneWare.Biz>
 # $FreeBSD$
 
-PORTNAME=	hydrogen-devel
+PORTNAME=	hydrogen
 PORTVERSION=	0.9.6r2
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	GHL
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
 COMMENT=	Advanced drum machine
@@ -22,7 +22,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	hydrogen-music
 GH_PROJECT=	hydrogen
 GH_TAGNAME=	0.9.6-RC2
-GH_COMMIT=	2ff9010
 
 MAJORVERSION=	0.9.6
 USE_QT4=	corelib gui qmake_build linguist_build moc_build network \
diff --git a/audio/hydrogen-devel/distinfo b/audio/hydrogen-devel/distinfo
index aa055e1d74fd..800fe576b976 100644
--- a/audio/hydrogen-devel/distinfo
+++ b/audio/hydrogen-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-devel-0.9.6r2.tar.gz) = a788f6fb168f5f0a1d9041a06e70d85304c6204059d6d3dbabdec74a8d91074a
-SIZE (hydrogen-devel-0.9.6r2.tar.gz) = 6625383
+SHA256 (hydrogen-music-hydrogen-0.9.6r2-0.9.6-RC2_GH0.tar.gz) = c2f825aae96fb44d9739e0b00a0d3f9acfed8ae612cfe53a99c7e89e1d5b83b0
+SIZE (hydrogen-music-hydrogen-0.9.6r2-0.9.6-RC2_GH0.tar.gz) = 6625489
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 23b3e0ea3c48..3513815fefca 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.6.1
 CATEGORIES=	audio
-MASTER_SITES=	GHL
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
 COMMENT=	Advanced drum machine
@@ -17,9 +16,6 @@ CONFLICTS=	hydrogen-devel-0.*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hydrogen-music
-GH_PROJECT=	hydrogen
-GH_TAGNAME=	0.9.6.1
-GH_COMMIT=	71ec7c5
 
 USE_QT4=	corelib gui qmake_build linguist_build moc_build network \
 		qt3support rcc_build sql uic_build xml
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 4f72171e5b2a..cb09d5ce3ae7 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.6.1.tar.gz) = 1837739acd7aa27d27930e314a1759bbdcb97dac592b5e1b4907c2b0c23fbc3e
-SIZE (hydrogen-0.9.6.1.tar.gz) = 6625987
+SHA256 (hydrogen-music-hydrogen-0.9.6.1_GH0.tar.gz) = 94dadf433f0abbe7e0ae8e037726b3573f8b59abf118c9c084f06c561d56b66f
+SIZE (hydrogen-music-hydrogen-0.9.6.1_GH0.tar.gz) = 6626629
diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile
index 1424638d39fd..ccc63565aeee 100644
--- a/audio/icecast-kh/Makefile
+++ b/audio/icecast-kh/Makefile
@@ -23,7 +23,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	karlheyes
 GH_PROJECT=	icecast-kh
 GH_TAGNAME=	icecast-${ICVERSION}-kh${KH}
-GH_COMMIT=	dde3bc0
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/icecast-kh/distinfo b/audio/icecast-kh/distinfo
index c505756552b2..30a307b7aacb 100644
--- a/audio/icecast-kh/distinfo
+++ b/audio/icecast-kh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icecast-2.3.3-kh10.tar.gz) = e8e5217ea5773cbf2760ae80912e230c21db4dc884e9f9a7534d4c410610e2ff
-SIZE (icecast-2.3.3-kh10.tar.gz) = 922628
+SHA256 (icecast-2.3.3-kh10_GH0.tar.gz) = c5d6e2fefe27ccc819e460bb27c67c876d66ed7ae89b094674d9e4e9857d74e4
+SIZE (icecast-2.3.3-kh10_GH0.tar.gz) = 922537
diff --git a/audio/id3ren/Makefile b/audio/id3ren/Makefile
index e25bfd0fc2c7..60759de53829 100644
--- a/audio/id3ren/Makefile
+++ b/audio/id3ren/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	id3ren
 PORTVERSION=	1.1b0
 CATEGORIES=	audio
-MASTER_SITES=	GHL
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Rename MP3 files, edit tags, search, etc
@@ -14,7 +13,6 @@ LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebcode
 GH_TAGNAME=	322ee77
-GH_COMMIT=	322ee77
 
 PLIST_FILES=	bin/id3ren man/man1/id3ren.1.gz
 PORTDOCS=	AUTHORS ChangeLog FEATURES FEEDBACK INSTALL PORTS \
diff --git a/audio/id3ren/distinfo b/audio/id3ren/distinfo
index a2c587348897..4956dfd41d9c 100644
--- a/audio/id3ren/distinfo
+++ b/audio/id3ren/distinfo
@@ -1,2 +1,2 @@
-SHA256 (id3ren-1.1b0.tar.gz) = f6a705e5c81dda27c33f28cf0a174b920a1b1a6dacd877e49bc9fdaa570337ee
-SIZE (id3ren-1.1b0.tar.gz) = 44106
+SHA256 (sebcode-id3ren-1.1b0-322ee77_GH0.tar.gz) = e7aafe9e895dfbfa371b5dd2e0dfc50bb3b4c03d262ff1a7968209ecbc726afa
+SIZE (sebcode-id3ren-1.1b0-322ee77_GH0.tar.gz) = 44089
diff --git a/audio/libebur128/Makefile b/audio/libebur128/Makefile
index fe8f338f792a..01cb47ee8fd6 100644
--- a/audio/libebur128/Makefile
+++ b/audio/libebur128/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libebur128
 PORTVERSION=	1.0.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	audio
 
@@ -17,8 +18,6 @@ USES=		cmake:outsource pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jiixyj
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	1214547
 
 PLIST_SUB+=	VER1=${PORTVERSION:R:R} \
 		VER3=${PORTVERSION}
diff --git a/audio/libebur128/distinfo b/audio/libebur128/distinfo
index 5022fac75a15..2ff01d73fc3e 100644
--- a/audio/libebur128/distinfo
+++ b/audio/libebur128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libebur128-1.0.1.tar.gz) = ede2e0052afa6b7f57cec808985586891c1d46b7fa1d3e1496d18bc711cbd546
-SIZE (libebur128-1.0.1.tar.gz) = 29770
+SHA256 (jiixyj-libebur128-v1.0.1_GH0.tar.gz) = 01aa7aed90c593944eeb3087a6f965557dc708de360bf1a589b3babb021e7336
+SIZE (jiixyj-libebur128-v1.0.1_GH0.tar.gz) = 29760
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index ac4b7217f193..f33ae63a0742 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -14,8 +14,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 GH_ACCOUNT=	lfranchi
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	c8e87da
 
 OPTIONS_DEFINE=	TEST
 
diff --git a/audio/libechonest/distinfo b/audio/libechonest/distinfo
index 19170eee0fd9..46187de2745e 100644
--- a/audio/libechonest/distinfo
+++ b/audio/libechonest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libechonest-2.3.1.tar.gz) = 9b052a836c0167cc0281e4d092ab46c0d38ef93005952e25f838c44faed44762
-SIZE (libechonest-2.3.1.tar.gz) = 12084942
+SHA256 (lfranchi-libechonest-2.3.1_GH0.tar.gz) = ab961ab952df30c5234b548031594d7e281e7c9f2a9d1ce91fe5421ddde85e7c
+SIZE (lfranchi-libechonest-2.3.1_GH0.tar.gz) = 12084908
diff --git a/audio/libfilteraudio/Makefile b/audio/libfilteraudio/Makefile
index 6952dbc3113b..f56f41ba59c3 100644
--- a/audio/libfilteraudio/Makefile
+++ b/audio/libfilteraudio/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	libfilteraudio
 PORTVERSION=	0.150426
 CATEGORIES=	audio
-DIST_SUBDIR=	${PORTNAME}-${GH_COMMIT}
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Lightweight audio filtering library made from webrtc code
diff --git a/audio/libfilteraudio/distinfo b/audio/libfilteraudio/distinfo
index 80c039fb823d..d4addfe6caad 100644
--- a/audio/libfilteraudio/distinfo
+++ b/audio/libfilteraudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfilteraudio-/irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = b25d0fdd2434499f9c036214a2930c0881d448444ce70f7bda63bd13a74affa9
-SIZE (libfilteraudio-/irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = 191873
+SHA256 (irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = b25d0fdd2434499f9c036214a2930c0881d448444ce70f7bda63bd13a74affa9
+SIZE (irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = 191873
diff --git a/audio/libgroove/Makefile b/audio/libgroove/Makefile
index 656532f9f34b..208a43ee4ed6 100644
--- a/audio/libgroove/Makefile
+++ b/audio/libgroove/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	andrewrk
-GH_COMMIT=	1b90d6c
 
 PLIST_SUB+=	VER1=${PORTVERSION:R:R} \
     		VER3=${PORTVERSION}
diff --git a/audio/libgroove/distinfo b/audio/libgroove/distinfo
index 1583bf069963..f4a3cbc5b216 100644
--- a/audio/libgroove/distinfo
+++ b/audio/libgroove/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgroove-4.1.1.tar.gz) = 08552393475cf9aed9b5b939e754a3f1034ba323449c1f6ca1a14e0b33e22a78
-SIZE (libgroove-4.1.1.tar.gz) = 8594196
+SHA256 (andrewrk-libgroove-4.1.1_GH0.tar.gz) = a852936e5da65e1729bc85b20e2a6ace71c3813abd77dac44759b3db8659bea6
+SIZE (andrewrk-libgroove-4.1.1_GH0.tar.gz) = 8591724
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 6ac6a8e15f17..0a8ca80f5cb8 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 GH_ACCOUNT=	lastfm
-GH_COMMIT=	a2416ca
 
 USES=		cmake pkgconfig
 USE_GITHUB=	yes
diff --git a/audio/liblastfm/distinfo b/audio/liblastfm/distinfo
index 3f935235d8a3..52bbb67f398c 100644
--- a/audio/liblastfm/distinfo
+++ b/audio/liblastfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblastfm-1.0.8.tar.gz) = c3caa148b9b0e2954db7b7c7f2ec0d1e67ff7bb51a330e6202f067be9e86529e
-SIZE (liblastfm-1.0.8.tar.gz) = 119203
+SHA256 (lastfm-liblastfm-1.0.8_GH0.tar.gz) = e36f4f83428ede7021187fe6042db5a1919a579b071a75420364ef7115434607
+SIZE (lastfm-liblastfm-1.0.8_GH0.tar.gz) = 119186
diff --git a/audio/lua51-mpd/Makefile b/audio/lua51-mpd/Makefile
index 889c9d10133b..abd83953aa3e 100644
--- a/audio/lua51-mpd/Makefile
+++ b/audio/lua51-mpd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mpd
 PORTVERSION=	0.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
@@ -15,8 +16,6 @@ DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 GH_ACCOUNT=	silentbicycle
 GH_PROJECT=	lua-mpd
-GH_TAGNAME=	v0.1
-GH_COMMIT=	ca32f43
 
 USES=		lua:51
 USE_GITHUB=	yes
diff --git a/audio/lua51-mpd/distinfo b/audio/lua51-mpd/distinfo
index c0b4d1629792..8333aa8c6899 100644
--- a/audio/lua51-mpd/distinfo
+++ b/audio/lua51-mpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.1.tar.gz) = 51905ecf330537b55b18c8a6b24f973cc92cd365f8712a9a32e2a6d61a5ca964
-SIZE (mpd-0.1.tar.gz) = 16395
+SHA256 (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 296f168887e10646624cce98c2f7504b168cb35b5445e2d21ba5fccb50a8f68b
+SIZE (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 16351
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 25aa6a8e5e2d..bd1c15328405 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mythmusic
 PORTVERSION=	0.27
+DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
@@ -21,8 +22,6 @@ BUILD_DEPENDS=	mythfrontend:${PORTSDIR}/multimedia/mythtv
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 GH_PROJECT=	mythtv
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	e9545c0
 
 WRKSRC_SUBDIR=	mythplugins
 
diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo
index 66c307cfbe08..cbf3c59be95c 100644
--- a/audio/mythplugin-mythmusic/distinfo
+++ b/audio/mythplugin-mythmusic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mythtv-0.27.tar.gz) = e8d77c48f487bd057b2f887c27416d502b79c78c4e1cfb05d87ec70d690f8d0d
-SIZE (mythtv-0.27.tar.gz) = 85915149
+SHA256 (mythtv-0.27_GH0.tar.gz) = 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0
+SIZE (mythtv-0.27_GH0.tar.gz) = 85904162
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index a71daa3f3c00..30a8d4fca12a 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	nekobee
 PORTVERSION=	0.1.8
 PORTREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	GHL
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DSSI plugin that emulates the sound of the TB-303 Bassline
@@ -19,7 +18,6 @@ LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gordonjcp
-GH_COMMIT=	3f4737f
 
 USES=		pkgconfig waf
 USE_GNOME=	gtk20
diff --git a/audio/nekobee/distinfo b/audio/nekobee/distinfo
index 0470c957ee47..01bf5d261495 100644
--- a/audio/nekobee/distinfo
+++ b/audio/nekobee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nekobee-0.1.8.tar.gz) = e9044c58884e87a1f5b396938002419346498c1299d8e87afb6cc27ee163f3be
-SIZE (nekobee-0.1.8.tar.gz) = 350259
+SHA256 (gordonjcp-nekobee-0.1.8_GH0.tar.gz) = b9c8283611a5979ed0340759067755e16fadb770e137bd416ee3d898f38493de
+SIZE (gordonjcp-nekobee-0.1.8_GH0.tar.gz) = 350234
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index ee8436cbd89c..8c3c42b35f76 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	pithos
 PORTVERSION=	1.0.0
 PORTREVISION=	2
 CATEGORIES=	audio
-DISTNAME=	${PORTVERSION}
 
 MAINTAINER=	john@pcbsd.org
 COMMENT=	Pandora client for the GNOME desktop
@@ -13,9 +12,6 @@ COMMENT=	Pandora client for the GNOME desktop
 LICENSE=	GPLv3
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	pithos
-GH_PROJECT=	pithos
-GH_COMMIT=	1f5975e
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py3-dbus \
diff --git a/audio/pithos/distinfo b/audio/pithos/distinfo
index 02e83376d85c..6bbcd3f4a347 100644
--- a/audio/pithos/distinfo
+++ b/audio/pithos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (1.0.0.tar.gz) = cc0173eef1266945d6f9cb58cdf53b9cb15434e72ffff5d28a0dd0af2e260f99
-SIZE (1.0.0.tar.gz) = 107150
+SHA256 (pithos-pithos-1.0.0_GH0.tar.gz) = cacd1a09e984fd83c4e9f38fa41feb0990981e0fd14d7b8c64e99cff294a9184
+SIZE (pithos-pithos-1.0.0_GH0.tar.gz) = 107108
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index e401490701e3..197e78491694 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:${PORTSDIR}/devel/py-appdirs
 USE_GITHUB=	yes
 GH_ACCOUNT=	simon-weber
 GH_PROJECT=	Unofficial-Google-Music-API
-GH_COMMIT=	359b200
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	359b200
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-gmusicapi/distinfo b/audio/py-gmusicapi/distinfo
index 2012e99eb45f..64f353ae53dd 100644
--- a/audio/py-gmusicapi/distinfo
+++ b/audio/py-gmusicapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmusicapi-4.0.0.20150104.tar.gz) = a26698397d2f7727a9de3ecad4280c7a6d603b83c3075052252b30f93914f1c3
-SIZE (gmusicapi-4.0.0.20150104.tar.gz) = 149288
+SHA256 (simon-weber-Unofficial-Google-Music-API-4.0.0.20150104-359b200_GH0.tar.gz) = 4a1521ad2c8769165e80311a38369f99ded3e69a2318fa607b7e4934e38ec6f8
+SIZE (simon-weber-Unofficial-Google-Music-API-4.0.0.20150104-359b200_GH0.tar.gz) = 149278
diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile
index 8863bd5b0c75..5a0f528d31c7 100644
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpd2
 PORTVERSION=	0.5.4
+DISTVERSIONPREFIX=	v
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
@@ -15,8 +16,6 @@ LICENSE=	LGPL3
 USE_GITHUB=	yes
 GH_ACCOUNT=	Mic92
 GH_PROJECT=	python-${PORTNAME}
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	504bcb1
 
 USES=		shebangfix python
 SHEBANG_FILES=	examples/helloworld.py
diff --git a/audio/py-mpd2/distinfo b/audio/py-mpd2/distinfo
index d412e4f1f023..ae766292c192 100644
--- a/audio/py-mpd2/distinfo
+++ b/audio/py-mpd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-mpd2-0.5.4.tar.gz) = e032e6f8db2a0a745580eb635dc9f85934d36d818167d328b6525e9227d81ff0
-SIZE (python-mpd2-0.5.4.tar.gz) = 45563
+SHA256 (python-mpd2-0.5.4_GH0.tar.gz) = 04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53
+SIZE (python-mpd2-0.5.4_GH0.tar.gz) = 45542
diff --git a/audio/shairplay/Makefile b/audio/shairplay/Makefile
index 8993f4b7ad4e..2aa1e543a736 100644
--- a/audio/shairplay/Makefile
+++ b/audio/shairplay/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	juhovh
-GH_COMMIT=	64d59e3
-GH_TAGNAME=	${GH_COMMIT}
+GH_TAGNAME=	64d59e3
 
 USES=		autoreconf gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/shairplay/distinfo b/audio/shairplay/distinfo
index 8fbbf98448ec..708c17a8bc59 100644
--- a/audio/shairplay/distinfo
+++ b/audio/shairplay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shairplay-0.9.0.20140422.tar.gz) = f54222999db91cfa261ec58d8b73352915a27449fc6628153b532f37e4790837
-SIZE (shairplay-0.9.0.20140422.tar.gz) = 290517
+SHA256 (juhovh-shairplay-0.9.0.20140422-64d59e3_GH0.tar.gz) = f2af84e214e48fe6c9371fcacaab7b716ca73f21270af648f926a8b639252c86
+SIZE (juhovh-shairplay-0.9.0.20140422-64d59e3_GH0.tar.gz) = 290504
diff --git a/audio/tagutil/Makefile b/audio/tagutil/Makefile
index 0fa64c6834b7..603b9a62600f 100644
--- a/audio/tagutil/Makefile
+++ b/audio/tagutil/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tagutil
 PORTVERSION=	3.0.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	audio
 
@@ -14,8 +15,6 @@ LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kAworu
-GH_TAGNAME=	v3.0.1
-GH_COMMIT=	b7ce91f
 
 USES=		pkgconfig cmake iconv
 PLIST_FILES=	bin/tagutil \
diff --git a/audio/tagutil/distinfo b/audio/tagutil/distinfo
index 63a0f166a2f1..e09b3b8916f9 100644
--- a/audio/tagutil/distinfo
+++ b/audio/tagutil/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tagutil-3.0.1.tar.gz) = 8202499a823217198ecb8ea1d172fac35fce97b6fe2bc7bbb7785e60b152bf40
-SIZE (tagutil-3.0.1.tar.gz) = 53316
+SHA256 (kAworu-tagutil-v3.0.1_GH0.tar.gz) = a31501bd93c1e31aaf11b53f044076a1773cc7fccfef1156a8719a8d8dd17c0b
+SIZE (kAworu-tagutil-v3.0.1_GH0.tar.gz) = 53306
diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index 7bdacbf8d557..95d81418c107 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -27,8 +27,6 @@ CMAKE_ARGS+=	-DWITH_BREAKPAD:BOOL="OFF" \
 CXXFLAGS+=	-Wno-cast-align
 
 GH_ACCOUNT=	tomahawk-player
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	7a869ef
 
 INSTALLS_ICONS=	yes
 
diff --git a/audio/tomahawk/distinfo b/audio/tomahawk/distinfo
index ed5e1141e2df..94071de2607d 100644
--- a/audio/tomahawk/distinfo
+++ b/audio/tomahawk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tomahawk-0.7.0.tar.gz) = 2871c6fcdc88e0392051e62697c25494571b2a62b709782590f3d539723669a6
-SIZE (tomahawk-0.7.0.tar.gz) = 6520138
+SHA256 (tomahawk-player-tomahawk-0.7.0_GH0.tar.gz) = 5bc9f10537c03e2f79cca5afab71dd76617ed9c0b4bd9a2025424c94bfc37d61
+SIZE (tomahawk-player-tomahawk-0.7.0_GH0.tar.gz) = 6519964
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index a393d9b17b0c..2f87021f4fc7 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -10,14 +10,11 @@ COMMENT=	Minimalistic Murmur (Mumble server)
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN=		Checksum and size mismatch
-
 LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
 		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fatbob313
-GH_COMMIT=	17daa7e
 
 USES=		autoreconf gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/umurmur/distinfo b/audio/umurmur/distinfo
index 5260394968ae..4f7658285424 100644
--- a/audio/umurmur/distinfo
+++ b/audio/umurmur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (umurmur-0.2.15.tar.gz) = d3cbdcb30cff40c8c76d36f54bbb743559038b694a4841b22141f20ccb8b3ec7
-SIZE (umurmur-0.2.15.tar.gz) = 86236
+SHA256 (fatbob313-umurmur-0.2.15_GH0.tar.gz) = edadbda3ee17033d0ed9da1b6550634b6d3fca4226d0113a453b359ad9a88767
+SIZE (fatbob313-umurmur-0.2.15_GH0.tar.gz) = 86187
diff --git a/audio/wildmidi/Makefile b/audio/wildmidi/Makefile
index 0c81d56630b3..b84ecb075c4a 100644
--- a/audio/wildmidi/Makefile
+++ b/audio/wildmidi/Makefile
@@ -12,9 +12,7 @@ LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Mindwerks
-GH_PROJECT=	wildmidi
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION:R}
-GH_COMMIT=	de35d7f
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 USES=		gmake cmake:outsource
 USE_LDCONFIG=	yes
 
diff --git a/audio/wildmidi/distinfo b/audio/wildmidi/distinfo
index c686f634f70f..b3d37fc9cfc5 100644
--- a/audio/wildmidi/distinfo
+++ b/audio/wildmidi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wildmidi-0.3.8.tar.gz) = 2a9f26b97dba4dae5adb2ac3babcc678a34211f066379d1a4a32f5ad141d0e4f
-SIZE (wildmidi-0.3.8.tar.gz) = 121699
+SHA256 (Mindwerks-wildmidi-0.3.8-wildmidi-0.3.8_GH0.tar.gz) = efd8c5194d066b93057bfb892e6c44f13048998f71d7aadc5514b859272762fc
+SIZE (Mindwerks-wildmidi-0.3.8-wildmidi-0.3.8_GH0.tar.gz) = 121690