From ruben@helium.verweg.com  Wed Apr 30 10:18:16 2008
Return-Path: <ruben@helium.verweg.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D4E310656B6
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Apr 2008 10:18:16 +0000 (UTC)
	(envelope-from ruben@helium.verweg.com)
Received: from helium.verweg.com (tunnel41.ipv6.xs4all.nl [IPv6:2001:888:10:29::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 885648FC22
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Apr 2008 10:18:15 +0000 (UTC)
	(envelope-from ruben@helium.verweg.com)
Received: from helium.verweg.com (ruben@localhost.verweg.com [127.0.0.1])
	by helium.verweg.com (8.14.2/8.14.1) with ESMTP id m3UAI92e007782
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Apr 2008 12:18:14 +0200 (CEST)
	(envelope-from ruben@helium.verweg.com)
Received: (from ruben@localhost)
	by helium.verweg.com (8.14.2/8.14.1/Submit) id m3UAI9Ft007781;
	Wed, 30 Apr 2008 12:18:09 +0200 (CEST)
	(envelope-from ruben)
Message-Id: <200804301018.m3UAI9Ft007781@helium.verweg.com>
Date: Wed, 30 Apr 2008 12:18:09 +0200 (CEST)
From: Ruben van Staveren <ruben@verweg.com>
Reply-To: Ruben van Staveren <ruben@verweg.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: let mu-conference honour different pid file location
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         123254
>Category:       ports
>Synopsis:       let net-im/mu-conference honour different pid file location
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 30 10:20:02 UTC 2008
>Closed-Date:    Wed Apr 30 14:41:25 UTC 2008
>Last-Modified:  Wed Apr 30 14:41:25 UTC 2008
>Originator:     Ruben van Staveren
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD helium.verweg.com 7.0-STABLE FreeBSD 7.0-STABLE #21: Tue Apr 22 12:41:05 CEST 2008 root@helium.verweg.com:/usr/obj/usr/cvsup/7-stable/src/sys/HELIUM-SMP i386


	
>Description:
	etc/rc.d/mu-conference sets pidfile before the rc.d configuration is read, making it a non operation
>How-To-Repeat:
	set pidfile location in rc.conf and see that it is not honoured
>Fix:

move pidfile stuff after rc configuration loading


diff -Nur mu-conference.orig/files/mu-conference.in mu-conference/files/mu-conference.in
--- mu-conference.orig/files/mu-conference.in	2008-04-30 11:20:23.000000000 +0200
+++ mu-conference/files/mu-conference.in	2008-04-30 11:21:24.000000000 +0200
@@ -25,7 +25,6 @@
 rcvar=`set_rcvar`
 
 command="%%PREFIX%%/bin/mu-conference"
-pidfile=${mu_conference_pidfile:-"%%JABBER_PIDDIR%%/mu-conference.pid"}
 
 stop_postcmd="mu_conference_stop_post"
 
@@ -38,7 +37,9 @@
 : ${mu_conference_config="%%PREFIX%%/etc/muc.xml"}
 : ${mu_conference_enable="NO"}
 : ${mu_conference_user="%%JABBER_USER%%"}
+: ${mu_conference_pidfile="%%JABBER_PIDDIR%%/mu-conference.pid"}
 
+pidfile=${mu_conference_pidfile}
 command_args="-c ${mu_conference_config} -B >/dev/null 2>&1"
 
 run_rc_command "$1"

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 30 10:27:26 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123254: commit references a PR
Date: Wed, 30 Apr 2008 14:03:39 +0000 (UTC)

 mm          2008-04-30 14:03:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/mu-conference Makefile 
     net-im/mu-conference/files mu-conference.in 
   Log:
   - fix pidfile variable for rc
   
   PR:             ports/123254
   Submitted by:   Ruben van Staveren <ruben@verweg.com>
   Approved by:    mm (maintainer)
   
   Revision  Changes    Path
   1.8       +1 -1      ports/net-im/mu-conference/Makefile
   1.2       +3 -2      ports/net-im/mu-conference/files/mu-conference.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mm 
State-Changed-When: Wed Apr 30 14:41:24 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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