From root@therapie.sportmedisch.net  Wed Sep 28 01:33:06 2005
Return-Path: <root@therapie.sportmedisch.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DAC4616A421
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Sep 2005 01:33:06 +0000 (GMT)
	(envelope-from root@therapie.sportmedisch.net)
Received: from therapie.sportmedisch.net (5353610B.cable.casema.nl [83.83.97.11])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DD8B43D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Sep 2005 01:33:05 +0000 (GMT)
	(envelope-from root@therapie.sportmedisch.net)
Received: from therapie.sportmedisch.net (localhost.sportmedisch.net [127.0.0.1])
	by therapie.sportmedisch.net (8.13.3/8.13.3) with ESMTP id j8S5lYaN001145;
	Wed, 28 Sep 2005 07:47:34 +0200 (CEST)
	(envelope-from root@therapie.sportmedisch.net)
Received: (from root@localhost)
	by therapie.sportmedisch.net (8.13.3/8.13.3/Submit) id j8S5lX4I001144;
	Wed, 28 Sep 2005 07:47:33 +0200 (CEST)
	(envelope-from root)
Message-Id: <200509280547.j8S5lX4I001144@therapie.sportmedisch.net>
Date: Wed, 28 Sep 2005 07:47:33 +0200 (CEST)
From: Charlie & <root@therapie.sportmedisch.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: aldert@nooitgedagt.net
Subject: [MAINTAINER-UPDATE] www/aolserver: fixed broken rc.d script
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86658
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] www/aolserver: fixed broken rc.d script
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 28 01:40:17 GMT 2005
>Closed-Date:    Wed Sep 28 11:12:44 GMT 2005
>Last-Modified:  Wed Sep 28 11:12:44 GMT 2005
>Originator:     Aldert Nooitgedagt
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD therapie.sportmedisch.net 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May  8 10:21:06 UTC
>Description:
-updated rc.d script
-was broken (-K flag isn't available anymore). Need to kill pid.

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

--- aolserver-4.0.10.patch begins here ---
Index: files/aolserver.sh.in
===================================================================
RCS file: /home/ncvs/ports/www/aolserver/files/aolserver.sh.in,v
retrieving revision 1.1
diff -u -r1.1 aolserver.sh.in
--- files/aolserver.sh.in	17 Jul 2005 17:03:18 -0000	1.1
+++ files/aolserver.sh.in	28 Sep 2005 01:27:44 -0000
@@ -13,24 +13,38 @@
 
 aolserver_enable=NO
 aolserver_home=%%PREFIX%%/aolserver
-aolserver_conf=${aolserver_home}/nsd.tcl 
-aolserver_flags="-t ${aolserver_conf} -u nobody -g nobody"
-aolserver_prog=nsd8x
+aolserver_conf=${aolserver_home}/sample-config.tcl 
+aolserver_flags="-u nobody -g nobody"
+aolserver_prog=${aolserver_home}/bin/nsd
 
 . /etc/rc.subr
 
 name=aolserver
-rcvar=$(set_rcvar)
+load_rc_config ${name}
+pid=`ps -ax | grep ${aolserver_conf} | grep -v grep| awk -F' ' '{print $1}'`
+rcvar=`set_rcvar`
 required_files=${aolserver_conf}
-command=${aolserver_home}/bin/${aolserver_prog}
-procname=${aolserver_home}/bin/${aolserver_prog}
-
-stop_cmd="stop_cmd"
+command=${aolserver_prog}
+procname=${aolserver_prog}
 
-stop_cmd() {
-        ${command} ${aolserver_flags} -K
-}
+stop_cmd="if [ ! -z \"${pid}\" ] ; then \
+		echo \"Notice: stopping aolserver.... Kill -TERM ${pid}\" ; \
+		kill -TERM ${pid} ; \
+	else \
+		echo \"Notice: No aolserver process found. Nothing to stop.\" ; \
+	fi"
+start_cmd="if [ ! -z \"${pid}\" ] ; then \
+		echo \"Notice: aolserver is already running.\"; \
+	else \
+		echo \"Notice: starting aolserver.......\" ; \
+		echo \"Issuing command: ${command} -t ${aolserver_conf} ${aolserver_flags} \" ; \
+		${command} -t ${aolserver_conf} ${aolserver_flags}; \
+	fi"
+status_cmd="if [ ! -z \"${pid}\" ] ; then \
+		echo \"Notice: aolserver is running with pid ${pid}\" ; \
+	else \
+		echo \"Notice: aolserver is not running\" ; \
+	fi"
 
-load_rc_config ${name}
 run_rc_command "$1"
 
--- aolserver-4.0.10.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: flz 
State-Changed-When: Wed Sep 28 11:12:43 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

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