ports/61412: [MAINTAINER] devel/ace: fix CONFLICTS

[Sergey Matveychuk]

>Number:         61412
>Category:       ports
>Synopsis:       [MAINTAINER] devel/ace: fix CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 16 00:00:34 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Fri Nov 21 07:47:47 MSK 2003
>Description:
[DESCRIBE CHANGES]
fix CONFLICTS: this port does not conflict with ace+tao-doc

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

--- ace-5.4.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/ace.orig/Makefile /usr/ports/devel/ace/Makefile
--- /usr/ports/devel/ace.orig/Makefile	Fri Jan 16 10:55:38 2004
+++ /usr/ports/devel/ace/Makefile	Fri Jan 16 10:33:19 2004
@@ -11,7 +11,7 @@
 
 COMMENT=	The Adaptive Communication Environment for C++
 
-CONFLICTS=	ace+tao-*
+CONFLICTS=	ace+tao-5*
 
 WITHOUT_TAO=	yes
 
--- ace-5.4.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: