4 files changed, 32 insertions, 29 deletions

diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile
index 38e6e9c167dc..7800800709c1 100644
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nsd
-PORTVERSION=	3.0.7
+PORTVERSION=	3.1.1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
@@ -16,25 +16,25 @@ COMMENT=	An authoritative only non-recursive name server
 
 CONFLICTS=	nsd-[0-2]*
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	nsd
 
 NSDUSER?=	bind
-NSDDIR?=	${PREFIX}/etc/nsd
-NSDDBFILE?=	/var/db/nsd.database
+NSDDBDIR?=	/var/db/nsd
+NSDDBFILE?=	${NSDDBDIR}/nsd.db
+NSDDIFFFILE?=	${NSDDBDIR}/ixfr.db
+NSDXFRDFILE?=	${NSDDBDIR}/xfrd.state
+NSDMAX_INT?=	512
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-user=${NSDUSER} \
-		--with-configdir=${NSDDIR} \
+		--with-configdir=${PREFIX}/etc/nsd \
 		--with-pidfile=/var/run/nsd.pid \
 		--with-dbfile=${NSDDBFILE} \
+		--with-difffile=${NSDDIFFFILE} \
+		--with-xfrdfile=${NSDXFRDFILE} \
 		--with-libwrap
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-SED_SCRIPT=	-e 's,%%NSDUSER%%,${NSDUSER},g' \
-		-e 's,%%NSDDIR%%,${NSDDIR},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
-
 MAN5=	nsd.conf.5
 MAN8=	nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \
 	nsd-xfer.8
@@ -51,9 +51,9 @@ OPTIONS=	ROOT_SERVER	"Configure NSD as a root server" Off \
 		BIND8_STATS	"Enable BIND8 like NSTATS & XSTATS" Off \
 		CHECKING	"Enable internal runtime checks" Off \
 		TSIG		"Enable TSIG support" On \
-		NSEC3		"Enable NSEC3 support" Off \
+		NSEC3		"Enable NSEC3 support" On \
 		NSID		"Enable NSID support" Off \
-		DOCFILES	"Enable PORTDOCS" On
+		MAXINT		"Raise max_interfaces from 8 to ${NSDMAX_INT}" Off
 
 .include <bsd.port.pre.mk>
 
@@ -85,14 +85,18 @@ CONFIGURE_ARGS+=	--enable-checking
 CONFIGURE_ARGS+=	--disable-tsig
 .endif
 
-.if defined(WITH_NSEC3)
-CONFIGURE_ARGS+=	--enable-nsec3
+.if defined(WITHOUT_NSEC3)
+CONFIGURE_ARGS+=	--disable-nsec3
 .endif
 
 .if defined(WITH_NSID)
 CONFIGURE_ARGS+=	--enable-nsid
 .endif
 
+.if defined(WITH_MAXINT)
+CONFIGURE_ARGS+=	--with-max_interfaces=${NSDMAX_INT}
+.endif
+
 pre-patch:
 .if defined(NSD_OPTIONS)
 	@${ECHO_MSG}
@@ -109,11 +113,11 @@ pre-patch:
 .endif
 
 post-install:
-	${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh
 	${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \
-		${NSDDIR}/nsd.conf.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/
-.if !defined(WITHOUT_DOCFILES)
+		${PREFIX}/etc/nsd/nsd.conf.sample
+	@${MKDIR} ${NSDDBDIR}
+	@${CHOWN} -R ${NSDUSER} ${NSDDBDIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
diff --git a/dns/nsd/distinfo b/dns/nsd/distinfo
index 1be1072dbd2c..ed7f30965f12 100644
--- a/dns/nsd/distinfo
+++ b/dns/nsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (nsd-3.0.7.tar.gz) = 37558edef2fe9d9052aafeb73effd4ac
-SHA256 (nsd-3.0.7.tar.gz) = 73c54aeaf8b302624dca7c570cc0c29b1610ef90b1b2159cb63b01044fdf6bd4
-SIZE (nsd-3.0.7.tar.gz) = 818770
+MD5 (nsd-3.1.1.tar.gz) = 93cb2d0fa005ab46f81ef00e4951a804
+SHA256 (nsd-3.1.1.tar.gz) = aba5777672b7a2be1d61c6a8cb3346f7115f5d1dc3ae0ea94a55ef948aa3ff39
+SIZE (nsd-3.1.1.tar.gz) = 829140
diff --git a/dns/nsd/files/nsd.sh.tmpl b/dns/nsd/files/nsd.in
index a1e1a644e588..43e8f1ebdca1 100644
--- a/dns/nsd/files/nsd.sh.tmpl
+++ b/dns/nsd/files/nsd.in
@@ -17,16 +17,15 @@ rcvar=`set_rcvar`
 
 prefix=%%PREFIX%%
 
-required_files=%%NSDDIR%%/nsd.conf
+required_files=%%PREFIX%%/etc/nsd/nsd.conf
 
 command=/usr/local/sbin/${name}
 pidfile=/var/run/${name}.pid
 
-# set defaults
+load_rc_config ${name}
 
 nsd_enable=${nsd_enable:-"NO"}
 nsd_flags=${nsd_flags:-""}
 
-load_rc_config ${name}
 run_rc_command "$1"
 
diff --git a/dns/nsd/pkg-plist b/dns/nsd/pkg-plist
index 5a2d4d35a9f7..3c31299169cb 100644
--- a/dns/nsd/pkg-plist
+++ b/dns/nsd/pkg-plist
@@ -1,11 +1,11 @@
-@comment $FreeBSD$
-etc/rc.d/nsd.sh
 etc/nsd/nsd.conf.sample
 sbin/nsd
-sbin/zonec
-sbin/nsdc
-sbin/nsd-notify
 sbin/nsd-checkconf
+sbin/nsd-notify
 sbin/nsd-patch
 sbin/nsd-xfer
+sbin/nsdc
+sbin/zonec
 @dirrm etc/nsd
+@cwd /
+@dirrm var/db/nsd