Index: head/net/pygopherd/Makefile
===================================================================
--- head/net/pygopherd/Makefile	(revision 452535)
+++ head/net/pygopherd/Makefile	(revision 452536)
@@ -1,37 +1,36 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	pygopherd
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.18.4
 CATEGORIES=	net python
-MASTER_SITES=	http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/ \
-		http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/old/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTVERSIONPREFIX=	debian/
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Multiprotocol Information Server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		python
 USE_PYTHON=	distutils
-WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jgoerzen
 
 NO_ARCH=	yes
 
 post-patch:
 .for f in setup.py bin/pygopherd conf/pygopherd.conf doc/pygopherd.8
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} -e "s|/usr/bin/python2.2|${PYTHON_CMD}|g" \
 		${WRKSRC}/bin/pygopherd
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} \
 		-e "s|/usr/bin/python2.2|${PYTHON_CMD}|g"
 	@${MV} ${WRKSRC}/conf/pygopherd.conf ${WRKSRC}/conf/pygopherd.conf.sample
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/net/pygopherd/distinfo
===================================================================
--- head/net/pygopherd/distinfo	(revision 452535)
+++ head/net/pygopherd/distinfo	(revision 452536)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476825666
-SHA256 (pygopherd_2.0.16.tar.gz) = d96ba235a4207aee94b1436ac084448d69ec7042e477a0649da8148bb044c729
-SIZE (pygopherd_2.0.16.tar.gz) = 255475
+TIMESTAMP = 1506043804
+SHA256 (jgoerzen-pygopherd-debian-2.0.18.4_GH0.tar.gz) = 32b330d72afa3d4b44b2257af0235fc22f9ffbd302daf2f7054e25b3be8f2126
+SIZE (jgoerzen-pygopherd-debian-2.0.18.4_GH0.tar.gz) = 276798
Index: head/net/pygopherd/pkg-plist
===================================================================
--- head/net/pygopherd/pkg-plist	(revision 452535)
+++ head/net/pygopherd/pkg-plist	(revision 452536)
@@ -1,137 +1,137 @@
 bin/pygopherd
 etc/pygopherd/mime.types
 @sample etc/pygopherd/pygopherd.conf.sample
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.py
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptions.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptionsTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptionsTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/GopherExceptionsTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/__init__.py
 %%PYTHON_SITELIBDIR%%/pygopherd/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/fileext.py
 %%PYTHON_SITELIBDIR%%/pygopherd/fileext.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/fileext.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/fileextTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/fileextTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/fileextTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentry.py
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentry.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentry.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentryTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentryTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/gopherentryTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/HandlerMultiplexer.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/HandlerMultiplexer.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/HandlerMultiplexer.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/UMN.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/UMN.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/UMN.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/__init__.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/base.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/base.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/base.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/dir.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/dir.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/dir.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/file.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/file.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/file.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/gophermap.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/gophermap.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/gophermap.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/html.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/html.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/html.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/mbox.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/mbox.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/mbox.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/pyg.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/pyg.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/pyg.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/scriptexec.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/scriptexec.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/scriptexec.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/url.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/url.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/url.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/virtual.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/ZIP.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.py
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/initialization.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/initializationTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/initializationTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/initializationTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/logger.py
 %%PYTHON_SITELIBDIR%%/pygopherd/logger.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/logger.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/loggerTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/loggerTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/loggerTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/pipe.py
 %%PYTHON_SITELIBDIR%%/pygopherd/pipe.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/pipe.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/pipeTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/pipeTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/pipeTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexer.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexer.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexer.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexerTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexerTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/ProtocolMultiplexerTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/__init__.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/base.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/base.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/base.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/baseTest.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/baseTest.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/baseTest.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/enhanced.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/enhanced.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/enhanced.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/gopherp.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/gopherp.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/gopherp.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/http.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/http.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/http.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/rfc1436Test.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.py
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/protocols/wap.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.py
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/sighandlers.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.py
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/handlers/tal.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.py
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/testutil.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/version.py
 %%PYTHON_SITELIBDIR%%/pygopherd/version.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/version.pyo
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.py
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyc
 %%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyo
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/pygopherd-2.0.15-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pygopherd-2.0.18-py%%PYTHON_VER%%.egg-info/top_level.txt
 man/man8/pygopherd.8.gz