A few changes:

 * Change to tar.gz file fetch
 * Use perl5 automatic PLIST
 * Add a patch so this works with Net::DNS 0.69
 * Modify dependence on Net::DNS to be >= 0.42 in accordance with distribution
 * Bump PKGREVISION
Thanks to wiz@ for help when I got stuck (auto-plist, include order etc.)

4 files changed, 97 insertions, 18 deletions

diff --git a/net/fpdns/Makefile b/net/fpdns/Makefile
index 1ffa9170d55..8a48cc41689 100644
--- a/net/fpdns/Makefile
+++ b/net/fpdns/Makefile
@@ -1,25 +1,28 @@
-# $NetBSD: Makefile,v 1.7 2013/06/23 12:18:34 pettai Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/31 10:23:17 he Exp $
 #
 
-DISTNAME=	fpdns-20130404
-PKGNAME=	fpdns-0.10.0pre20130404
+VERSION=	20130404
+DISTNAME=	20130404
+PKGREVISION=	1
+PKGNAME=	fpdns-0.10.0pre${VERSION}
 CATEGORIES=	net
-MASTER_SITES=	-https://github.com/kirei/fpdns/archive/20130404.zip
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	https://github.com/kirei/fpdns/archive/
+FETCH_USING=	curl
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/kirei/fpdns/
 COMMENT=	Fingerprinting DNS servers
 LICENSE=	modified-bsd
 
-DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-
-FETCH_USING=	curl
+DEPENDS+=	p5-Net-DNS>=0.42:../../net/p5-Net-DNS
 
+WRKSRC=		${WRKDIR}/fpdns-${VERSION}
 REPLACE_PERL=	apps/fpdns
 USE_TOOLS+=	perl
 USE_LANGUAGES=	# none
 
 PERL5_CONFIGURE=	yes
+PERL5_PACKLIST=		auto/Net/DNS/Fingerprint/.packlist
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/fpdns/PLIST b/net/fpdns/PLIST
index 4045297639f..b84ceef1ded 100644
--- a/net/fpdns/PLIST
+++ b/net/fpdns/PLIST
@@ -1,6 +1 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/22 22:35:13 pettai Exp $
-${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/Fingerprint.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Net/DNS/REPLACE
-${PERL5_SUB_INSTALLVENDORARCH}/auto/Net/DNS/Fingerprint/.packlist
-${PERL5_SUB_INSTALLVENDORBIN}/fpdns
-${PERL5_SUB_INSTALLVENDORMAN1DIR}/fpdns.1
+@comment $NetBSD: PLIST,v 1.3 2013/07/31 10:23:17 he Exp $
diff --git a/net/fpdns/distinfo b/net/fpdns/distinfo
index 7d3c4dbdc32..37f0a6f66b3 100644
--- a/net/fpdns/distinfo
+++ b/net/fpdns/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/06/22 22:35:13 pettai Exp $
+$NetBSD: distinfo,v 1.3 2013/07/31 10:23:17 he Exp $
 
-SHA1 (fpdns-20130404.zip) = 782d2cc9dc34bda3e6b1201875a4718a497536ec
-RMD160 (fpdns-20130404.zip) = 69bb402a330ce4f86339b9674dcb957220a63619
-Size (fpdns-20130404.zip) = 973665 bytes
+SHA1 (20130404.tar.gz) = 3c3b33df1861a1a9901601d6c2252b2427ba8763
+RMD160 (20130404.tar.gz) = a2e8113c53533c813d81b01223f8b2e5b2407d12
+Size (20130404.tar.gz) = 931723 bytes
+SHA1 (patch-lib_Net_DNS_Fingerprint.pm) = aa48ba2e8e0752762448d4fc71bd378d308ac364
diff --git a/net/fpdns/patches/patch-lib_Net_DNS_Fingerprint.pm b/net/fpdns/patches/patch-lib_Net_DNS_Fingerprint.pm
new file mode 100644
index 00000000000..2ab49325a9d
--- /dev/null
+++ b/net/fpdns/patches/patch-lib_Net_DNS_Fingerprint.pm
@@ -0,0 +1,80 @@
+$NetBSD: patch-lib_Net_DNS_Fingerprint.pm,v 1.1 2013/07/31 10:23:17 he Exp $
+
+Change NS_NOTIFY_OP to just NOTIFY, to allow this to work
+with p5-Net-DNS 0.69.
+
+--- lib/Net/DNS/Fingerprint.pm.orig	2012-10-19 08:54:24.000000000 +0000
++++ lib/Net/DNS/Fingerprint.pm
+@@ -52,7 +52,7 @@ my $ignore_recurse = 0;
+ my @qy = (
+     "0,QUERY,0,0,0,0,0,0,NOERROR,0,0,0,0",          #qy0
+     "0,QUERY,0,0,0,1,0,1,NOERROR,0,0,0,0",          #qy1
+-    "0,NS_NOTIFY_OP,0,1,1,0,1,1,NOTIMP,0,0,0,0",    #qy2
++    "0,NOTIFY,0,1,1,0,1,1,NOTIMP,0,0,0,0",    #qy2
+     "0,IQUERY,0,0,0,1,1,1,NOERROR,0,0,0,0",         #qy3
+     "0,QUERY,0,0,1,0,0,0,NOERROR,0,0,0,0",          #qy4
+     "0,QUERY,0,0,1,0,0,0,NOERROR,0,0,0,0",          #qy5
+@@ -85,15 +85,15 @@ my @iq = (
+     "1,QUERY,0,0,0,0,0,0,NXDOMAIN,1,0,0,0",           #iq1
+     "1,QUERY,0,0,0,0,0,0,NOERROR,1,0,0,0",            #iq2
+     "1,QUERY,0,0,0,1,0,0,NOERROR,.+,.+,.+,.+",        #iq3
+-    "1,NS_NOTIFY_OP,0,0,1,1,0,1,FORMERR,1,0,0,0",     #iq4
+-    "1,NS_NOTIFY_OP,0,0,1,1,0,0,FORMERR,1,0,0,0",     #iq5
+-    "1,NS_NOTIFY_OP,0,0,1,1,0,0,REFUSED,1,0,0,0",     #iq6
+-    "0,NS_NOTIFY_OP,0,1,1,0,1,1,NOTIMP,1,0,0,0",      #iq7
++    "1,NOTIFY,0,0,1,1,0,1,FORMERR,1,0,0,0",     #iq4
++    "1,NOTIFY,0,0,1,1,0,0,FORMERR,1,0,0,0",     #iq5
++    "1,NOTIFY,0,0,1,1,0,0,REFUSED,1,0,0,0",     #iq6
++    "0,NOTIFY,0,1,1,0,1,1,NOTIMP,1,0,0,0",      #iq7
+     "1,IQUERY,0,0,0,1,0,0,NOTIMP,1,0,0,0",            #iq8
+     "0,IQUERY,0,0,0,1,1,1,NOERROR,1,0,0,0",           #iq9
+     "1,QUERY,0,0,1,0,0,0,NOTIMP,1,0,0,0",             #iq10
+     "0,QUERY,0,0,1,0,0,0,NOERROR,1,0,0,0",            #iq11
+-    "1,NS_NOTIFY_OP,0,0,1,1,0,0,SERVFAIL,1,0,0,0",    #iq12
++    "1,NOTIFY,0,0,1,1,0,0,SERVFAIL,1,0,0,0",    #iq12
+     "1,IQUERY,0,0,1,1,0,0,SERVFAIL,1,0,0,0",          #iq13
+     "1,IQUERY,0,0,1,1,0,0,NOTIMP,0,0,0,0",            #iq14
+     "1,QUERY,0,0,0,1,0,0,NOTIMP,.+,.+,.+,.+",         #iq15
+@@ -406,7 +406,7 @@ my @ruleset = (
+ 
+ my @qy_old = (
+     "0,IQUERY,0,0,1,0,0,0,NOERROR,0,0,0,0",
+-    "0,NS_NOTIFY_OP,0,0,0,0,0,0,NOERROR,0,0,0,0",
++    "0,NOTIFY,0,0,0,0,0,0,NOERROR,0,0,0,0",
+     "0,QUERY,0,0,0,0,0,0,NOERROR,0,0,0,0",
+     "0,IQUERY,0,0,0,0,1,1,NOERROR,0,0,0,0",
+     "0,QUERY,0,0,0,0,0,0,NOTIMP,0,0,0,0",
+@@ -430,20 +430,20 @@ my @iq_old = (
+     "1,QUERY,1,0,1,0,0,0,NOTIMP,1,0,0,0",
+     "1,QUERY,0,0,0,0,0,0,NOTIMP,0,0,0,0",
+     "1,IQUERY,0,0,1,1,0,0,FORMERR,1,0,0,0",    # iq_old10
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,FORMERR,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,NOTIMP,0,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,NOTIMP,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,NXDOMAIN,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,REFUSED,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,0,0,0,SERVFAIL,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,1,0,0,FORMERR,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,1,0,0,NOTIMP,0,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,1,0,0,NOTIMP,1,0,0,0",
+-    "1,NS_NOTIFY_OP,0,0,0,1,0,0,REFUSED,1,0,0,0",    # iq_old20
+-    "1,NS_NOTIFY_OP,0,0,0,1,0,0,SERVFAIL,1,0,0,0",
+-    "1,NS_NOTIFY_OP,1,0,0,0,0,0,NOTIMP,1,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,FORMERR,1,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,NOTIMP,0,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,NOTIMP,1,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,NXDOMAIN,1,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,REFUSED,1,0,0,0",
++    "1,NOTIFY,0,0,0,0,0,0,SERVFAIL,1,0,0,0",
++    "1,NOTIFY,0,0,0,1,0,0,FORMERR,1,0,0,0",
++    "1,NOTIFY,0,0,0,1,0,0,NOTIMP,0,0,0,0",
++    "1,NOTIFY,0,0,0,1,0,0,NOTIMP,1,0,0,0",
++    "1,NOTIFY,0,0,0,1,0,0,REFUSED,1,0,0,0",    # iq_old20
++    "1,NOTIFY,0,0,0,1,0,0,SERVFAIL,1,0,0,0",
++    "1,NOTIFY,1,0,0,0,0,0,NOTIMP,1,0,0,0",
+     "1,QUERY,1,0,0,0,0,0,NOTIMP,1,0,0,0",
+-    "1,NS_NOTIFY_OP,1,0,0,0,0,0,SERVFAIL,1,0,0,0",
++    "1,NOTIFY,1,0,0,0,0,0,SERVFAIL,1,0,0,0",
+     "1,IQUERY,0,0,0,0,1,1,NOTIMP,0,0,0,0",
+     "1,IQUERY,0,0,0,0,0,0,NOTIMP,0,0,0,0",
+     "1,IQUERY,0,0,1,1,1,1,FORMERR,0,0,0,0",