From uspoerlein@gmail.com  Fri Mar 20 07:29:18 2009
Return-Path: <uspoerlein@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C2B810657C0;
	Fri, 20 Mar 2009 07:29:18 +0000 (UTC)
	(envelope-from uspoerlein@gmail.com)
Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net [IPv6:2a01:198:200:2a::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C4278FC20;
	Fri, 20 Mar 2009 07:29:17 +0000 (UTC)
	(envelope-from uspoerlein@gmail.com)
Received: from coyote.spoerlein.net (e180137063.adsl.alicedsl.de [85.180.137.63])
	by acme.spoerlein.net (8.14.3/8.14.3) with ESMTP id n2K7TFIS031111
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Fri, 20 Mar 2009 08:29:16 +0100 (CET)
	(envelope-from uspoerlein@gmail.com)
Received: from coyote.spoerlein.net (localhost [127.0.0.1])
	by coyote.spoerlein.net (8.14.3/8.14.3) with ESMTP id n2K7TCUG050745
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Fri, 20 Mar 2009 08:29:13 +0100 (CET)
	(envelope-from uqs@coyote.spoerlein.net)
Received: (from uqs@localhost)
	by coyote.spoerlein.net (8.14.3/8.14.3/Submit) id n2K7TBB6050744;
	Fri, 20 Mar 2009 08:29:11 +0100 (CET)
	(envelope-from uqs)
Message-Id: <200903200729.n2K7TBB6050744@coyote.spoerlein.net>
Date: Fri, 20 Mar 2009 08:29:11 +0100 (CET)
From: Ulrich Spoerlein <uspoerlein@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mm@freebsd.org, shaun@freebsd.org
Subject: [PATCH] Chase net-im/ejabberd update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         132843
>Category:       ports
>Synopsis:       [PATCH] Chase net-im/ejabberd update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 20 07:30:01 UTC 2009
>Closed-Date:    Sun May 24 19:11:05 UTC 2009
>Last-Modified:  Sun May 24 19:11:05 UTC 2009
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
>Environment:
>Description:
The new ejabberd comes without an 'ejabberd' binary, breaking the installation of
at least three ports that can depend on it. Fix the DEPENDS lines

PS: mu-conference is not using tabs, but I kept the current style.
>How-To-Repeat:
>Fix:

Index: net-im/jabber-pyicq/Makefile
===================================================================
RCS file: /tank/ncvs/ports/net-im/jabber-pyicq/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- net-im/jabber-pyicq/Makefile	26 Feb 2009 15:34:59 -0000	1.29
+++ net-im/jabber-pyicq/Makefile	20 Mar 2009 07:26:46 -0000
@@ -63,7 +63,7 @@ JABBER_REQUIRE?=	ejabberd
 JABBER_USER?=		ejabberd
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
-RUN_DEPENDS+=		ejabberd:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=		ejabberdctl:${PORTSDIR}/net-im/ejabberd
 .else
 JABBER_REQUIRE?=	DAEMON
 JABBER_USER?=		nobody
Index: net-im/jabber-pymsn/Makefile
===================================================================
RCS file: /tank/ncvs/ports/net-im/jabber-pymsn/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- net-im/jabber-pymsn/Makefile	6 Aug 2008 13:35:20 -0000	1.26
+++ net-im/jabber-pymsn/Makefile	20 Mar 2009 07:26:51 -0000
@@ -62,7 +62,7 @@ JABBER_REQUIRE?=	ejabberd
 JABBER_USER?=		ejabberd
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
-RUN_DEPENDS+=		ejabberd:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=		ejabberdctl:${PORTSDIR}/net-im/ejabberd
 .else
 JABBER_REQUIRE?=	DAEMON
 JABBER_USER?=		nobody
Index: net-im/mu-conference/Makefile
===================================================================
RCS file: /tank/ncvs/ports/net-im/mu-conference/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- net-im/mu-conference/Makefile	6 Jun 2008 13:51:49 -0000	1.9
+++ net-im/mu-conference/Makefile	20 Mar 2009 07:26:55 -0000
@@ -62,7 +62,7 @@ JABBER_REQUIRE?=        ejabberd
 JABBER_USER?=           ejabberd
 JABBER_PIDDIR?=         /var/jabberd/pid
 JABBER_SPOOLDIR?=       /var/spool/jabber
-RUN_DEPENDS+=           ejabberd:${PORTSDIR}/net-im/ejabberd
+RUN_DEPENDS+=           ejabberdctl:${PORTSDIR}/net-im/ejabberd
 .else
 JABBER_REQUIRE?=        DAEMON
 JABBER_USER?=           nobody
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->shaun 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 20 11:32:02 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132843 
Responsible-Changed-From-To: shaun->mm 
Responsible-Changed-By: shaun 
Responsible-Changed-When: Fri Mar 20 14:37:16 UTC 2009 
Responsible-Changed-Why:  
Over to mm as they're his ports. 

I'm currently investigating why the 'ejabberd' script was removed, but 
it's probably better to depend on an "official" file anyway. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132843: commit references a PR
Date: Sun, 24 May 2009 19:08:50 +0000 (UTC)

 mm          2009-05-24 19:08:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/jabber-pyicq  Makefile 
     net-im/jabber-pymsn  Makefile 
     net-im/mu-conference Makefile 
   Log:
   - Fix dependency for WITH_EJABBERD option
   
   PR:             ports/132843
   Submitted by:   Ulrich Spoerlein <uspoerlein@gmail.com>
   
   Revision  Changes    Path
   1.30      +1 -1      ports/net-im/jabber-pyicq/Makefile
   1.27      +1 -1      ports/net-im/jabber-pymsn/Makefile
   1.12      +1 -1      ports/net-im/mu-conference/Makefile
 _______________________________________________
 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: Sun May 24 19:11:05 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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