Bug 85790 - [MAINTAINER] dns/nsd: update to 2.3.1
Summary: [MAINTAINER] dns/nsd: update to 2.3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Renato Botelho
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-09-06 12:20 UTC by Olafur Osvaldsson
Modified: 2005-09-08 16:00 UTC (History)
0 users

See Also:


Attachments
nsd-2.3.1.patch (695 bytes, patch)
2005-09-06 12:20 UTC, Olafur Osvaldsson
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olafur Osvaldsson 2005-09-06 12:20:11 UTC
- Update to 2.3.1

NSD 2.3.1 is a small bugfix release.

Generated with FreeBSD Port Tools 0.63
Comment 1 Renato Botelho freebsd_committer freebsd_triage 2005-09-06 13:38:44 UTC
Responsible Changed
From-To: freebsd-ports-bugs->garga

Grabbed.
Comment 2 Renato Botelho freebsd_committer freebsd_triage 2005-09-06 16:33:44 UTC
Dear maintainer, I propose you the following patch, that convert scripts
to OPTIONS format. Do you approve it?

--- nsd.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/dns/nsd/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	6 May 2005 11:50:25 -0000	1.25
+++ Makefile	6 Sep 2005 15:30:53 -0000
@@ -5,15 +5,8 @@
 # $FreeBSD: ports/dns/nsd/Makefile,v 1.25 2005/05/06 11:50:25 novel Exp $
 #
 
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH NSD_OPTIONS="ROOT_SERVER BIND8_STATS"
-#
-# the options are the same names as in the scripts/configure.nsd file.
-# NSD_OPTIONS can be set in /etc/make.conf also.
-
 PORTNAME=	nsd
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
@@ -21,7 +14,7 @@
 MAINTAINER=	oli@isnic.is
 COMMENT=	An authoritative only non-recursive name server
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	nsd.sh
 
 NSDUSER?=	bind
 NSDDIR?=	${PREFIX}/etc/nsd
@@ -33,49 +26,58 @@
 		--with-pidfile=/var/run/nsd.pid \
 		--with-dbfile=${NSDDBFILE} \
 		--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'
+SUB_LIST+=	NSDUSER=${NSDUSER} NSDDIR=${NSDDIR}
 
