Index: head/devel/catch/Makefile
===================================================================
--- head/devel/catch/Makefile	(revision 467031)
+++ head/devel/catch/Makefile	(revision 467032)
@@ -1,25 +1,26 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	catch
+DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.2
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/catchorg/Catch2/archive/
-DISTNAME=	v${DISTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Header-only test framework for C++
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		compiler:c++14-lang cmake pathfix
-WRKSRC=		${WRKDIR}/Catch2-${DISTVERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	catchorg
+GH_PROJECT=	Catch2
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
 PORTDOCS=	*
 
 do-test:
 	${WRKSRC}/SelfTest
 
 .include <bsd.port.mk>
Index: head/devel/catch/distinfo
===================================================================
--- head/devel/catch/distinfo	(revision 467031)
+++ head/devel/catch/distinfo	(revision 467032)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523346341
-SHA256 (v2.2.2.tar.gz) = e93aacf012579093fe6b4e686ff0488975cabee1e6b4e4f27a0acd898e8f09fd
-SIZE (v2.2.2.tar.gz) = 497244
+TIMESTAMP = 1523392340
+SHA256 (catchorg-Catch2-v2.2.2_GH0.tar.gz) = e93aacf012579093fe6b4e686ff0488975cabee1e6b4e4f27a0acd898e8f09fd
+SIZE (catchorg-Catch2-v2.2.2_GH0.tar.gz) = 497244
Index: head/math/py-pynleq2/Makefile
===================================================================
--- head/math/py-pynleq2/Makefile	(revision 467031)
+++ head/math/py-pynleq2/Makefile	(revision 467032)
@@ -1,37 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	pynleq2
 DISTVERSION=	0.0.2
 CATEGORIES=	math python
-MASTER_SITES=	CHEESESHOP \
-		https://github.com/PySCeS/pysces/archive/:fortran
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PYSCES_VERSION}${EXTRACT_SUFX}:fortran
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for NLEQ2 algorithm's fortran implementation
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 
 USES=		fortran:flang python
 USE_PYTHON=	distutils autoplist
+USE_GITHUB=	nodefault
+GH_TUPLE=	PySCeS:pysces:0.9.5:fortran
 
 BINARY_ALIAS=	gfortran6=flang # it keeps using gfortran6 regardless of the environment variables and arguments
 
-PYSCES_VERSION=	0.9.5
 FORTRAN_FILES=	linalg_nleq2.f nleq2.f wnorm.f zibconst.f zibmon.f zibsec.f
 
 pre-build: # compile fortran files into a static library because distutils fails while doing this
 	@${MKDIR} ${WRKDIR}/.fbuild && \
 		cd ${WRKDIR}/.fbuild && \
-		flang -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C/^/${WRKDIR}\/pysces-${PYSCES_VERSION}\/pysces\/nleq2\//} && \
+		flang -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \
 		${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nleq2.so
 
 .include <bsd.port.mk>
Index: head/math/py-pynleq2/distinfo
===================================================================
--- head/math/py-pynleq2/distinfo	(revision 467031)
+++ head/math/py-pynleq2/distinfo	(revision 467032)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1522600966
+TIMESTAMP = 1523392896
 SHA256 (pynleq2-0.0.2.tar.gz) = b9be75bb7def34cd7a82aed87b70f6c3c9f4602cbe9e8d4fcf43a4aae241112d
 SIZE (pynleq2-0.0.2.tar.gz) = 6219
-SHA256 (0.9.5.tar.gz) = 14131578b36154593ee5e793b3886572746209dcc3d9ed5ef3787a3476876cf6
-SIZE (0.9.5.tar.gz) = 2119094
+SHA256 (PySCeS-pysces-0.9.5_GH0.tar.gz) = 14131578b36154593ee5e793b3886572746209dcc3d9ed5ef3787a3476876cf6
+SIZE (PySCeS-pysces-0.9.5_GH0.tar.gz) = 2119094