Index: head/security/hydra/Makefile
===================================================================
--- head/security/hydra/Makefile	(revision 490166)
+++ head/security/hydra/Makefile	(revision 490167)
@@ -1,61 +1,65 @@
 # Created by: Laurent LEVIER <llevier@argosnet.com>
 # $FreeBSD$
 
 PORTNAME=	hydra
-PORTVERSION=	8.5
+DISTVERSIONPREFIX=v
+DISTVERSION=	8.8
 CATEGORIES=	security
-MASTER_SITES=	https://www.thc.org/releases/ \
-		PACKETSTORM/groups/thc/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Brute force attack utility working on multiple network services
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libpcre.so:devel/pcre \
 		libsasl2.so:security/cyrus-sasl2
 
-PLIST_FILES=	bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \
-		man/man1/hydra.1.gz man/man1/pw-inspector.1.gz
-GNU_CONFIGURE=	yes
 USES=		gmake localbase ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	vanhauser-thc
+GH_PROJECT=	thc-hydra
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLINC} \
 		--with-ssl-lib=${OPENSSLLIB}
+PLIST_FILES=	bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \
+		man/man1/hydra.1.gz man/man1/pw-inspector.1.gz
 
 OPTIONS_DEFINE=	FIREBIRD SSH SVN X11
 OPTIONS_DEFAULT=SSH
 OPTIONS_EXCLUDE=NLS DOCS
 FIREBIRD_USES=	firebird
 SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 SSH_LIB_DEPENDS=	libssh.so.4:security/libssh
-X11_USES=		gettext pkgconfig
+X11_USES=		gettext gnome pkgconfig
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 X11_USE=		gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 X11_PLIST_FILES=	bin/xhydra man/man1/xhydra.1.gz
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mlibressl*}
-IGNORE=	Detected LibreSSL (missing RSA_get0_key and others)
+IGNORE=	detected LibreSSL (missing RSA_get0_key and others)
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|CC=gcc||; s|-O3|${CFLAGS}|;' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.unix
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/dpl4hydra.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/hydra-wizard.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/hydra.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/pw-inspector.1 ${STAGEDIR}${MANPREFIX}/man/man1
 post-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xhydra.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: head/security/hydra/distinfo
===================================================================
--- head/security/hydra/distinfo	(revision 490166)
+++ head/security/hydra/distinfo	(revision 490167)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494705731
-SHA256 (hydra-8.5.tar.gz) = 557ab284f877aa6c8a26f7491c0373a84836593e5e0ca141b327035e7937dd6d
-SIZE (hydra-8.5.tar.gz) = 1214640
+TIMESTAMP = 1547401419
+SHA256 (vanhauser-thc-thc-hydra-v8.8_GH0.tar.gz) = bc895a7aebdf0279186d40140f0dc1546ac6f3a5c5bc9d13b13766bffea3e966
+SIZE (vanhauser-thc-thc-hydra-v8.8_GH0.tar.gz) = 1202992
Index: head/security/hydra/files/patch-hydra.h
===================================================================
--- head/security/hydra/files/patch-hydra.h	(revision 490166)
+++ head/security/hydra/files/patch-hydra.h	(revision 490167)
@@ -1,13 +1,13 @@
---- hydra.h.orig	2016-06-16 14:57:15 UTC
+--- hydra.h.orig	2019-01-02 12:38:23 UTC
 +++ hydra.h
-@@ -31,10 +31,6 @@
+@@ -38,10 +38,6 @@
+   #endif
  #endif
- #endif
  
 -#ifdef LIBSSH
--#include <libssh/libssh.h>
+-  #include <libssh/libssh.h>
 -#endif
 -
  #ifdef HAVE_ZLIB
- #include <zlib.h>
+   #include <zlib.h>
  #endif