5 files changed, 19 insertions, 30 deletions

diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index a0513a10664d..ccec3136b4c8 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -1,16 +1,9 @@
-# New ports collection makefile for:	sshfp
-# Date created:				5 Oct 2006
-# Whom:					Emanuel Haupt <ehaupt@FreeBSD.org>
-#
+# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sshfp
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	dns security
-MASTER_SITES=	ftp://ftp.xelerance.com/sshfp/ \
-		CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Generate SSHFP DNS records from knownhosts files or ssh-keyscan
@@ -18,19 +11,25 @@ COMMENT=	Generate SSHFP DNS records from knownhosts files or ssh-keyscan
 LICENSE=	GPLv2
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:${PORTSDIR}/devel/py-argparse
-LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns
+		${PYTHON_PKGNAMEPREFIX}argparse>=0.8.0:${PORTSDIR}/devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:${PORTSDIR}/net-mgmt/py-ipcalc \
+		${PYTHON_SITELIBDIR}/ldns.py:${PORTSDIR}/dns/py-ldns
 
 NO_BUILD=	yes
 USE_PYTHON=	2.5+
+USE_GITHUB=	yes
+GH_ACCOUNT=	xelerance
+GH_TAGNAME=	${PORTVERSION}
+GH_COMMIT=	3378f7d
 
 MAN1=		sshfp.1 dane.1
-PLIST_FILES=	bin/sshfp bin/dane
 
 PY_FILES=	sshfp dane
 
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_COMMIT}
+
 post-patch:
-.for f in ${PY_FILES}
+.for f in ${PY_FILES} daneldnsx.py
 	@${REINPLACE_CMD} -e '1s|.*|#!${PYTHON_CMD}|' ${WRKSRC}/${f}
 .endfor
 
@@ -39,5 +38,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${MANPREFIX}/man/man1
 .endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/daneldnsx.py ${PYTHON_SITELIBDIR}/
 
 .include <bsd.port.mk>
diff --git a/dns/sshfp/distinfo b/dns/sshfp/distinfo
index a6c4c0ee0542..94c151c3c46b 100644
--- a/dns/sshfp/distinfo
+++ b/dns/sshfp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sshfp-1.2.1.tar.gz) = ebb7f3ac11f62bdaf43afd1b7c0adea7f10d15b32b854dec4b571facf57d4455
-SIZE (sshfp-1.2.1.tar.gz) = 28278
+SHA256 (sshfp-1.2.2.tar.gz) = ac904e785d762406f21e939b7901c6a251133426207179db561bf1d4542005e4
+SIZE (sshfp-1.2.2.tar.gz) = 34709
diff --git a/dns/sshfp/files/patch-dane b/dns/sshfp/files/patch-dane
deleted file mode 100644
index 8525b43bfd2c..000000000000
--- a/dns/sshfp/files/patch-dane
+++ /dev/null
@@ -1,14 +0,0 @@
---- dane.orig	2011-04-15 15:47:31.000000000 +0200
-+++ dane	2011-04-15 15:49:44.000000000 +0200
-@@ -27,9 +27,8 @@
- try:
- 	import ldns
- except ImportError:
--	print "dane requires the ldns-python sub-package from http://www.nlnetlabs.nl/projects/ldns/"
--	print "Fedora/CentOS: yum install ldns-python"
--	print "Debian/Ubuntu: apt-get install python-ldns"
-+	print "dane requires the ldns python bindings. Please reinstall dns/ldns with the"
-+	print "python binding option enabled."
- 	sys.exit()
- 
- 
diff --git a/dns/sshfp/pkg-descr b/dns/sshfp/pkg-descr
index 8e2aeae8f514..6c8176dd6bc9 100644
--- a/dns/sshfp/pkg-descr
+++ b/dns/sshfp/pkg-descr
@@ -3,4 +3,4 @@ keys from a knownhosts file or from scanning the host's sshd daemon. The ssh
 client can use these SSHFP records if you set "VerifyHostKeyDNS yes" in the file
 /etc/ssh/ssh_config.
 
-WWW: http://freecode.com/projects/sshfp/
+WWW: https://github.com/xelerance/sshfp
diff --git a/dns/sshfp/pkg-plist b/dns/sshfp/pkg-plist
new file mode 100644
index 000000000000..d593ca1f8ef7
--- /dev/null
+++ b/dns/sshfp/pkg-plist
@@ -0,0 +1,3 @@
+bin/dane
+bin/sshfp
+%%PYTHON_SITELIBDIR%%/daneldnsx.py