From martin@mail.tradex.sk  Mon Sep 29 17:49:09 2003
Return-Path: <martin@mail.tradex.sk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3E7BD16A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Sep 2003 17:49:09 -0700 (PDT)
Received: from mail.tradex.sk (tradex.sk [81.0.229.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3075B4400B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Sep 2003 17:49:06 -0700 (PDT)
	(envelope-from martin@mail.tradex.sk)
Received: from localhost (tradex.sk [81.0.229.33])
	by mail.tradex.sk (Postfix) with ESMTP id 7F47525FB5
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Sep 2003 02:49:05 +0200 (CEST)
Received: by mail.tradex.sk (Postfix, from userid 1007)
	id 150B825FB8; Tue, 30 Sep 2003 02:49:05 +0200 (CEST)
Message-Id: <20030930004905.150B825FB8@mail.tradex.sk>
Date: Tue, 30 Sep 2003 02:49:05 +0200 (CEST)
From: Martin Matuska <martin@tradex.sk>
Reply-To: Martin Matuska <martin@tradex.sk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] sysutils/idled 1.16
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         57383
>Category:       ports
>Synopsis:       [PATCH] sysutils/idled 1.16
>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:   Mon Sep 29 17:50:21 PDT 2003
>Closed-Date:    Fri Jan 02 22:59:33 PST 2004
>Last-Modified:  Fri Jan 02 22:59:33 PST 2004
>Originator:     Martin Matuska
>Release:        FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
FreeBSD 4.8-RELEASE-p10 i386
>Description:
	This patch adds rc_subr support to the idled port.

>How-To-Repeat:
>Fix:
--- Makefile.orig	Tue Sep 30 01:54:36 2003
+++ Makefile	Tue Sep 30 01:54:40 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	idled
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.darkwing.com/idled/download/	\
 		ftp://ftp.cs.hope.edu/pub/idled/
@@ -20,14 +20,25 @@
 MAN5=		idled.cf.5
 MAN8=		idled.8
 
+SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
+
+USE_RC_SUBR=	yes
+RC_DIR=		${PREFIX}/etc/rc.d
+RC_SUFX=	.sh
+SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
+		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
+		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
+PLIST_SUB+=     RC_DIR=${RC_DIR} \
+		RC_SUFX=${RC_SUFX}
+
 post-extract:
 	(cd ${WRKSRC}; make clean)
 
+post-build:
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/idled.sh >${WRKDIR}/idled.sh
+
 post-install:
-	${STRIP_CMD} ${PREFIX}/libexec/idled
-.if !exists(${PREFIX}/etc/rc.d/idled.sh)
-	@${ECHO} "Installing ${PREFIX}/etc/rc.d/idled.sh startup script."
-	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/idled.sh ${PREFIX}/etc/rc.d/idled.sh
-.endif
+	@${INSTALL_SCRIPT} ${WRKDIR}/idled.sh ${RC_DIR}/idled${RC_SUFX}
+	@${STRIP_CMD} ${PREFIX}/libexec/idled
 
 .include <bsd.port.mk>
--- files/idled.sh.orig	Fri Aug 17 18:19:41 2001
+++ files/idled.sh	Tue Sep 30 01:55:14 2003
@@ -1,19 +1,33 @@
 #!/bin/sh
-case "$1" in
-	stop)
-		killall -TERM idled
-		echo "idled stopped"
-		;;
-	restart)
-		killall -TERM idled
-		/usr/local/libexec/idled
-		echo "idled restarted"
-		;;
-	-h)
-		echo "Usage: `basename $0` { start | stop | restart }"
-		;;
-	*)				# includes start
-		/usr/local/libexec/idled
-		echo -n ' idled'
-		;;
-esac
+#
+# $FreeBSD$
+#
+
+# PROVIDE: idled
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable idled:
+#
+#idled_enable="YES"
+#
+# See idled(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=idled
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/libexec/idled
+required_files=%%PREFIX%%/etc/idled.cf
+
+# set defaults
+
+idled_enable=${idled_enable:-"NO"}
+idled_flags=${idled_flags:-""}
+
+load_rc_config $name
+run_rc_command "$1"
--- pkg-plist.orig	Tue Sep 30 02:12:21 2003
+++ pkg-plist	Tue Sep 30 02:12:34 2003
@@ -1,3 +1,3 @@
 etc/idled.cf.template
-etc/rc.d/idled.sh
+etc/rc.d/idled%%RC_SUFX%%
 libexec/idled
>Release-Note:
>Audit-Trail:

From: Kirill Ponomarew <krion@FreeBSD.org>
To: Martin Matuska <martin@tradex.sk>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/57383: [PATCH] sysutils/idled 1.16
Date: Tue, 30 Sep 2003 10:01:30 +0200

 --XvKFcGCOAo53UbWW
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 On Tue, Sep 30, 2003 at 02:49:05AM +0200, Martin Matuska wrote:
 >=20
 > >Number:         57383
 > >Category:       ports
 > >Synopsis:       [PATCH] sysutils/idled 1.16
 
 Is it approved by maintainer ?
 
 -Kirill
 
 --XvKFcGCOAo53UbWW
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQE/eThaQC1G6a60JuURAtkXAJwI1Vab5IhJOXsh8peCoUuhhAqU3gCfdt4G
 kJR7+Dbi4S1W9Vl8+KNHLAA=
 =6aXV
 -----END PGP SIGNATURE-----
 
 --XvKFcGCOAo53UbWW--

From: Edwin Groothuis <edwin@freebsd.org>
To: andrew@ugh.net.au
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/57383 - [PATCH] sysutils/idled 1.16
Date: Sat, 4 Oct 2003 17:50:53 +1000

 Hello Andrew,
 
 Could you please approve this patch:
 	http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57383
 
 Edwin
 
 -- 
 Edwin Groothuis
 edwin@freebsd.org
 http://www.mavetju.org
State-Changed-From-To: open->feedback 
State-Changed-By: mat 
State-Changed-When: Tue Nov 25 03:54:01 PST 2003 
State-Changed-Why:  
edwin asked the maintainer 


Class-Changed-From-To: change-request->update 
Class-Changed-By: mat 
Class-Changed-When: Tue Nov 25 03:54:01 PST 2003 
Class-Changed-Why:  
Accurate class 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57383 
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Jan 2 22:59:25 PST 2004 
State-Changed-Why:  
Commited, thanks! 

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