-MAN8=	nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
+MAN8=		nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
 
 PORTDOCS=	README RELNOTES CREDITS DIFFERENCES REQUIREMENTS
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		NSD_OPTIONS="${NSD_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.nsd
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/nsd
+OPTIONS=	ROOT_SERVER	"Configure NSD as a root server" off\
+		NOIPv6		"Enable IPv6 support" on \
+		NODNSSEC	"Enable DNSSEC" on \
+		NOAXFR		"Enable AXFR" on \
+		BIND8_STATS	"Enable BIND8 like NSTATS & XSTATS" off \
+		PLUGINS		"Enable plugin support" off \
+		NOTSIG		"Enable TSIG support" on \
+		MMAP		"Load the database using mmap(2)" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ROOT_SERVER)
+CONFIGURE_ARGS+=	--enable-root-server
+.endif
+.if defined(WITHOUT_NOIPv6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+.if defined(WITHOUT_NODNSSEC)
+CONFIGURE_ARGS+=	--disable-dnssec
+.endif
+.if defined(WITHOUT_NOAXFR)
+CONFIGURE_ARGS+=	--disable-axfr
+.endif
+.if defined(WITH_BIND8_STATS)
+CONFIGURE_ARGS+=	--enable-bind8-stats
+.endif
+.if defined(WITH_PLUGINS)
+CONFIGURE_ARGS+=	--enable-plugins
+.endif
+.if defined(WITHOUT_NOTSIG)
+CONFIGURE_ARGS+=	--disable-tsig
+.endif
+.if defined(WITH_MMAP)
+CONFIGURE_ARGS+=	--enable-mmap
 .endif
 
 post-install:
-	${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-	${INSTALL_DATA} ${WRKSRC}/nsd.zones.sample \
-		${PREFIX}/etc/nsd/nsd.zones.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/
 	@${CAT} ${PKGMESSAGE}
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/dns/nsd/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	6 May 2005 11:50:25 -0000	1.16
+++ distinfo	6 Sep 2005 15:30:53 -0000
@@ -1,2 +1,2 @@
-MD5 (nsd-2.3.0.tar.gz) = 76512e7d188d3da4a83d0d3cc6c9399e
-SIZE (nsd-2.3.0.tar.gz) = 232288
+MD5 (nsd-2.3.1.tar.gz) = c24c4dc3e7ad2ab67f4fd8a8668fc1b6
+SIZE (nsd-2.3.1.tar.gz) = 247789
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/dns/nsd/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	7 Feb 2005 21:51:13 -0000	1.4
+++ pkg-plist	6 Sep 2005 15:30:53 -0000
@@ -1,5 +1,4 @@
 @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.4 2005/02/07 21:51:13 edwin Exp $
-etc/rc.d/nsd.sh
 etc/nsd/nsd.zones.sample
 etc/nsd/nsdc.conf.sample
 sbin/nsd
Index: files/nsd.sh.in
===================================================================
RCS file: files/nsd.sh.in
diff -N files/nsd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/nsd.sh.in	6 Sep 2005 15:30:53 -0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: nsd
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf to enable nsd:
+#
+# nsd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=nsd
+rcvar=`set_rcvar`
+
+prefix=%%PREFIX%%
+
+required_files=%%NSDDIR%%/nsd.zones
+
+command=/usr/local/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+# set defaults
+
+nsd_enable=${nsd_enable:-"NO"}
+nsd_flags=${nsd_flags:-""}
+
+load_rc_config ${name}
+run_rc_command "$1"
+
Index: files/nsd.sh.tmpl
===================================================================
RCS file: files/nsd.sh.tmpl
diff -N files/nsd.sh.tmpl
--- files/nsd.sh.tmpl	4 Nov 2004 13:09:07 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.2 2004/11/04 13:09:07 clive Exp $
-#
-# PROVIDE: nsd
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable nsd:
-#
-# nsd_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=nsd
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-
-required_files=%%NSDDIR%%/nsd.zones
-
-command=/usr/local/sbin/${name}
-pidfile=/var/run/${name}.pid
-
-# set defaults
-
-nsd_enable=${nsd_enable:-"NO"}
-nsd_flags=${nsd_flags:-""}
-
-load_rc_config ${name}
-run_rc_command "$1"
-
Index: scripts/configure.nsd
===================================================================
RCS file: scripts/configure.nsd
diff -N scripts/configure.nsd
--- scripts/configure.nsd	6 May 2005 11:50:25 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/dns/nsd/scripts/configure.nsd,v 1.2 2005/05/06 11:50:25 novel Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${NSD_OPTIONS}" ]; then
-	set ${NSD_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "NSD configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-ROOT_SERVER	"Configure NSD as a root server" "$status_ROOT_SERVER" \
-NOIPv6		"Disable IPv6 support" "$status_NOIPv6" \
-NODNSSEC	"Disable DNSSEC" "$status_NODNSSEC" \
-NOAXFR		"Disable AXFR" "$status_NOAXFR" \
-BIND8_STATS	"Enable BIND8 like NSTATS & XSTATS" "$status_BIND8_STATS" \
-PLUGINS		"Enable plugin support" "$status_PLUGINS" \
-NOTSIG		"Disable TSIG support" "$status_NOTSIG" \
-MMAP		"Configure NSD to load the database using mmap(2)" "$status_MMAP" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		ROOT_SERVER)
-			echo "CONFIGURE_ARGS+=        --enable-root-server"
-			;;
-		NOIPv6)
-			echo "CONFIGURE_ARGS+=        --disable-ipv6"
-			;;
-		NODNSSEC)
-			echo "CONFIGURE_ARGS+=        --disable-dnssec"
-			;;
-		NOAXFR)
-			echo "CONFIGURE_ARGS+=        --disable-axfr"
-			;;
-		BIND8_STATS)
-			echo "CONFIGURE_ARGS+=        --enable-bind8-stats"
-			;;
-		PLUGINS)
-			echo "CONFIGURE_ARGS+=        --enable-plugins"
-			;;
-		NOTSIG)
-			echo "CONFIGURE_ARGS+=        --disable-tsig"
-			;;
-		MMAP)
-			echo "CONFIGURE_ARGS+=        --enable-mmap"
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
--- nsd.patch ends here ---

