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

While there, fix small style issues.

Sponsored by:	Absolight

4 files changed, 14 insertions, 21 deletions

diff --git a/databases/mongodb34-rocks/Makefile b/databases/mongodb34-rocks/Makefile
index a982a6958043..d243776e9301 100644
--- a/databases/mongodb34-rocks/Makefile
+++ b/databases/mongodb34-rocks/Makefile
@@ -5,14 +5,12 @@ PORTVERSION=	3.4.4
 DISTVERSIONPREFIX=	r
 PORTREVISION=	1
 CATEGORIES=	databases net
-MASTER_SITES=	https://fastdl.mongodb.org/src/:main \
-		http://fastdl.mongodb.org/src/:main \
-		http://download.mongodb.org/src/:main \
-		https://github.com/mongodb-partners/mongo-rocks/archive/:module
+MASTER_SITES=	https://fastdl.mongodb.org/src/ \
+		http://fastdl.mongodb.org/src/ \
+		http://download.mongodb.org/src/
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}-rocks
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION}
-DISTFILES=	mongodb-src-r${PORTVERSION}.tar.gz:main \
-		r${PORTVERSION}.tar.gz:module
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Distributed document-oriented database with a RocksDB Storage Engine
@@ -45,6 +43,8 @@ SSL_USE=	yes
 SSL_MAKE_ARGS=	--ssl
 
 USES=		compiler:c++14-lang cpe execinfo python:build scons
+USE_GITHUB=	nodefault
+GH_TUPLE=	mongodb-partners:mongo-rocks:r${PORTVERSION}:module/src/mongo/db/modules/rocks
 
 WITH_DEBUG=yes
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
@@ -72,10 +72,6 @@ USES+=	ssl
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/mongo/db/modules/
-	@${LN} -sf ${WRKDIR}/mongo-rocks-r${PORTVERSION} ${WRKSRC}/src/mongo/db/modules/rocks
-
 post-install:
 .for f in mongo mongod mongoperf mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
diff --git a/databases/mongodb34-rocks/distinfo b/databases/mongodb34-rocks/distinfo
index b86e02c93442..55e7af3eb7bd 100644
--- a/databases/mongodb34-rocks/distinfo
+++ b/databases/mongodb34-rocks/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1493235174
+TIMESTAMP = 1496741213
 SHA256 (mongodb-src-r3.4.4.tar.gz) = 09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6
 SIZE (mongodb-src-r3.4.4.tar.gz) = 39867133
-SHA256 (r3.4.4.tar.gz) = ec8ca07013672dad538b0e64c7645fa61ce2f464f8912d412fc89e7649dc3fdc
-SIZE (r3.4.4.tar.gz) = 56756
+SHA256 (mongodb-partners-mongo-rocks-r3.4.4_GH0.tar.gz) = ec8ca07013672dad538b0e64c7645fa61ce2f464f8912d412fc89e7649dc3fdc
+SIZE (mongodb-partners-mongo-rocks-r3.4.4_GH0.tar.gz) = 56756
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 70a7154654de..ef8343a456ea 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -4,10 +4,7 @@
 PORTNAME=	redis
 DISTVERSION=	4.0-rc3
 CATEGORIES=	databases
-MASTER_SITES=	https://github.com/antirez/redis/archive/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${DISTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Persistent key-value database with built-in net interface
@@ -15,6 +12,8 @@ COMMENT=	Persistent key-value database with built-in net interface
 LICENSE=	BSD3CLAUSE
 
 USES=		execinfo
+USE_GITHUB=	yes
+GH_ACCOUNT=	antirez
 
 OPTIONS_DEFINE=	TESTS TRIB
 OPTIONS_RADIO=	EXTLUA
@@ -25,8 +24,6 @@ LUAJIT_DESC=	Use lang/luajit instead of builtin lua
 TESTS_DESC=	Install lang/tcl for redis unit tests
 TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTRIB}
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 54fe45b4b0e8..459452db337b 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493682125
-SHA256 (redis/4.0-rc3.tar.gz) = bc948bcb32dc4ba43412dd791b4bb48c64de9debb797346b9c9f1b2cb98f96f4
-SIZE (redis/4.0-rc3.tar.gz) = 1743279
+TIMESTAMP = 1496741468
+SHA256 (antirez-redis-4.0-rc3_GH0.tar.gz) = bc948bcb32dc4ba43412dd791b4bb48c64de9debb797346b9c9f1b2cb98f96f4
+SIZE (antirez-redis-4.0-rc3_GH0.tar.gz) = 1743279