update to 2.2.0.

- nsd-xfer is now in package
- bug fixes
- pidfile can be specified by -P

4 files changed, 31 insertions, 10 deletions

diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 8ea7fc4a8f2..54f8db156c9 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2004/12/29 15:42:38 minskim Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/19 02:11:24 itojun Exp $
 
-DISTNAME=	nsd-2.1.2
-PKGREVISION=	1
+DISTNAME=	nsd-2.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
 
diff --git a/net/nsd/PLIST b/net/nsd/PLIST
index 2e28a88d9db..b8ca88970f7 100644
--- a/net/nsd/PLIST
+++ b/net/nsd/PLIST
@@ -1,21 +1,26 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/16 21:55:14 itojun Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/01/19 02:11:24 itojun Exp $
 sbin/nsd
-sbin/nsd-notify
-sbin/nsdc
 sbin/zonec
+sbin/nsdc
+sbin/nsd-notify
+sbin/nsd-xfer
 man/man8/nsd.8
-man/man8/nsd-notify.8
 man/man8/nsdc.8
 man/man8/zonec.8
+man/man8/nsd-notify.8
+man/man8/nsd-xfer.8
 share/nsd/DIFFERENCES
 share/nsd/LICENSE
 share/nsd/NSD-DATABASE
 share/nsd/README
 share/nsd/RELNOTES
 share/nsd/TODO
+share/examples/nsd/nsdc.conf.sample
+share/examples/nsd/nsd.zones.sample
 share/nsd/contrib/README
 share/nsd/contrib/build-nsdzones.pl
 share/nsd/contrib/build-nsdzones.pl.README
 share/nsd/contrib/example-plugin.c
+@dirrm share/examples/nsd
 @dirrm share/nsd/contrib
 @dirrm share/nsd
diff --git a/net/nsd/distinfo b/net/nsd/distinfo
index 3eb3e6cc1f3..d00701de371 100644
--- a/net/nsd/distinfo
+++ b/net/nsd/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.15 2004/07/31 17:15:15 itojun Exp $
+$NetBSD: distinfo,v 1.16 2005/01/19 02:11:24 itojun Exp $
 
-SHA1 (nsd-2.1.2.tar.gz) = dfae3780dc4be68236e77e716ffc8bca9f81130b
-Size (nsd-2.1.2.tar.gz) = 218704 bytes
+SHA1 (nsd-2.2.0.tar.gz) = 4a9e1d6c822ccda8c49884ee97246120fb30926a
+Size (nsd-2.2.0.tar.gz) = 230431 bytes
+SHA1 (patch-aa) = d39630dd21c53bddfedff5fe8525dd93227e2f40
diff --git a/net/nsd/patches/patch-aa b/net/nsd/patches/patch-aa
new file mode 100644
index 00000000000..c72fb2902a5
--- /dev/null
+++ b/net/nsd/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.8 2005/01/19 02:11:24 itojun Exp $
+
+--- Makefile.in-	2005-01-19 11:05:06.000000000 +0900
++++ Makefile.in	2005-01-19 11:06:59.000000000 +0900
+@@ -148,8 +148,9 @@
+ 	$(INSTALL_DATA) zonec.8 $(mandir)/man8
+ 	$(INSTALL_DATA) nsd-notify.8 $(mandir)/man8/nsd-notify.8
+ 	$(INSTALL_DATA) nsd-xfer.8 $(mandir)/man8/nsd-xfer.8
+-	$(INSTALL_DATA) nsdc.conf.sample $(configfile).sample
+-	$(INSTALL_DATA) nsd.zones.sample $(zonesfile).sample
++	mkdir -p $(prefix)/share/examples/nsd
++	$(INSTALL_DATA) nsdc.conf.sample $(prefix)/share/examples/nsd
++	$(INSTALL_DATA) nsd.zones.sample $(prefix)/share/examples/nsd
+ 
+ uninstall:
+ 	@echo