Thanks
-- 
Renato Botelho <garga @ FreeBSD.org>
               <freebsd @ galle.com.br>
GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc

"I was gratified to be able to answer promptly, and I did.  I said I
didn't know."
		-- Mark Twain
Comment 3 Renato Botelho freebsd_committer freebsd_triage 2005-09-06 16:34:03 UTC
State Changed
From-To: open->feedback

Ask maintainer for approval.
Comment 4 Olafur Osvaldsson 2005-09-06 16:37:40 UTC
Renato,
No, the current schema was implemented not so long ago and I'm not
going to confuse the users with a new one so soon.

This is a version upgrade only.

/Oli

On Tue, 06 Sep 2005, Renato Botelho wrote:

> Dear maintainer, I propose you the following patch, that convert scripts
> to OPTIONS format. Do you approve it?
>=20
> --- nsd.patch begins here ---
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/pcvs/ports/dns/nsd/Makefile,v
> retrieving revision 1.25
> diff -u -r1.25 Makefile
> --- Makefile	6 May 2005 11:50:25 -0000	1.25
> +++ Makefile	6 Sep 2005 15:30:53 -0000
> @@ -5,15 +5,8 @@
>  # $FreeBSD: ports/dns/nsd/Makefile,v 1.25 2005/05/06 11:50:25 novel Exp $
>  #
> =20
> -# To pre-select options in batch mode, run make like this:
> -#
> -#  make -DBATCH NSD_OPTIONS=3D"ROOT_SERVER BIND8_STATS"
> -#
> -# the options are the same names as in the scripts/configure.nsd file.
> -# NSD_OPTIONS can be set in /etc/make.conf also.
> -
>  PORTNAME=3D	nsd
> -PORTVERSION=3D	2.3.0
> +PORTVERSION=3D	2.3.1
>  CATEGORIES=3D	dns ipv6
>  MASTER_SITES=3D	http://www.nlnetlabs.nl/downloads/nsd/	\
>  		ftp://ftp.rhnet.is/pub/nsd/
> @@ -21,7 +14,7 @@
>  MAINTAINER=3D	oli@isnic.is
>  COMMENT=3D	An authoritative only non-recursive name server
> =20
> -USE_RC_SUBR=3D	yes
> +USE_RC_SUBR=3D	nsd.sh
> =20
>  NSDUSER?=3D	bind
>  NSDDIR?=3D	${PREFIX}/etc/nsd
> @@ -33,49 +26,58 @@
>  		--with-pidfile=3D/var/run/nsd.pid \
>  		--with-dbfile=3D${NSDDBFILE} \
>  		--with-libwrap
> +
>  CONFIGURE_TARGET=3D	--build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
> =20
> -SED_SCRIPT=3D	-e 's,%%NSDUSER%%,${NSDUSER},g' \
> -		-e 's,%%NSDDIR%%,${NSDDIR},g' \
> -		-e 's,%%PREFIX%%,${PREFIX},g' \
> -		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
> +SUB_LIST+=3D	NSDUSER=3D${NSDUSER} NSDDIR=3D${NSDDIR}
> =20
> -MAN8=3D	nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
> +MAN8=3D		nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
> =20
>  PORTDOCS=3D	README RELNOTES CREDITS DIFFERENCES REQUIREMENTS
> =20
> -SCRIPTS_ENV=3D	WRKDIRPREFIX=3D"${WRKDIRPREFIX}" \
> -		TOUCH=3D"${TOUCH}" \
> -		MKDIR=3D"${MKDIR}" \
> -		NSD_OPTIONS=3D"${NSD_OPTIONS}"
> -
> -pre-fetch:
> -	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.nsd
> -
> -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
> -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
> -.endif
> -
> -.if defined(NOPORTDOCS)
> -READMEDIR=3Dno
> -.else
> -READMEDIR=3D${PREFIX}/share/doc/nsd
> +OPTIONS=3D	ROOT_SERVER	"Configure NSD as a root server" off\
> +		NOIPv6		"Enable IPv6 support" on \
> +		NODNSSEC	"Enable DNSSEC" on \
> +		NOAXFR		"Enable AXFR" on \
> +		BIND8_STATS	"Enable BIND8 like NSTATS & XSTATS" off \
> +		PLUGINS		"Enable plugin support" off \
> +		NOTSIG		"Enable TSIG support" on \
> +		MMAP		"Load the database using mmap(2)" off
> +
> +.include <bsd.port.pre.mk>
> +
> +.if defined(WITH_ROOT_SERVER)
> +CONFIGURE_ARGS+=3D	--enable-root-server
> +.endif
> +.if defined(WITHOUT_NOIPv6)
> +CONFIGURE_ARGS+=3D	--disable-ipv6
> +.endif
> +.if defined(WITHOUT_NODNSSEC)
> +CONFIGURE_ARGS+=3D	--disable-dnssec
> +.endif
> +.if defined(WITHOUT_NOAXFR)
> +CONFIGURE_ARGS+=3D	--disable-axfr
> +.endif
> +.if defined(WITH_BIND8_STATS)
> +CONFIGURE_ARGS+=3D	--enable-bind8-stats
> +.endif
> +.if defined(WITH_PLUGINS)
> +CONFIGURE_ARGS+=3D	--enable-plugins
> +.endif
> +.if defined(WITHOUT_NOTSIG)
> +CONFIGURE_ARGS+=3D	--disable-tsig
> +.endif
> +.if defined(WITH_MMAP)
> +CONFIGURE_ARGS+=3D	--enable-mmap
>  .endif
> =20
>  post-install:
> -	${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh
>  .if !defined(NOPORTDOCS)
>  	@${MKDIR} ${DOCSDIR}
>  .for f in ${PORTDOCS}
>  	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>  .endfor
>  .endif
> -	${INSTALL_DATA} ${WRKSRC}/nsd.zones.sample \
> -		${PREFIX}/etc/nsd/nsd.zones.sample
> -	${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/
>  	@${CAT} ${PKGMESSAGE}
> =20
> -post-clean:
> -	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
> -
> -.include <bsd.port.mk>
> +.include <bsd.port.post.mk>
> Index: distinfo
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/pcvs/ports/dns/nsd/distinfo,v
> retrieving revision 1.16
> diff -u -r1.16 distinfo
> --- distinfo	6 May 2005 11:50:25 -0000	1.16
> +++ distinfo	6 Sep 2005 15:30:53 -0000
> @@ -1,2 +1,2 @@
> -MD5 (nsd-2.3.0.tar.gz) =3D 76512e7d188d3da4a83d0d3cc6c9399e
> -SIZE (nsd-2.3.0.tar.gz) =3D 232288
> +MD5 (nsd-2.3.1.tar.gz) =3D c24c4dc3e7ad2ab67f4fd8a8668fc1b6
> +SIZE (nsd-2.3.1.tar.gz) =3D 247789
> Index: pkg-plist
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/pcvs/ports/dns/nsd/pkg-plist,v
> retrieving revision 1.4
> diff -u -r1.4 pkg-plist
> --- pkg-plist	7 Feb 2005 21:51:13 -0000	1.4
> +++ pkg-plist	6 Sep 2005 15:30:53 -0000
> @@ -1,5 +1,4 @@
>  @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.4 2005/02/07 21:51:13 edw=
in Exp $
> -etc/rc.d/nsd.sh
>  etc/nsd/nsd.zones.sample
>  etc/nsd/nsdc.conf.sample
>  sbin/nsd
> Index: files/nsd.sh.in
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: files/nsd.sh.in
> diff -N files/nsd.sh.in
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ files/nsd.sh.in	6 Sep 2005 15:30:53 -0000
> @@ -0,0 +1,32 @@
> +#!/bin/sh
> +#
> +# $FreeBSD$
> +#
> +# PROVIDE: nsd
> +# REQUIRE: DAEMON
> +#
> +# Add the following line to /etc/rc.conf to enable nsd:
> +#
> +# nsd_enable=3D"YES"
> +#
> +
> +. %%RC_SUBR%%
> +
> +name=3Dnsd
> +rcvar=3D`set_rcvar`
> +
> +prefix=3D%%PREFIX%%
> +
> +required_files=3D%%NSDDIR%%/nsd.zones
> +
> +command=3D/usr/local/sbin/${name}
> +pidfile=3D/var/run/${name}.pid
> +
> +# set defaults
> +
> +nsd_enable=3D${nsd_enable:-"NO"}
> +nsd_flags=3D${nsd_flags:-""}
> +
> +load_rc_config ${name}
> +run_rc_command "$1"
> +
> Index: files/nsd.sh.tmpl
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: files/nsd.sh.tmpl
> diff -N files/nsd.sh.tmpl
> --- files/nsd.sh.tmpl	4 Nov 2004 13:09:07 -0000	1.2
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,32 +0,0 @@
> -#!/bin/sh
> -#
> -# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.2 2004/11/04 13:09:07 cl=
ive Exp $
> -#
> -# PROVIDE: nsd
> -# REQUIRE: DAEMON
> -#
> -# Add the following line to /etc/rc.conf to enable nsd:
> -#
> -# nsd_enable=3D"YES"
> -#
> -
> -. %%RC_SUBR%%
> -
> -name=3Dnsd
> -rcvar=3D`set_rcvar`
> -
> -prefix=3D%%PREFIX%%
> -
> -required_files=3D%%NSDDIR%%/nsd.zones
> -
> -command=3D/usr/local/sbin/${name}
> -pidfile=3D/var/run/${name}.pid
> -
> -# set defaults
> -
> -nsd_enable=3D${nsd_enable:-"NO"}
> -nsd_flags=3D${nsd_flags:-""}
> -
> -load_rc_config ${name}
> -run_rc_command "$1"
> -
> Index: scripts/configure.nsd
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: scripts/configure.nsd
> diff -N scripts/configure.nsd
> --- scripts/configure.nsd	6 May 2005 11:50:25 -0000	1.2
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,86 +0,0 @@
> -#!/bin/sh
> -# $FreeBSD: ports/dns/nsd/scripts/configure.nsd,v 1.2 2005/05/06 11:50:2=
5 novel Exp $
> -
> -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
> -	exit
> -fi
> -
> -tempfile=3D`mktemp -t checklist`
> -
> -if [ "${NSD_OPTIONS}" ]; then
> -	set ${NSD_OPTIONS}
> -fi
> -
> -for i; do
> -	eval status_$i=3DON
> -done
> -
> -if [ -z "${BATCH}" ]; then
> -	/usr/bin/dialog --title "NSD configuration options" --clear \
> -		--checklist "\n\
> -Please select desired options:" -1 -1 16 \
> -ROOT_SERVER	"Configure NSD as a root server" "$status_ROOT_SERVER" \
> -NOIPv6		"Disable IPv6 support" "$status_NOIPv6" \
> -NODNSSEC	"Disable DNSSEC" "$status_NODNSSEC" \
> -NOAXFR		"Disable AXFR" "$status_NOAXFR" \
> -BIND8_STATS	"Enable BIND8 like NSTATS & XSTATS" "$status_BIND8_STATS" \
> -PLUGINS		"Enable plugin support" "$status_PLUGINS" \
> -NOTSIG		"Disable TSIG support" "$status_NOTSIG" \
> -MMAP		"Configure NSD to load the database using mmap(2)" "$status_MMAP" \
> -2> $tempfile
> -
> -	retval=3D$?
> -
> -	if [ -s $tempfile ]; then
> -		set `sed 's/"//g' $tempfile`
> -	fi
> -	rm -f $tempfile
> -
> -	case $retval in
> -		0)	if [ -z "$*" ]; then
> -				echo "Nothing selected"
> -			fi
> -			;;
> -		1)	echo "Cancel pressed."
> -			exit 1
> -			;;
> -	esac
> -fi
> -
> -${MKDIR} ${WRKDIRPREFIX}${CURDIR}
> -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
> -
> -while [ "$1" ]; do
> -	case $1 in
> -		ROOT_SERVER)
> -			echo "CONFIGURE_ARGS+=3D        --enable-root-server"
> -			;;
> -		NOIPv6)
> -			echo "CONFIGURE_ARGS+=3D        --disable-ipv6"
> -			;;
> -		NODNSSEC)
> -			echo "CONFIGURE_ARGS+=3D        --disable-dnssec"
> -			;;
> -		NOAXFR)
> -			echo "CONFIGURE_ARGS+=3D        --disable-axfr"
> -			;;
> -		BIND8_STATS)
> -			echo "CONFIGURE_ARGS+=3D        --enable-bind8-stats"
> -			;;
> -		PLUGINS)
> -			echo "CONFIGURE_ARGS+=3D        --enable-plugins"
> -			;;
> -		NOTSIG)
> -			echo "CONFIGURE_ARGS+=3D        --disable-tsig"
> -			;;
> -		MMAP)
> -			echo "CONFIGURE_ARGS+=3D        --enable-mmap"
> -			;;
> -		*)
> -			echo "Unknown option(s): $*" > /dev/stderr
> -			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
> -			exit 1
> -			;;
> -	esac
> -	shift
> -done
> --- nsd.patch ends here ---
>=20
> Thanks
> --=20
> Renato Botelho <garga @ FreeBSD.org>
>                <freebsd @ galle.com.br>
> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
>=20
> "I was gratified to be able to answer promptly, and I did.  I said I
> didn't know."
> 		-- Mark Twain

