Index: head/net-p2p/deluge-cli/Makefile
===================================================================
--- head/net-p2p/deluge-cli/Makefile	(revision 449855)
+++ head/net-p2p/deluge-cli/Makefile	(revision 449856)
@@ -1,70 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	deluge
 PORTVERSION=	1.3.15
-PORTREVISION=	1
-PKGNAMESUFFIX=	-cli
+PORTREVISION=	2
 CATEGORIES=	net-p2p python
-MASTER_SITES=	http://download.deluge-torrent.org/source/
+PKGNAMESUFFIX=	-cli
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	CLI part of bittorrent client using Python and libtorrent-rasterbar
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	intltool-merge:textproc/intltool
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \
 		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
 
-USE_RC_SUBR=	deluged deluge_web
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+USES=		gettext python:-2.7
+USE_PYTHON=	autoplist distutils
+USE_GITHUB=	yes
+GH_ACCOUNT=	deluge-torrent
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
 
 NO_ARCH=	yes
-USES=		gettext python:-2.7 tar:xz
-USE_PYTHON=	autoplist distutils
+
+USE_RC_SUBR=	deluged deluge_web
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	ChangeLog README
 
 post-patch:
 	@${REINPLACE_CMD} -e '/"new_release_check":/s|True,|False,|g ; \
 		/"geoip_db_location":/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g' \
 			${WRKSRC}/deluge/core/preferencesmanager.py
 	@${REINPLACE_CMD} -e '/"check_new_releases":/s|True,|False,|g ; \
 		/"show_new_releases":/s|True,|False,|g' \
 			${WRKSRC}/deluge/ui/gtkui/gtkui.py
 
 post-install:
 # do these by hand, else they wind up in the wrong place
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ; \
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/scalable/apps/deluge.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 .for size in 16 22 24 32 36 48 64 72 96 128 192 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ; \
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps
 .endfor
 .for pic in png xpm
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/pixmaps/deluge.${pic} \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 .endfor
 
 # install man pages
 .for man in deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1
 	${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${STAGEDIR}${MANPREFIX}/man/man1/
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/deluge/data/share/applications/deluge.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net-p2p/deluge-cli/distinfo
===================================================================
--- head/net-p2p/deluge-cli/distinfo	(revision 449855)
+++ head/net-p2p/deluge-cli/distinfo	(revision 449856)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494603858
-SHA256 (deluge-1.3.15.tar.xz) = a96405140e3cbc569e6e056165e289a5e9ec66e036c327f3912c73d049ccf92c
-SIZE (deluge-1.3.15.tar.xz) = 1467368
+TIMESTAMP = 1504107560
+SHA256 (deluge-torrent-deluge-1.3.15-deluge-1.3.15_GH0.tar.gz) = 6f2accf55bd97828f81ea13d5f29087103eb4f95b6be957323e23174cdc86826
+SIZE (deluge-torrent-deluge-1.3.15-deluge-1.3.15_GH0.tar.gz) = 3036240
Index: head/net-p2p/deluge-cli/pkg-descr
===================================================================
--- head/net-p2p/deluge-cli/pkg-descr	(revision 449855)
+++ head/net-p2p/deluge-cli/pkg-descr	(revision 449856)
@@ -1,8 +1,8 @@
 Deluge is a Bittorrent client written in Python and GTK+. Deluge is intended
 to bring a native, full-featured client to Linux, BSD, and other *nix GTK
 desktop environments such as Gnome and Xfce.
 
 Deluge uses Rasterbar's version of libtorrent as the main ingredient in its
 bittorrent protocol backend.
 
-WWW: http://deluge-torrent.org/
+WWW: http://deluge-torrent.org