Convert every usage of https://github.com/.../archive/xxx to USE_GITHUB.

While there, fix small style issues.

Sponsored by:	Absolight

6 files changed, 29 insertions, 41 deletions

diff --git a/games/el/Makefile b/games/el/Makefile
index 8d5a85ab2789..ccce8c2b95ea 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -6,9 +6,6 @@ PORTVERSION=	1.9.4.3
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/raduprv/Eternal-Lands/archive/
-DISTFILES=	${PORTVERSION}${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Eternal Lands is a free 3D MMORPG
@@ -26,11 +23,13 @@ USE_GNOME=	libxml2
 USE_SDL=	sdl net image
 USE_GL=		yes
 USE_XORG=	x11
+USE_GITHUB=	yes
+GH_ACCOUNT=	raduprv
+GH_PROJECT=	Eternal-Lands
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB} -lX11
 
 ALL_TARGET=	el.bin
 MAKEFILE=	Makefile.bsd
-WRKSRC=		${WRKDIR}/Eternal-Lands-${PORTVERSION}
 PLIST_FILES=	bin/el \
 		%%DATADIR%%/el.bin
 
diff --git a/games/el/distinfo b/games/el/distinfo
index 102b1924ab7f..64be58f8cf60 100644
--- a/games/el/distinfo
+++ b/games/el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494520973
-SHA256 (el/1.9.4.3.tar.gz) = 40f46b6a79af480dd39a4333ca54486d6a706f39506f3c25220307431e49bcc5
-SIZE (el/1.9.4.3.tar.gz) = 2808743
+TIMESTAMP = 1496750892
+SHA256 (raduprv-Eternal-Lands-1.9.4.3_GH0.tar.gz) = 40f46b6a79af480dd39a4333ca54486d6a706f39506f3c25220307431e49bcc5
+SIZE (raduprv-Eternal-Lands-1.9.4.3_GH0.tar.gz) = 2808743
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index c01f1e0e00c8..1cf0be56e38f 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -5,14 +5,6 @@ PORTNAME=	jfsw
 PORTVERSION=	20131019
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/jonof/${PORTNAME}/archive/${JFSW_COMMIT}.tar.gz?dummy=/ \
-		https://github.com/jonof/jfbuild/archive/${JFBUILD_COMMIT}.tar.gz?dummy=/ \
-		https://github.com/jonof/jfaudiolib/archive/${JFAUDIO_COMMIT}.tar.gz?dummy=/ \
-		https://github.com/jonof/jfmact/archive/${JFMACT_COMMIT}.tar.gz?dummy=/
-DISTFILES=	${PORTNAME}-${JFSW_COMMIT}.tar.gz \
-		jfbuild-${JFBUILD_COMMIT}.tar.gz \
-		jfaudiolib-${JFAUDIO_COMMIT}.tar.gz \
-		jfmact-${JFMACT_COMMIT}.tar.gz
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Jonathon Fowler's Shadow Warrior Port
@@ -25,10 +17,14 @@ LICENSE_PERMS_BuildLic=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-acc
 
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
-JFSW_COMMIT=	5cff6a81708ff053b569ba4400fba073afe207fe
-JFBUILD_COMMIT=	a73583184aca466cebde152db2ce1020591d7049
-JFAUDIO_COMMIT=	a39ccf5e95961952d27754a255940be1d76ce85e
-JFMACT_COMMIT=	b1071da75cd465f59257240e5dbc60a014580190
+USE_GITHUB=	yes
+GH_ACCOUNT=	jonof
+GH_PROJECT=	jfbuild:build jfaudiolib:audio jfmact:mact
+GH_TAGNAME=	5cff6a81708ff053b569ba4400fba073afe207fe \
+		a73583184aca466cebde152db2ce1020591d7049:build \
+		a39ccf5e95961952d27754a255940be1d76ce85e:audio \
+		b1071da75cd465f59257240e5dbc60a014580190:mact
+GH_SUBDIR=	jfbuild:build jfaudiolib:audio jfmact:mact
 
 USE_GL=		gl
 USE_GNOME=	gtk20
@@ -39,7 +35,6 @@ DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
 
 NO_CDROM=	Must be distributed only through the Internet and free of charge
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${JFSW_COMMIT}
 MAKE_ENV+=	DATADIR="${DATADIR}" \
 		NOASM=1 \
 		LINKED_GTK=1
@@ -48,13 +43,6 @@ SUB_FILES=	pkg-message
 
 PORTDOCS=	readme.txt releasenotes.html
 