--=20
Olafur Osvaldsson
Systems Administrator
Internet a Islandi hf.
Tel:   +354 525-5291
Email: oli@isnic.is
Comment 5 Renato Botelho freebsd_committer freebsd_triage 2005-09-06 17:05:11 UTC
On Tue, Sep 06, 2005 at 03:37:40PM +0000, Olafur Osvaldsson wrote:
> Renato,
> No, the current schema was implemented not so long ago and I'm not
> going to confuse the users with a new one so soon.
> 
> This is a version upgrade only.

Olafur,

We can add a note on UPATING, and, since the options is the same
and one user choose one time it will be saved on
/var/db/ports/nsd/options, users won't be confused.

Using OPTIONS is the actual default way to get parameters to use on
build time.

Are you sure you don't want do convert the port to use OPTIONS?

Sorry for be persistent, if you say no again, I'll commit just the
update.

Thanks
-- 
Renato Botelho <garga @ FreeBSD.org>
               <freebsd @ galle.com.br>
GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc

An effective way to deal with predators is to taste terrible.
Comment 6 Olafur Osvaldsson 2005-09-06 17:16:20 UTC
Renato,
I did go through this discussion when I changed into the current schema.

So, the answer is no for now.

/Oli


On Tue, 06 Sep 2005, Renato Botelho wrote:

