Add a RC script for NSD. Set default database location to

${VARBASE}/db/nsd.db on all platforms and use user/group nsd for the
daemon to run as. Install sample configuration without .sample
extension. Take maintainership. Bump revision.

6 files changed, 54 insertions, 13 deletions

diff --git a/net/nsd/MESSAGE b/net/nsd/MESSAGE
new file mode 100644
index 00000000000..764792d2eea
--- /dev/null
+++ b/net/nsd/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2005/11/05 21:27:53 joerg Exp $
+
+The default location of the NSD database has moved to
+${VARBASE}/db/nsd.db. This location can be overriden by -f for nsd
+and in ${SYSCONFDIR}/nsd/nsdc.conf for nsdc.
+===========================================================================
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 534da962468..d234c0e9538 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2005/04/28 15:30:17 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2005/11/05 21:27:53 joerg Exp $
 
 DISTNAME=	nsd-2.2.0
 CATEGORIES=	net
+PKGREVISION=	1
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.nlnetlabs.nl/nsd/index.html
 COMMENT=	Authoritative-only DNS server
 
@@ -21,10 +22,21 @@ CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 .if !defined(USE_INET6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
-.if ${OPSYS} == "NetBSD"
+
 CONFIGURE_ARGS+=--with-pidfile=${VARBASE}/run/nsd.pid
-CONFIGURE_ARGS+=--with-user=named
-.endif
+CONFIGURE_ARGS+=--with-user=nsd
+CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/db/nsd.db
+
+RCD_SCRIPTS=	nsd
+FILES_SUBST+=	NSDDB=${VARBASE}/db/nsd.db
+
+USE_PKGINSTALL=		yes
+PKG_GROUPS?=		nsd
+PKG_USERS?=		nsd:nsd::nsd\ pseudo-user
+
+.for _file_ in nsd.zones nsdc.conf
+CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_}
+.endfor
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nsd
diff --git a/net/nsd/PLIST b/net/nsd/PLIST
index c5d6e15e64f..86a0c45fab0 100644
--- a/net/nsd/PLIST
+++ b/net/nsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/04/19 20:28:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/11/05 21:27:53 joerg Exp $
 man/man8/nsd-notify.8
 man/man8/nsd-xfer.8
 man/man8/nsd.8
@@ -9,8 +9,8 @@ sbin/nsd-notify
 sbin/nsd-xfer
 sbin/nsdc
 sbin/zonec
-share/examples/nsd/nsd.zones.sample
-share/examples/nsd/nsdc.conf.sample
+share/examples/nsd/nsd.zones
+share/examples/nsd/nsdc.conf
 share/nsd/DIFFERENCES
 share/nsd/LICENSE
 share/nsd/NSD-DATABASE
diff --git a/net/nsd/distinfo b/net/nsd/distinfo
index af8c3ac6db7..5fb48856b85 100644
--- a/net/nsd/distinfo
+++ b/net/nsd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2005/02/24 12:13:57 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/11/05 21:27:53 joerg Exp $
 
 SHA1 (nsd-2.2.0.tar.gz) = 4a9e1d6c822ccda8c49884ee97246120fb30926a
 RMD160 (nsd-2.2.0.tar.gz) = 1a073b668ede113afd4eb07556376f0f8f95bf11
 Size (nsd-2.2.0.tar.gz) = 230431 bytes
-SHA1 (patch-aa) = d39630dd21c53bddfedff5fe8525dd93227e2f40
+SHA1 (patch-aa) = 47f3da8df8c4a02d4f6752f958125a2a6969dde2
diff --git a/net/nsd/files/nsd.sh b/net/nsd/files/nsd.sh
new file mode 100644
index 00000000000..529ca7dca94
--- /dev/null
+++ b/net/nsd/files/nsd.sh
@@ -0,0 +1,22 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: nsd.sh,v 1.1 2005/11/05 21:27:53 joerg Exp $
+#
+# PROVIDE: nsd
+# REQUIRE: DAEMON
+#
+
+. /etc/rc.subr
+
+name="nsd"
+rcvar=${name}
+
+required_files="@PKG_SYSCONFDIR@/nsd/nsd.zones @NSDDB@"
+
+command=/usr/pkg/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+nsd_flags=${nsd_flags:-""}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/net/nsd/patches/patch-aa b/net/nsd/patches/patch-aa
index c72fb2902a5..292a12f21ac 100644
--- a/net/nsd/patches/patch-aa
+++ b/net/nsd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2005/01/19 02:11:24 itojun Exp $
+$NetBSD: patch-aa,v 1.9 2005/11/05 21:27:53 joerg Exp $
 
 --- Makefile.in-	2005-01-19 11:05:06.000000000 +0900
 +++ Makefile.in	2005-01-19 11:06:59.000000000 +0900
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.8 2005/01/19 02:11:24 itojun Exp $
 -	$(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
++	$(INSTALL_DATA) nsdc.conf.sample $(prefix)/share/examples/nsd/nsdc.conf
++	$(INSTALL_DATA) nsd.zones.sample $(prefix)/share/examples/nsd/nsd.zones
  
  uninstall:
  	@echo