-post-extract:
-	@(cd ${WRKSRC} && \
-		${RMDIR} jfbuild jfaudiolib jfmact && \
-		${LN} -sf ${WRKDIR}/jfbuild-${JFBUILD_COMMIT} jfbuild && \
-		${LN} -sf ${WRKDIR}/jfaudiolib-${JFAUDIO_COMMIT} jfaudiolib && \
-		${LN} -sf ${WRKDIR}/jfmact-${JFMACT_COMMIT} jfmact)
-
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \
 		${WRKSRC}/jfbuild/Makefile
diff --git a/games/jfsw/distinfo b/games/jfsw/distinfo
index f4cd910a1532..5d99db04e3ec 100644
--- a/games/jfsw/distinfo
+++ b/games/jfsw/distinfo
@@ -1,8 +1,9 @@
-SHA256 (jfsw-5cff6a81708ff053b569ba4400fba073afe207fe.tar.gz) = 605a84a06de4c5f1ea5e0603e39a55c9eaa4421f9d8138fe0fa49c2059a59b48
-SIZE (jfsw-5cff6a81708ff053b569ba4400fba073afe207fe.tar.gz) = 1393801
-SHA256 (jfbuild-a73583184aca466cebde152db2ce1020591d7049.tar.gz) = 1a9669d5fc8940c20d7169f524a6e3b99944ff0fd4c75479bbf98e4f2b1a94e2
-SIZE (jfbuild-a73583184aca466cebde152db2ce1020591d7049.tar.gz) = 1434766
-SHA256 (jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e.tar.gz) = 1469349178a6cfe8b5b46e5ebc86697d733c9c51b98453f3705095b5bc99ec3c
-SIZE (jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e.tar.gz) = 1041164
-SHA256 (jfmact-b1071da75cd465f59257240e5dbc60a014580190.tar.gz) = 61f98c885995d5d7c1f7bb7315eed118f95b53312ad7dfbd190006ba3446ee24
-SIZE (jfmact-b1071da75cd465f59257240e5dbc60a014580190.tar.gz) = 25410
+TIMESTAMP = 1496751228
+SHA256 (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 605a84a06de4c5f1ea5e0603e39a55c9eaa4421f9d8138fe0fa49c2059a59b48
+SIZE (jonof-jfsw-20131019-5cff6a81708ff053b569ba4400fba073afe207fe_GH0.tar.gz) = 1393801
+SHA256 (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1a9669d5fc8940c20d7169f524a6e3b99944ff0fd4c75479bbf98e4f2b1a94e2
+SIZE (jonof-jfbuild-a73583184aca466cebde152db2ce1020591d7049_GH0.tar.gz) = 1434766
+SHA256 (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1469349178a6cfe8b5b46e5ebc86697d733c9c51b98453f3705095b5bc99ec3c
+SIZE (jonof-jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e_GH0.tar.gz) = 1041164
+SHA256 (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 61f98c885995d5d7c1f7bb7315eed118f95b53312ad7dfbd190006ba3446ee24
+SIZE (jonof-jfmact-b1071da75cd465f59257240e5dbc60a014580190_GH0.tar.gz) = 25410
diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index 752a1a3c77fe..d1e19bffc448 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -5,9 +5,7 @@ PORTNAME=		fife
 PORTVERSION=		0.4.1
 PORTREVISION=		2
 CATEGORIES=		games
-MASTER_SITES=		https://github.com/fifengine/fifengine/archive/
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
-DISTFILES=		${PORTVERSION}.tar.gz
 
 MAINTAINER=		fiziologus@gmail.com
 COMMENT=		Flexible Isometric Free Engine
@@ -26,7 +24,9 @@ USE_GL=			gl
 USE_SDL=		sdl2 ttf2 image2
 USE_XORG=		xcursor
 
-WRKSRC=			${WRKDIR}/fifengine-${PORTVERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	fifengine
+GH_PROJECT=	fifengine
 
 OPTIONS_DEFINE=		ZIP LOGGING
 
diff --git a/games/py-fife/distinfo b/games/py-fife/distinfo
index 16d42c75487b..b8aabd4830e6 100644
--- a/games/py-fife/distinfo
+++ b/games/py-fife/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487860054
-SHA256 (0.4.1.tar.gz) = bae3fc591cc2891f7d1b3a656a5d8ad700ecc2e297ad453bf4f1bcbbf82e8cb2
-SIZE (0.4.1.tar.gz) = 15972607
+TIMESTAMP = 1496751325
+SHA256 (fifengine-fifengine-0.4.1_GH0.tar.gz) = bae3fc591cc2891f7d1b3a656a5d8ad700ecc2e297ad453bf4f1bcbbf82e8cb2
+SIZE (fifengine-fifengine-0.4.1_GH0.tar.gz) = 15972607