From renato@srv1.galle.com.br  Sat Jun  5 10:24:26 2004
Return-Path: <renato@srv1.galle.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DB85616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Jun 2004 10:24:26 -0700 (PDT)
Received: from srv1.galle.com.br (srv1.galle.com.br [200.246.25.2])
	by mx1.FreeBSD.org (Postfix) with SMTP id B96A043D49
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Jun 2004 10:24:25 -0700 (PDT)
	(envelope-from renato@srv1.galle.com.br)
Received: (qmail 27936 invoked by uid 1001); 5 Jun 2004 14:24:09 -0300
Message-Id: <20040605172409.27935.qmail@srv1.galle.com.br>
Date: 5 Jun 2004 14:24:09 -0300
From: Renato Botelho <renato@galle.com.br>
Reply-To: Renato Botelho <renato@galle.com.br>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Alex Perel <veers@disturbed.net>
Subject: Update rinetd to use rcNg startup
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67610
>Category:       ports
>Synopsis:       Update rinetd to use rcNg startup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 05 10:30:23 PDT 2004
>Closed-Date:    Tue Jun 08 12:41:53 GMT 2004
>Last-Modified:  Tue Jun 08 12:41:53 GMT 2004
>Originator:     Renato Botelho
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
Galle Folheados
>Environment:
System: FreeBSD srv1.galle.com.br 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #27: Wed May 26 10:21:14 BRT 2004 root@srv1.galle.com.br:/usr/obj/usr/src/sys/GALLE i386
>Description:
Update rinetd to use rcNg startup files
>How-To-Repeat:
>Fix:
diff -Nur rinetd.bkp/Makefile rinetd/Makefile
--- rinetd.bkp/Makefile Thu May 13 10:51:54 2004
+++ rinetd/Makefile     Sat Jun  5 14:12:07 2004
@@ -7,6 +7,7 @@

 PORTNAME=      rinetd
 PORTVERSION=   0.62
+PORTREVISION=  1
 CATEGORIES=    net
 MASTER_SITES=  http://www.boutell.com/rinetd/http/
 DISTNAME=      rinetd
@@ -18,12 +19,24 @@

 MAN8=          rinetd.8
 PORTDOCS=      index.html README
-PLIST_FILES=   sbin/rinetd
+
+USE_RC_SUBR=   yes
+RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
+post-patch:
+       @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+               ${FILESDIR}/rinetd.sh > ${WRKDIR}/rinetd.sh

 post-install:
 .if !defined(NOPORTDOCS)
        ${MKDIR} ${DOCSDIR}
        cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
+
+       @if [ ! -f ${PREFIX}/etc/rc.d/rinetd.sh ]; then \
+               ${ECHO} "Installing ${PREFIX}/etc/rc.d/rinetd.sh startup file."; \
+               ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/rinetd.sh ${PREFIX}/etc/rc.d/rinetd.sh; \
+       fi
+       @${CAT} ${PKGMESSAGE}

 .include <bsd.port.mk>
diff -Nur rinetd.bkp/files/rinetd.sh rinetd/files/rinetd.sh
--- rinetd.bkp/files/rinetd.sh  Wed Dec 31 21:00:00 1969
+++ rinetd/files/rinetd.sh      Sat Jun  5 09:55:58 2004
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# PROVIDE: rinetd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable rinetd:
+# rinetd_enable (bool): Set to "NO" by default.
+#                       Set it to "YES" to enable rinetd
+# rinetd_flags (str):   Set to "" by default.
+#                       Extra flags passed to start command
+#
+. %%RC_SUBR%%
+
+name="rinetd"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/rinetd"
+pidfile="/var/run/rinetd.pid"
+
+[ -z "$rinetd_enable" ] && rinetd_enable="NO"
+[ -z "$rinetd_flags" ]  && rinetd_flags=""
+
+load_rc_config $name
+
+run_rc_command "$1"
diff -Nur rinetd.bkp/pkg-message rinetd/pkg-message
--- rinetd.bkp/pkg-message      Wed Dec 31 21:00:00 1969
+++ rinetd/pkg-message  Sat Jun  5 13:14:21 2004
@@ -0,0 +1,10 @@
+         ***********************************
+         * !!!!!!!!!!! WARNING !!!!!!!!!!! *
+         ***********************************
+Since 0.62_1, rinetd startup script is now enabled/disabled via
+rc.subr.
+Available variables:
+# rinetd_enable (bool): Set to "NO" by default.
+#                       Set it to "YES" to enable rinetd
+# rinetd_flags (str):   Set to "" by default.
+#                       Extra flags passed to start command
diff -Nur rinetd.bkp/pkg-plist rinetd/pkg-plist
--- rinetd.bkp/pkg-plist        Wed Dec 31 21:00:00 1969
+++ rinetd/pkg-plist    Sat Jun  5 14:03:33 2004
@@ -0,0 +1,2 @@
+etc/rc.d/rinetd.sh
+sbin/rinetd
>Release-Note:
>Audit-Trail:

