From nobody@FreeBSD.org  Wed May  9 17:05:00 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 19A3D16A402
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 May 2007 17:05:00 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 0900113C48C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  9 May 2007 17:05:00 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l49H4xoE025440
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 9 May 2007 17:04:59 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l49Gxver020035;
	Wed, 9 May 2007 16:59:57 GMT
	(envelope-from nobody)
Message-Id: <200705091659.l49Gxver020035@www.freebsd.org>
Date: Wed, 9 May 2007 16:59:57 GMT
From: Nikolay Pavlov<quetzal@zone3000.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: net-im/wildfire
X-Send-Pr-Version: www-3.0

>Number:         112549
>Category:       ports
>Synopsis:       Update port: net-im/wildfire
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 09 17:10:05 GMT 2007
>Closed-Date:    Sun Jun 10 12:53:11 GMT 2007
>Last-Modified:  Sun Jun 10 13:00:08 GMT 2007
>Originator:     Nikolay Pavlov
>Release:        6.1-RELEASE-p10
>Organization:
zone3000.net
>Environment:
FreeBSD viking.zone3000.net 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #3: Tue Oct  3 20:48:20 EEST 2006     root@viking.zone3000.net:/usr/obj/usr/src/sys/VIKING  amd64
>Description:
The CONFLICTS field was added due to new port for net-im/openfire
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urd wildfire/Makefile wildfire.new/Makefile
--- wildfire/Makefile	Mon Apr 16 14:41:58 2007
+++ wildfire.new/Makefile	Wed May  9 19:23:38 2007
@@ -15,14 +15,15 @@
 COMMENT=	Openfire (formerly Wildfire) is an enterprise instant messaging server
 
 RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper
+
+USE_ANT= yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 
-USE_ANT=	yes
+CONFLICTS= openfire-[0-9]*
 
-USE_RC_SUBR=	wildfire
 ALL_TARGET=	wildfire
-
+USE_RC_SUBR=	wildfire
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_src

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed May 9 17:16:22 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112549 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Jun 10 12:53:10 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112549: commit references a PR
Date: Sun, 10 Jun 2007 12:52:55 +0000 (UTC)

 miwi        2007-06-10 12:52:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/wildfire      Makefile 
   Log:
   - Set CONFLICTS with openfire
   
   PR:             112549
   Submitted by:   Nikolay Pavlov<quetzal@zone3000.net> (maintainer)
   
   Revision  Changes    Path
   1.6       +4 -3      ports/net-im/wildfire/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"
 
>Unformatted:
