* Update to 1.2.2

PR:		54474
Submitted by:	Nick Hilliard <nick@foobar.org>

* Reset MAINTAINER address that does not point to the FreeBSD port
  maintainer.

7 files changed, 18 insertions, 59 deletions

diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile
index 16db84d26fa7..67f74a5f628b 100644
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@@ -6,14 +6,22 @@
 #
 
 PORTNAME=	nsd
-PORTVERSION=	1.0.2
-PORTREVISION=	1
-CATEGORIES=	net
+PORTVERSION=	1.2.2
+CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
 
-MAINTAINER=	nsd-info@nlnetlabs.nl
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An authoratative only non-recursive high performance name server
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-user=bind \
+		--enable-ipv6 \
+		--with-configdir=${PREFIX}/etc/nsd \
+		--with-pidfile=/var/run/nsd.pid \
+		--with-dbfile=/var/db/nsd.database \
+		--with-namedxfer=/usr/libexec/named-xfer \
+		--with-libwrap
+
 MAN8=	nsd.8 zonec.8 nsdc.8
 
 post-install:
diff --git a/dns/nsd/distinfo b/dns/nsd/distinfo
index bbc21a3fbe62..333c59471836 100644
--- a/dns/nsd/distinfo
+++ b/dns/nsd/distinfo
@@ -1 +1 @@
-MD5 (nsd-1.0.2.tar.gz) = 8c50f242ed4d71986fe8959f5db3be5d
+MD5 (nsd-1.2.2.tar.gz) = 7d1449dcec224176ba7265015821ddbc
diff --git a/dns/nsd/files/patch-Makefile b/dns/nsd/files/patch-Makefile
deleted file mode 100644
index 28b6f2d4b74c..000000000000
--- a/dns/nsd/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Wed Feb 12 14:17:18 2003
-+++ Makefile	Wed Feb 12 14:17:35 2003
-@@ -67,7 +67,7 @@
- #
- 
- # The directory where the nsd nsdc and zonec binaries will be installed
--PREFIX		= /usr/local
-+#PREFIX		= /usr/local
- NSDBINDIR	= ${PREFIX}/sbin
- NSDMANDIR	= ${PREFIX}/man/man8
- 
diff --git a/dns/nsd/files/patch-aa b/dns/nsd/files/patch-aa
deleted file mode 100644
index b987f2a1529b..000000000000
--- a/dns/nsd/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- nsd.c	17 Dec 2002 14:42:06 -0000	1.56.2.10
-+++ nsd.c	12 Feb 2003 09:19:50 -0000
-@@ -159,6 +159,7 @@
- 	signal(SIGINT, &sig_handler);
- 	signal(SIGILL, &sig_handler);
- 	signal(SIGALRM, &sig_handler);
-+	signal(SIGPIPE, SIG_IGN);
- 
- 
- 	/* Are we a tcp child? */
-@@ -566,6 +567,8 @@
- 	signal(SIGINT, &sig_handler);
- 	signal(SIGILL, &sig_handler);
- 	signal(SIGALRM, &sig_handler);
-+	signal(SIGPIPE, SIG_IGN);
-+
- 
- 	/* Get our process id */
- 	nsd.pid[0] = getpid();
diff --git a/dns/nsd/files/patch-ab b/dns/nsd/files/patch-ab
deleted file mode 100644
index 12b595e4fc97..000000000000
--- a/dns/nsd/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r1.83 query.c
---- query.c	14 Oct 2002 13:12:16 -0000	1.83
-+++ query.c	18 Feb 2003 10:46:11 -0000
-@@ -145,11 +145,13 @@
- 
- 	/* Truncate */
- 	if(d && DOMAIN_FLAGS(d) & NAMEDB_DELEGATION) {
--		ANCOUNT(q) = NSCOUNT(q);
-+		ANCOUNT(q) = htons(ntohs(NSCOUNT(q)) + ntohs(ARCOUNT(q)));
-+	} else {
-+		q->iobufptr = qptr + ANSWER_RRS(a, ntohs(ANCOUNT(q)));
- 	}
--	NSCOUNT(q) = 0;
-+
- 	ARCOUNT(q) = 0;
--	q->iobufptr = qptr + ANSWER_RRS(a, ntohs(ANCOUNT(q)));
-+	NSCOUNT(q) = 0;
- 
- 	/* More data... */
- 	return 1;
diff --git a/dns/nsd/pkg-descr b/dns/nsd/pkg-descr
index 84747b726d3a..cf4aa60ed877 100644
--- a/dns/nsd/pkg-descr
+++ b/dns/nsd/pkg-descr
@@ -1,10 +1,9 @@
-This is NSD Name Server Daemon (NSD) version 1.0.1 beta
-
-NSD is a complete implementation of an authoritative DNS nameserver.
+NSD (Name Server Daemon) is a complete implementation of an
+authoritative DNS nameserver.
 
 For more information:
 
-WWW:	 http://www.nlnetlabs.nl/nsd
+WWW:	http://www.nlnetlabs.nl/nsd
 
 The source code is available from:
 
diff --git a/dns/nsd/pkg-plist b/dns/nsd/pkg-plist
index 781893ea8ff1..a9d74106d380 100644
--- a/dns/nsd/pkg-plist
+++ b/dns/nsd/pkg-plist
@@ -1,6 +1,8 @@
+@comment $FreeBSD$
 sbin/nsd
 sbin/nsdc
 sbin/zonec
 sbin/nsd-notify
 etc/nsd/nsd.zones.sample
+etc/nsd/nsdc.conf.sample
 @dirrm etc/nsd