> On Tue, Sep 06, 2005 at 03:37:40PM +0000, Olafur Osvaldsson wrote:
> > Renato,
> > No, the current schema was implemented not so long ago and I'm not
> > going to confuse the users with a new one so soon.
> >=20
> > This is a version upgrade only.
>=20
> Olafur,
>=20
> We can add a note on UPATING, and, since the options is the same
> and one user choose one time it will be saved on
> /var/db/ports/nsd/options, users won't be confused.
>=20
> Using OPTIONS is the actual default way to get parameters to use on
> build time.
>=20
> Are you sure you don't want do convert the port to use OPTIONS?
>=20
> Sorry for be persistent, if you say no again, I'll commit just the
> update.
>=20
> Thanks
> --=20
> Renato Botelho <garga @ FreeBSD.org>
>                <freebsd @ galle.com.br>
> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
>=20
> An effective way to deal with predators is to taste terrible.

--=20
Olafur Osvaldsson
Systems Administrator
Internet a Islandi hf.
Tel:   +354 525-5291
Email: oli@isnic.is
Comment 7 Renato Botelho freebsd_committer freebsd_triage 2005-09-06 17:26:50 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 8 Marcus Grando 2005-09-06 17:32:23 UTC
Hi,

All MAINTAINERs updating ports to use OPTIONS, why you persist in old 
KNOBs? Consider using OPTIONs. OPTIONS are included in Porters Handbook 
too[1].

