From pgollucci@riderwayinc.com  Tue Jul 15 04:45:11 2008
Return-Path: <pgollucci@riderwayinc.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 952031065671
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Jul 2008 04:45:11 +0000 (UTC)
	(envelope-from pgollucci@riderwayinc.com)
Received: from riderwayinc.com (riderwayinc.com [74.93.213.161])
	by mx1.freebsd.org (Postfix) with ESMTP id 68BA78FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Jul 2008 04:45:11 +0000 (UTC)
	(envelope-from pgollucci@riderwayinc.com)
Received: from riderwayinc.com (localhost [127.0.0.1])
	by riderwayinc.com (8.14.2/8.14.2) with ESMTP id m6F4j39X005951
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO);
	Tue, 15 Jul 2008 04:45:03 GMT
	(envelope-from pgollucci@riderwayinc.com)
Received: (from pgollucci@localhost)
	by riderwayinc.com (8.14.2/8.14.2/Submit) id m6F4iv7T005950;
	Tue, 15 Jul 2008 04:44:57 GMT
	(envelope-from pgollucci)
Message-Id: <200807150444.m6F4iv7T005950@riderwayinc.com>
Date: Tue, 15 Jul 2008 04:44:57 GMT
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: osvaldsson@icelandic.net
Subject: [PATCH] dns/nsd: USE_RC_SUBR != yes
X-Send-Pr-Version: 3.113
X-GNATS-Notify: osvaldsson@icelandic.net

>Number:         125625
>Category:       ports
>Synopsis:       [PATCH] dns/nsd: USE_RC_SUBR != yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 15 04:50:01 UTC 2008
>Closed-Date:    Wed Jul 23 16:40:43 UTC 2008
>Last-Modified:  Wed Jul 23 16:40:43 UTC 2008
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.0-RELEASE amd64
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD riderwayinc.com 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Thu Feb 28 21:20:48 UTC 2008
>Description:
- Respect NO_INSTALL_MANPAGES
- Respect NOPORTDOCS
- repocopy [files/nsd.sh.tmp -> files/nsd.in]
  itectu@: no more .sh
  dougb@: move load_config above variables checks
- Bump PORTREVISION

Added file(s):
- files/nsd.in

Removed file(s):
- files/nsd.sh.tmpl

Port maintainer (osvaldsson@icelandic.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- nsd-3.0.7_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/nsd/Makefile,v
retrieving revision 1.37
diff -u -u -r1.37 Makefile
--- Makefile	14 Dec 2007 19:08:50 -0000	1.37
+++ Makefile	15 Jul 2008 04:41:33 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	nsd
 PORTVERSION=	3.0.7
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
@@ -16,7 +17,7 @@
 
 CONFLICTS=	nsd-[0-2]*
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	nsd
 
 NSDUSER?=	bind
 NSDDIR?=	${PREFIX}/etc/nsd
@@ -30,19 +31,20 @@
 		--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'
+PLIST_SUB+=	PREFIX=${PREFIX}
 
+.if !defined(NO_INSTALL_MANPAGES)
 MAN5=	nsd.conf.5
 MAN8=	nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \
 	nsd-xfer.8
+.endif
 
+.if !defined (NOPORTDOCS)
 PORTDOCS=	CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \
 		NSD-FOR-BIND-USERS README README.icc RELNOTES \
 		REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \
 		differences.tex
+.endif
 
 OPTIONS=	ROOT_SERVER	"Configure NSD as a root server" Off \
 		LARGEFILE	"Enable support for large files" On \
@@ -52,8 +54,7 @@
 		CHECKING	"Enable internal runtime checks" Off \
 		TSIG		"Enable TSIG support" On \
 		NSEC3		"Enable NSEC3 support" Off \
-		NSID		"Enable NSID support" Off \
-		DOCFILES	"Enable PORTDOCS" On
+		NSID		"Enable NSID support" Off
 
 .include <bsd.port.pre.mk>
 
@@ -109,11 +110,9 @@
 .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)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/dns/nsd/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist	12 Sep 2006 20:17:15 -0000	1.5
+++ pkg-plist	15 Jul 2008 04:41:33 -0000
@@ -1,5 +1,4 @@
 @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.5 2006/09/12 20:17:15 miwi Exp $
-etc/rc.d/nsd.sh
 etc/nsd/nsd.conf.sample
 sbin/nsd
 sbin/zonec
