summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-01-16 17:59:46 +0000
committerClement Laforet <clement@FreeBSD.org>2004-01-16 17:59:46 +0000
commit626af8301e7b734d81b682b3b2c65ebe24f78ead (patch)
treee69bf2c8dcacc0baed84ed26c01631a72ae123e6 /devel
parent- Upodate to 1.3 (diff)
- Fix CONFLICTS
PR: 61412 Submitted by: Sergey Matveychuk <sem@ciam.ru> (maintainer) Approved by: erwin (mentor) (implicitly)
Diffstat (limited to 'devel')
-rw-r--r--devel/ace/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index 912726843914..b2930bb90c11 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=
COMMENT= The Adaptive Communication Environment for C++
-CONFLICTS= ace+tao-*
+CONFLICTS= ace+tao-5*
WITHOUT_TAO= yes