Old KNOBs are compatible with OPTIONS, don't care about it.

[1]
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html#AEN2359

Regards

-- 
Marcus Alves Grando
Grupos Internet S/A
marcus(at)corp.grupos.com.br
Comment 9 Olafur Osvaldsson 2005-09-07 03:26:19 UTC
Marcus,

On Tue, 06 Sep 2005, Marcus Alves Grando wrote:

> All MAINTAINERs updating ports to use OPTIONS, why you persist in old=20
> KNOBs? Consider using OPTIONs. OPTIONS are included in Porters Handbook=
=20
> too[1].

Please be more specific, the "all the other kids are doing it" clause
just doesn't work, it didn't even work when I was a kid.

> Old KNOBs are compatible with OPTIONS, don't care about it.

Last time I was going to implement OPTIONS it was not possible to set the
options in /etc/make.conf, with the method I'm using today that is possible,
has this changed?

I fully intend to change over to OPTIONS when I have the time to test it
since it would break things for those that do set the options in /etc/make.=
conf

Besides, I don't understand what all the fuss is and why this bothers you so
much...if you think you can do a better job of maintaining this port and the
ports@ community agrees then I'm sure you can get a committer to change it
over to you.

/Oli

--=20
Olafur Osvaldsson
Systems Administrator
Internet a Islandi hf.
Tel:   +354 525-5291
Email: oli@isnic.is
Comment 10 Marcus Grando 2005-09-08 15:45:02 UTC
Olafur,

