Index: head/www/varnish4/Makefile
===================================================================
--- head/www/varnish4/Makefile	(revision 447522)
+++ head/www/varnish4/Makefile	(revision 447523)
@@ -1,48 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
 PORTVERSION=	4.1.8
 PORTREVISION=	0
 CATEGORIES=	www
-MASTER_SITES=	http://repo.varnish-cache.org/source/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS=	varnish-2.* varnish-3.*
 
 USES=		autoreconf cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:2,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/vmodtool.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
-CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	varnishcache
+GH_PROJECT=	varnish-cache
+GH_TAGNAME=	varnish-${PORTVERSION}
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 regression-test check test: build
 	${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check
 
 .include <bsd.port.mk>
Index: head/www/varnish4/distinfo
===================================================================
--- head/www/varnish4/distinfo	(revision 447522)
+++ head/www/varnish4/distinfo	(revision 447523)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501698248
-SHA256 (varnish-4.1.8.tar.gz) = 908e7fbfa0325498717686b2050181134aa0a69d1495c02b2625cd34d35a4ff1
-SIZE (varnish-4.1.8.tar.gz) = 2254772
+TIMESTAMP = 1502147563
+SHA256 (varnishcache-varnish-cache-4.1.8-varnish-4.1.8_GH0.tar.gz) = 6d5735d1562570517feae551b236d2c321537785ff5e08fe40ce5315c32ef53c
+SIZE (varnishcache-varnish-cache-4.1.8-varnish-4.1.8_GH0.tar.gz) = 946513
Index: head/www/varnish5/Makefile
===================================================================
--- head/www/varnish5/Makefile	(revision 447522)
+++ head/www/varnish5/Makefile	(revision 447523)
@@ -1,47 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
 PORTVERSION=	5.1.3
 PORTREVISION=	0
 CATEGORIES=	www
-MASTER_SITES=	http://repo.varnish-cache.org/source/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS=	varnish-2.* varnish-3.* varnish4-4.*
 
-USES=		cpe gmake libedit libtool ncurses pathfix \
+USES=		autoreconf cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:2,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/vmodtool.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
-CONFIGURE_ENV=	RST2MAN=true
+CONFIGURE_ARGS=	--localstatedir=${PREFIX} --without-dot
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	varnishcache
+GH_PROJECT=	varnish-cache
+GH_TAGNAME=	varnish-${PORTVERSION}
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 regression-test check test: build
 	${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check
 
 .include <bsd.port.mk>
Index: head/www/varnish5/distinfo
===================================================================
--- head/www/varnish5/distinfo	(revision 447522)
+++ head/www/varnish5/distinfo	(revision 447523)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501698276
-SHA256 (varnish-5.1.3.tar.gz) = 7439c93ca581340f3722b8c790160f46dc6c5328188e4c0bc233c42f3f04a54e
-SIZE (varnish-5.1.3.tar.gz) = 2643223
+TIMESTAMP = 1502147852
+SHA256 (varnishcache-varnish-cache-5.1.3-varnish-5.1.3_GH0.tar.gz) = 2c76b5aee9e715b84641a1de1dbcc39563c24496436fa4e5417acd329e80bd22
+SIZE (varnishcache-varnish-cache-5.1.3-varnish-5.1.3_GH0.tar.gz) = 1183690