From: Volker Stolz <vs@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, renato@galle.com.br
Cc:  
Subject: Re: ports/67610: Update rinetd to use rcNg startup
Date: Tue, 08 Jun 2004 12:03:17 +0200

 It looks like all tabs got replaced by blanks in your patch which doesn't 
 let it apply cleanly.
 
 Volker

From: Renato Botelho <renato@galle.com.br>
To: freebsd-gnats-submit@FreeBSD.org, renato@galle.com.br
Cc:  
Subject: Re: ports/67610: Update rinetd to use rcNg startup
Date: Tue, 08 Jun 2004 07:24:34 -0300

 Sorry, here is the patch with correct tabs.
 
 diff -Nru rinetd.bkp/Makefile rinetd/Makefile
 --- rinetd.bkp/Makefile	Thu May 13 10:51:54 2004
 +++ rinetd/Makefile	Sat Jun  5 14:12:07 2004
 @@ -7,6 +7,7 @@
 
   PORTNAME=	rinetd
   PORTVERSION=	0.62
 +PORTREVISION=	1
   CATEGORIES=	net
   MASTER_SITES=	http://www.boutell.com/rinetd/http/
   DISTNAME=	rinetd
 @@ -18,12 +19,24 @@
 
   MAN8=		rinetd.8
   PORTDOCS=	index.html README
 -PLIST_FILES=	sbin/rinetd
 +
 +USE_RC_SUBR=	yes
 +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 +
 +post-patch:
 +	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 +		${FILESDIR}/rinetd.sh > ${WRKDIR}/rinetd.sh
 
   post-install:
   .if !defined(NOPORTDOCS)
   	${MKDIR} ${DOCSDIR}
   	cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
   .endif
 +
 +	@if [ ! -f ${PREFIX}/etc/rc.d/rinetd.sh ]; then \
 +		${ECHO} "Installing ${PREFIX}/etc/rc.d/rinetd.sh startup file."; \
 +		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/rinetd.sh 
 ${PREFIX}/etc/rc.d/rinetd.sh; \
 +	fi
 +	@${CAT} ${PKGMESSAGE}
 
   .include <bsd.port.mk>
 diff -Nru rinetd.bkp/files/rinetd.sh rinetd/files/rinetd.sh
 --- rinetd.bkp/files/rinetd.sh	Wed Dec 31 21:00:00 1969
 +++ rinetd/files/rinetd.sh	Sat Jun  5 09:55:58 2004
 @@ -0,0 +1,28 @@
 +#!/bin/sh
 +
 +# PROVIDE: rinetd
 +# REQUIRE: DAEMON
 +# BEFORE: LOGIN
 +# KEYWORD: FreeBSD shutdown
 +
 +#
 +# Add the following lines to /etc/rc.conf to enable rinetd:
 +# rinetd_enable (bool): Set to "NO" by default.
 +#                       Set it to "YES" to enable rinetd
 +# rinetd_flags (str):   Set to "" by default.
 +#                       Extra flags passed to start command
 +#
 +. %%RC_SUBR%%
 +
 +name="rinetd"
 +rcvar=`set_rcvar`
 +
 +command="%%PREFIX%%/sbin/rinetd"
 +pidfile="/var/run/rinetd.pid"
 +
 +[ -z "$rinetd_enable" ] && rinetd_enable="NO"
 +[ -z "$rinetd_flags" ]  && rinetd_flags=""
 +
 +load_rc_config $name
 +
 +run_rc_command "$1"
 diff -Nru rinetd.bkp/pkg-message rinetd/pkg-message
 --- rinetd.bkp/pkg-message	Wed Dec 31 21:00:00 1969
 +++ rinetd/pkg-message	Sat Jun  5 13:14:21 2004
 @@ -0,0 +1,10 @@
 +         ***********************************
 +         * !!!!!!!!!!! WARNING !!!!!!!!!!! *
 +         ***********************************
 +Since 0.62_1, rinetd startup script is now enabled/disabled via
 +rc.subr.
 +Available variables:
 +# rinetd_enable (bool): Set to "NO" by default.
 +#                       Set it to "YES" to enable rinetd
 +# rinetd_flags (str):   Set to "" by default.
 +#                       Extra flags passed to start command
 diff -Nru rinetd.bkp/pkg-plist rinetd/pkg-plist
 --- rinetd.bkp/pkg-plist	Wed Dec 31 21:00:00 1969
 +++ rinetd/pkg-plist	Sat Jun  5 14:03:33 2004
 @@ -0,0 +1,2 @@
 +etc/rc.d/rinetd.sh
 +sbin/rinetd
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Tue Jun 8 12:41:16 GMT 2004 
State-Changed-Why:  
Committed with modifications (e.g. PORTREVISION-bump not 
really necessary), thanks! 

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