I remove all scripts in postfix-current. I know that's have problems, 
but it's better then scripts. When you have time to change to OPTIONS, 
look postfix-current and see. I put one message in UPDATING and 
pre-patch secction with "sleep 10".

pre-patch:
.       if defined(POSTFIX_OPTIONS)
                 @${ECHO_MSG}
                 @${ECHO_MSG}
                 @${ECHO_MSG}
                 @${ECHO_MSG} "***** ALERT *****"
                 @${ECHO_MSG} "POSTFIX_OPTIONS don't work anymore, now"
                 @${ECHO_MSG} "${PORTNAME} use OPTIONS, consider use:"
                 @${ECHO_MSG} "# make config"
                 @${ECHO_MSG}
                 @${ECHO_MSG}
                 @${ECHO_MSG}
                 @sleep 10
.       endif

Regards

Olafur Osvaldsson wrote:
> Marcus,
> 
> On Tue, 06 Sep 2005, Marcus Alves Grando wrote:
> 
> 
>>All MAINTAINERs updating ports to use OPTIONS, why you persist in old 
>>KNOBs? Consider using OPTIONs. OPTIONS are included in Porters Handbook 
>>too[1].
> 
> 
> Please be more specific, the "all the other kids are doing it" clause
> just doesn't work, it didn't even work when I was a kid.
> 
> 
>>Old KNOBs are compatible with OPTIONS, don't care about it.
> 
> 
> Last time I was going to implement OPTIONS it was not possible to set the
> options in /etc/make.conf, with the method I'm using today that is possible,
> has this changed?
> 
> I fully intend to change over to OPTIONS when I have the time to test it
> since it would break things for those that do set the options in /etc/make.conf
> 
> Besides, I don't understand what all the fuss is and why this bothers you so
> much...if you think you can do a better job of maintaining this port and the
> ports@ community agrees then I'm sure you can get a committer to change it
> over to you.
> 
> /Oli
> 