Index: files/nsd.in
===================================================================
RCS file: files/nsd.in
diff -N files/nsd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/nsd.in	15 Jul 2008 04:41:33 -0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan 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.conf
+
+command=/usr/local/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+load_rc_config ${name}
+
+nsd_enable=${nsd_enable:-"NO"}
+nsd_flags=${nsd_flags:-""}
+
+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	23 Sep 2006 08:07:48 -0000	1.3
+++ /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.3 2006/09/23 08:07:48 rafan 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.conf
-
-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"
-
--- nsd-3.0.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 15 04:50:12 UTC 2008 
Responsible-Changed-Why:  
araujo@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jul 15 04:50:16 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: osvaldsson@icelandic.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Tue, 15 Jul 2008 04:50:14 UT

 Maintainer of dns/nsd,
 
 Please note that PR ports/125625 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125625
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Thu, 17 Jul 2008 15:04:50 +0000

 Please ignore the previous reply if possible, there is a bug in the  
 patch.
 
 I will submit a new one asap.
 
 /Oli
 
 On 17.7.2008, at 14:47, Olafur Osvaldsson wrote:
 
 > I approve of the patch!
 >
 > /Oli
 >
 > P.S. Sorry for the late reply, have been out of town.
 >
 > On 15.7.2008, at 04:50, Edwin Groothuis wrote:
 >
 >> Maintainer of dns/nsd,
 >>
 >> Please note that PR ports/125625 has just been submitted.
 >>
 >> If it contains a patch for an upgrade, an enhancement or a bug fix
 >> you agree on, reply to this email stating that you approve the patch
 >> and a committer will take care of it.
 >>
 >> The full text of the PR can be found at:
 >>   http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125625
 >>
 >> -- 
 >> Edwin Groothuis via the GNATS Auto Assign Tool
 >> edwin@FreeBSD.org
 >
 

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Thu, 17 Jul 2008 14:47:11 +0000

 I approve of the patch!
 
 /Oli
 
 P.S. Sorry for the late reply, have been out of town.
 
 On 15.7.2008, at 04:50, Edwin Groothuis wrote:
 
 > Maintainer of dns/nsd,
 >
 > Please note that PR ports/125625 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125625
 >
 > -- 
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Thu, 17 Jul 2008 15:43:07 +0000

 --Apple-Mail-2--368496867
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed
 Content-Transfer-Encoding: 7bit
 
 See the attached revised patch.
 
 /Oli
 
 
 --Apple-Mail-2--368496867
 Content-Disposition: attachment;
 	filename=nsd-3.0.7_1-revised.patch
 Content-Type: application/octet-stream;
 	x-unix-mode=0644;
 	name="nsd-3.0.7_1-revised.patch"
 Content-Transfer-Encoding: 7bit
 
 diff -ruN nsd.orig/Makefile nsd/Makefile
 --- nsd.orig/Makefile	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/Makefile	2008-07-17 09:00:08.000000000 +0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	nsd
  PORTVERSION=	3.0.7
 +PORTREVISION=	1
  CATEGORIES=	dns ipv6
  MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
  		ftp://ftp.rhnet.is/pub/nsd/
 @@ -16,33 +17,33 @@
  
  CONFLICTS=	nsd-[0-2]*
  
 -USE_RC_SUBR=	yes
 +USE_RC_SUBR=	nsd
  
  NSDUSER?=	bind
 -NSDDIR?=	${PREFIX}/etc/nsd
  NSDDBFILE?=	/var/db/nsd.database
  
  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-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'
 +PLIST_SUB+=	PREFIX=${PREFIX}
  
 +.if !defined(NO_INSTALL_MANPAGES)
  MAN5=	nsd.conf.5
  MAN8=	nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \
  	nsd-xfer.8
 +.endif
  
 +.if !defined (NOPORTDOCS)
  PORTDOCS=	CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \
  		NSD-FOR-BIND-USERS README README.icc RELNOTES \
  		REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \
  		differences.tex
 +.endif
  
  OPTIONS=	ROOT_SERVER	"Configure NSD as a root server" Off \
  		LARGEFILE	"Enable support for large files" On \
 @@ -52,8 +53,7 @@
  		CHECKING	"Enable internal runtime checks" Off \
  		TSIG		"Enable TSIG support" On \
  		NSEC3		"Enable NSEC3 support" Off \
 -		NSID		"Enable NSID support" Off \
 -		DOCFILES	"Enable PORTDOCS" On
 +		NSID		"Enable NSID support" Off
  
  .include <bsd.port.pre.mk>
  
 @@ -109,11 +109,9 @@
  .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
 +.if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  .for f in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
 diff -ruN nsd.orig/files/nsd.in nsd/files/nsd.in
 --- nsd.orig/files/nsd.in	1970-01-01 00:00:00.000000000 +0000
 +++ nsd/files/nsd.in	2008-07-17 09:06:07.000000000 +0000
 @@ -0,0 +1,31 @@
 +#!/bin/sh
 +#
 +# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan 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=%%PREFIX%%/etc/nsd.conf
 +
 +command=/usr/local/sbin/${name}
 +pidfile=/var/run/${name}.pid
 +
 +load_rc_config ${name}
 +
 +nsd_enable=${nsd_enable:-"NO"}
 +nsd_flags=${nsd_flags:-""}
 +
 +run_rc_command "$1"
 +
 diff -ruN nsd.orig/files/nsd.sh.tmpl nsd/files/nsd.sh.tmpl
 --- nsd.orig/files/nsd.sh.tmpl	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/files/nsd.sh.tmpl	1970-01-01 00:00:00.000000000 +0000
 @@ -1,32 +0,0 @@
 -#!/bin/sh
 -#
 -# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan 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.conf
 -
 -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"
 -
 diff -ruN nsd.orig/pkg-plist nsd/pkg-plist
 --- nsd.orig/pkg-plist	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/pkg-plist	2008-07-17 08:50:35.000000000 +0000
 @@ -1,5 +1,4 @@
  @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.5 2006/09/12 20:17:15 miwi Exp $
 -etc/rc.d/nsd.sh
  etc/nsd/nsd.conf.sample
  sbin/nsd
  sbin/zonec
 
 --Apple-Mail-2--368496867
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed;
 	delsp=yes
 Content-Transfer-Encoding: 7bit
 
 
 
 
 On 17.7.2008, at 15:04, Olafur Osvaldsson wrote:
 
 > Please ignore the previous reply if possible, there is a bug in the  
 > patch.
 >
 > I will submit a new one asap.
 >
 > /Oli
 >
 > On 17.7.2008, at 14:47, Olafur Osvaldsson wrote:
 >
 >> I approve of the patch!
 >>
 >> /Oli
 >>
 >> P.S. Sorry for the late reply, have been out of town.
 >>
 >> On 15.7.2008, at 04:50, Edwin Groothuis wrote:
 >>
 >>> Maintainer of dns/nsd,
 >>>
 >>> Please note that PR ports/125625 has just been submitted.
 >>>
 >>> If it contains a patch for an upgrade, an enhancement or a bug fix
 >>> you agree on, reply to this email stating that you approve the patch
 >>> and a committer will take care of it.
 >>>
 >>> The full text of the PR can be found at:
 >>>  http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125625
 >>>
 >>> -- 
 >>> Edwin Groothuis via the GNATS Auto Assign Tool
 >>> edwin@FreeBSD.org
 >>
 >
 
 
 --Apple-Mail-2--368496867--

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Thu, 17 Jul 2008 15:54:37 +0000

 --Apple-Mail-4--367807402
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed
 Content-Transfer-Encoding: 7bit
 
 Ok, I'm starting to think that I shouldn't be doing this any more...
 
 Last try, here is a working patch.
 
 /Oli
 
 
 --Apple-Mail-4--367807402
 Content-Disposition: attachment;
 	filename=nsd-3.0.7_1-revised2.patch
 Content-Type: application/octet-stream;
 	x-unix-mode=0644;
 	name="nsd-3.0.7_1-revised2.patch"
 Content-Transfer-Encoding: 7bit
 
 diff -ruN nsd.orig/Makefile nsd/Makefile
 --- nsd.orig/Makefile	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/Makefile	2008-07-17 09:00:08.000000000 +0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	nsd
  PORTVERSION=	3.0.7
 +PORTREVISION=	1
  CATEGORIES=	dns ipv6
  MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
  		ftp://ftp.rhnet.is/pub/nsd/
 @@ -16,33 +17,33 @@
  
  CONFLICTS=	nsd-[0-2]*
  
 -USE_RC_SUBR=	yes
 +USE_RC_SUBR=	nsd
  
  NSDUSER?=	bind
 -NSDDIR?=	${PREFIX}/etc/nsd
  NSDDBFILE?=	/var/db/nsd.database
  
  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-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'
 +PLIST_SUB+=	PREFIX=${PREFIX}
  
 +.if !defined(NO_INSTALL_MANPAGES)
  MAN5=	nsd.conf.5
  MAN8=	nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \
  	nsd-xfer.8
 +.endif
  
 +.if !defined (NOPORTDOCS)
  PORTDOCS=	CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \
  		NSD-FOR-BIND-USERS README README.icc RELNOTES \
  		REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \
  		differences.tex
 +.endif
  
  OPTIONS=	ROOT_SERVER	"Configure NSD as a root server" Off \
  		LARGEFILE	"Enable support for large files" On \
 @@ -52,8 +53,7 @@
  		CHECKING	"Enable internal runtime checks" Off \
  		TSIG		"Enable TSIG support" On \
  		NSEC3		"Enable NSEC3 support" Off \
 -		NSID		"Enable NSID support" Off \
 -		DOCFILES	"Enable PORTDOCS" On
 +		NSID		"Enable NSID support" Off
  
  .include <bsd.port.pre.mk>
  
 @@ -109,11 +109,9 @@
  .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
 +.if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  .for f in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
 diff -ruN nsd.orig/files/nsd.in nsd/files/nsd.in
 --- nsd.orig/files/nsd.in	1970-01-01 00:00:00.000000000 +0000
 +++ nsd/files/nsd.in	2008-07-17 09:06:07.000000000 +0000
 @@ -0,0 +1,31 @@
 +#!/bin/sh
 +#
 +# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan 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=%%PREFIX%%/etc/nsd/nsd.conf
 +
 +command=/usr/local/sbin/${name}
 +pidfile=/var/run/${name}.pid
 +
 +load_rc_config ${name}
 +
 +nsd_enable=${nsd_enable:-"NO"}
 +nsd_flags=${nsd_flags:-""}
 +
 +run_rc_command "$1"
 +
 diff -ruN nsd.orig/files/nsd.sh.tmpl nsd/files/nsd.sh.tmpl
 --- nsd.orig/files/nsd.sh.tmpl	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/files/nsd.sh.tmpl	1970-01-01 00:00:00.000000000 +0000
 @@ -1,32 +0,0 @@
 -#!/bin/sh
 -#
 -# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan 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.conf
 -
 -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"
 -
 diff -ruN nsd.orig/pkg-plist nsd/pkg-plist
 --- nsd.orig/pkg-plist	2008-07-17 08:48:37.000000000 +0000
 +++ nsd/pkg-plist	2008-07-17 08:50:35.000000000 +0000
 @@ -1,5 +1,4 @@
  @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.5 2006/09/12 20:17:15 miwi Exp $
 -etc/rc.d/nsd.sh
  etc/nsd/nsd.conf.sample
  sbin/nsd
  sbin/zonec
 
 --Apple-Mail-4--367807402
 Content-Type: text/plain;
 	charset=US-ASCII;
 	format=flowed
 Content-Transfer-Encoding: 7bit
 
 
 
 
 
 --Apple-Mail-4--367807402--
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Sun Jul 20 10:17:35 UTC 2008 
State-Changed-Why:  
Maintainer has fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Sun Jul 20 10:20:00 UTC 2008 
State-Changed-Why:  
Maybe you can make the port respect NOPORTDOCS also (see 
http://t64.tecnik93.com/logs/7-STABLE-FTP/nsd-3.0.7.log) I see that you 
have an OPTION for installing docs, maybe you can change its name or 
test for NOPORTDOCS also or something like. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Sun, 20 Jul 2008 15:39:54 +0000

 Finally got to my computer to check this and sorry for sounding daft,  
 but
 isn't the ".if !defined (NOPORTDOCS)" in the patch enaugh?
 
 You are building from the unpatched version, please review the whole  
 history
 of this ticket and apply the latest patch before running make.
 
 /Oli
 
 On 20.7.2008, at 10:20, itetcu@FreeBSD.org wrote:
 
 > Synopsis: [PATCH] dns/nsd: USE_RC_SUBR != yes
 >
 > State-Changed-From-To: open->feedback
 > State-Changed-By: itetcu
 > State-Changed-When: Sun Jul 20 10:20:00 UTC 2008
 > State-Changed-Why:
 > Maybe you can make the port respect NOPORTDOCS also (see
 > http://t64.tecnik93.com/logs/7-STABLE-FTP/nsd-3.0.7.log) I see that  
 > you
 > have an OPTION for installing docs, maybe you can change its name or
 > test for NOPORTDOCS also or something like.
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=125625
 
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Mon Jul 21 18:19:17 UTC 2008 
State-Changed-Why:  
The patch seems to be enough for NOPORTDOCS, I missed that. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 
Responsible-Changed-From-To: araujo->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Jul 22 22:17:49 UTC 2008 
Responsible-Changed-Why:  
Submitter has gants access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 

From: Olafur Osvaldsson <osvaldsson@icelandic.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/125625: [PATCH] dns/nsd: USE_RC_SUBR != yes
Date: Wed, 23 Jul 2008 11:34:28 +0000

 I'm reconsidering and rejecting this patch due to many things put in  
 there
 by the original submitter for no apparent reason.
 
 I'll make a new patch and submit a new PR.
 
 /Oli
 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Wed Jul 23 16:40:42 UTC 2008 
State-Changed-Why:  
Superceeded by ports/125898 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125625 
>Unformatted:
