How was discovered by dns/dnssecwalker port maintainer,

dns/walker is the same ports. And name 'walker' was
recognized as a better name. So we move dns/dnssecwalker
to dns/walker port and remove the first one.

Submitted by:	Johan van Selst <johans(at)stack.nl>

7 files changed, 13 insertions, 51 deletions

diff --git a/MOVED b/MOVED
index 4419704e47a..fc349d3cefd 100644
--- a/MOVED
+++ b/MOVED
@@ -1355,3 +1355,4 @@ x11-toolkits/gtkextra--||2004-12-12|removed obsolete port
 games/gnomoku||2004-12-12|removed obsolete port
 net/gabber||2004-12-12|removed obsolete port
 x11-toolkits/gnome--||2004-12-12|removed obsolete port
+dns/dnssecwalker|dns/walker|2004-12-13|duplicate ports
diff --git a/dns/Makefile b/dns/Makefile
index b7ffea65902..a7254afcffa 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -25,7 +25,6 @@
     SUBDIR += dnsjava
     SUBDIR += dnsmasq
     SUBDIR += dnsproxy
-    SUBDIR += dnssecwalker
     SUBDIR += dnstop
     SUBDIR += dnstracer
     SUBDIR += dnsutl
diff --git a/dns/dnssecwalker/Makefile b/dns/dnssecwalker/Makefile
deleted file mode 100644
index 54d8c1c460a..00000000000
--- a/dns/dnssecwalker/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:	dnssecwalk
-# Date created:			Feb 7, 2002
-# Whom:				ijliao
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dnssecwalker
-PORTVERSION=	3.5
-CATEGORIES=	dns
-MASTER_SITES=	http://josefsson.org/walker/releases/
-DISTNAME=	walker-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	johans@stack.nl
-COMMENT=	DNSSEC Walker
-
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS\
-		${SITE_PERL}/Net/DNS/SEC.pm:${PORTSDIR}/dns/p5-Net-DNS-SEC
-
-USE_PERL5=	yes
-NO_BUILD=	yes
-USE_GPG?=	yes
-SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
-
-CONFLICTS=	walker-1.*
-
-MAN1=		walker.1
-PLIST_FILES=	bin/walker
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/walker ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/walker.1 ${MAN1PREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/dns/dnssecwalker/distinfo b/dns/dnssecwalker/distinfo
deleted file mode 100644
index c68b29ee04d..00000000000
--- a/dns/dnssecwalker/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (walker-3.5.tar.gz) = 2633a11a211e48a43d016c6f2c37d4a3
-SIZE (walker-3.5.tar.gz) = 24869
-MD5 (walker-3.5.tar.gz.sig) = 39fa23e79e200f985c12fc757644decc
-SIZE (walker-3.5.tar.gz.sig) = 184
diff --git a/dns/dnssecwalker/pkg-descr b/dns/dnssecwalker/pkg-descr
deleted file mode 100644
index 22883db03dd..00000000000
--- a/dns/dnssecwalker/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a proof-of-concept of a utility to download DNS zone contents even
-when AXFR is disabled on the server, assuming DNSSEC is used.
-
-WWW: http://josefsson.org/walker/
diff --git a/dns/walker/Makefile b/dns/walker/Makefile
index fd3eb246b8a..7f3ef840b6d 100644
--- a/dns/walker/Makefile
+++ b/dns/walker/Makefile
@@ -7,17 +7,22 @@
 #
 
 PORTNAME=	walker
-PORTVERSION=	3.2
+PORTVERSION=	3.5
 CATEGORIES=	dns
-MASTER_SITES=	http://josefsson.org/walker/
+MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	Recover zone file information from servers that use DNSSEC
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/Net/DNS/SEC.pm:${PORTSDIR}/dns/p5-Net-DNS-SEC
 
+USE_PERL5=	yes
 NO_BUILD=	yes
+USE_GPG?=	yes
+SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
 
 MAN1=		walker.1
 
diff --git a/dns/walker/distinfo b/dns/walker/distinfo
index 2d77569e0a2..c68b29ee04d 100644
--- a/dns/walker/distinfo
+++ b/dns/walker/distinfo
@@ -1,2 +1,4 @@
-MD5 (walker-3.2.tar.gz) = 52a26ddd60324608ba414a7cd607768e
-SIZE (walker-3.2.tar.gz) = 16395
+MD5 (walker-3.5.tar.gz) = 2633a11a211e48a43d016c6f2c37d4a3
+SIZE (walker-3.5.tar.gz) = 24869
+MD5 (walker-3.5.tar.gz.sig) = 39fa23e79e200f985c12fc757644decc
+SIZE (walker-3.5.tar.gz.sig) = 184