-- 
Marcus Alves Grando
Grupos Internet S/A
marcus(at)corp.grupos.com.br
Comment 11 Olafur Osvaldsson 2005-09-08 15:50:10 UTC
Marcus,
Thank you very much, I'll keep this and use when I change over.

/Oli

On Thu, 08 Sep 2005, Marcus Alves Grando wrote:

> Olafur,
>=20
> I remove all scripts in postfix-current. I know that's have problems,=20
> but it's better then scripts. When you have time to change to OPTIONS,=20
> look postfix-current and see. I put one message in UPDATING and=20
> pre-patch secction with "sleep 10".
>=20
> pre-patch:
> .       if defined(POSTFIX_OPTIONS)
>                 @${ECHO_MSG}
>                 @${ECHO_MSG}
>                 @${ECHO_MSG}
>                 @${ECHO_MSG} "***** ALERT *****"
>                 @${ECHO_MSG} "POSTFIX_OPTIONS don't work anymore, now"
>                 @${ECHO_MSG} "${PORTNAME} use OPTIONS, consider use:"
>                 @${ECHO_MSG} "# make config"
>                 @${ECHO_MSG}
>                 @${ECHO_MSG}
>                 @${ECHO_MSG}
>                 @sleep 10
> .       endif
>=20
> Regards
>=20
> Olafur Osvaldsson wrote:
> >Marcus,
> >
> >On Tue, 06 Sep 2005, Marcus Alves Grando wrote:
> >
> >
> >>All MAINTAINERs updating ports to use OPTIONS, why you persist in old=
=20
> >>KNOBs? Consider using OPTIONs. OPTIONS are included in Porters Handbook=
=20
> >>too[1].
> >
> >
> >Please be more specific, the "all the other kids are doing it" clause
> >just doesn't work, it didn't even work when I was a kid.
> >
> >
> >>Old KNOBs are compatible with OPTIONS, don't care about it.
> >
> >
> >Last time I was going to implement OPTIONS it was not possible to set the
> >options in /etc/make.conf, with the method I'm using today that is=20
> >possible,
> >has this changed?
> >
> >I fully intend to change over to OPTIONS when I have the time to test it
> >since it would break things for those that do set the options in=20
> >/etc/make.conf
> >
> >Besides, I don't understand what all the fuss is and why this bothers yo=
u=20
> >so
> >much...if you think you can do a better job of maintaining this port and=
=20
> >the
> >ports@ community agrees then I'm sure you can get a committer to change =
it
> >over to you.
> >
> >/Oli
> >
>=20
> --=20
> Marcus Alves Grando
> Grupos Internet S/A
> marcus(at)corp.grupos.com.br

--=20
Olafur Osvaldsson
Systems Administrator
Internet a Islandi hf.
Tel:   +354 525-5291
Email: oli@isnic.is