Use USE_GITHUB instead of hand crafting urls.

Sponsored by:	Absolight

mail/imapsync/Makefile

@@ -3,9 +3,8 @@
 
 PORTNAME=	imapsync
 PORTVERSION=	1.836
-DISTVERSIONPREFIX=	v
+DISTVERSIONPREFIX=	imapsync-
 CATEGORIES=	mail perl5
-MASTER_SITES=	https://codeload.github.com/imapsync/imapsync/tar.gz/imapsync-${PORTVERSION}?dummy=/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	IMAP synchronization, copy or migration tool
@@ -25,10 +24,9 @@ RUN_DEPENDS=	p5-Mail-IMAPClient>0:mail/p5-Mail-IMAPClient \
 		p5-Sys-MemInfo>0:devel/p5-Sys-MemInfo \
 		p5-IO-Socket-INET6>0:net/p5-IO-Socket-INET6
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
-
 USES=		cpe perl5 tar:tgz shebangfix
 SHEBANG_FILES=	${PORTNAME}
+USE_GITHUB=	yes
 
 CPE_VENDOR=	gilles_lamiral
 NO_BUILD=	yes

mail/imapsync/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1509971458
-SHA256 (imapsync-v1.836.tgz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a
-SIZE (imapsync-v1.836.tgz) = 1741595
+TIMESTAMP = 1518701382
+SHA256 (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a
+SIZE (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 1741595

security/bro/Makefile

@@ -4,10 +4,8 @@
 PORTNAME=	bro
 PORTVERSION=	2.5.2
 CATEGORIES=	security
-MASTER_SITES=	https://www.bro.org/downloads/:source1 \
-		https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${PORTVERSION2}?dummy=/:source2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \
-		${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION2}_GH0${EXTRACT_SUFX}:source2
+MASTER_SITES=	https://www.bro.org/downloads/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	System for detecting network intruders in real-time
@@ -18,16 +16,14 @@ BROKEN_powerpc64=	Does not build: error: zero-size array 'names'
 
 LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
-GH_ACCOUNT=	actor-framework
-GH_PROJECT=	${GH_ACCOUNT}
 
 USES=		bison cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl
+USE_GITHUB=	nodefault
+GH_TUPLE=	actor-framework:actor-framework:0.14.6:actor_framework
 
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD}
 CXXFLAGS+=	-std=c++11 -Wall
 
-PORTVERSION2=	0.14.6
-WRKSRC2=	${WRKDIR}/${GH_PROJECT}-${PORTVERSION2}
 STAGEDIR2=	${STAGEDIR}-caf
 
 SHEBANG_FILES=	aux/broctl/aux/trace-summary/trace-summary
@@ -105,8 +101,6 @@ CMAKE_ARGS2=		-GNinja \
 			-D CAF_NO_OPENCL:BOOL=yes \
 			-D CAF_NO_UNIT_TESTS:BOOL=yes
 
-CMAKE_SOURCE_PATH2=	${WRKSRC2}
-
 CONFIGURE_WRKSRC2=	${WRKDIR}/.build-caf
 BUILD_WRKSRC2=		${CONFIGURE_WRKSRC2}
 INSTALL_WRKSRC2=	${CONFIGURE_WRKSRC2}
@@ -115,7 +109,7 @@ INSTALL_WRKSRC2=	${CONFIGURE_WRKSRC2}
 pre-configure-BROKER-on:
 	${MKDIR} ${CONFIGURE_WRKSRC2}
 	(cd ${CONFIGURE_WRKSRC2} && \
-	    ${CMAKE_BIN} ${CMAKE_ARGS2} ${CMAKE_SOURCE_PATH2})
+	    ${CMAKE_BIN} ${CMAKE_ARGS2} ${WRKSRC_actor_framework})
 	${MKDIR} ${STAGEDIR2}
 	(cd ${BUILD_WRKSRC2} && \
 	    ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} install)

sysutils/cmockery2/Makefile

@@ -4,21 +4,19 @@
 
 PORTNAME=	cmockery2
 PORTVERSION=	1.3.8
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://codeload.github.com/lpabon/cmockery2/tar.gz/
-DISTNAME=	v1.3.8
-EXTRACT_SUFX=
 
 MAINTAINER=	harsha@harshavardhana.net
 COMMENT=	Cmockery2 revival of Cmockery unit test framework from Google
 
 LICENSE=	APACHE20
 
-WRKSRC=		${WRKDIR}/cmockery2-${PORTVERSION}
-
-GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	lpabon
+GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 # Disable gcov on FreeBSD

sysutils/cmockery2/distinfo

@@ -1,2 +1,3 @@
-SHA256 (v1.3.8) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7
-SIZE (v1.3.8) = 54110
+TIMESTAMP = 1518701569
+SHA256 (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7
+SIZE (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 54110