aboutsummaryrefslogtreecommitdiff
path: root/devel/icu
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-03-25 22:38:33 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-03-25 22:38:33 +0000
commit775e3ee22a3520a527a4e368614bd96421e8ac4c (patch)
tree88ea2ab1e4af0d7b4767e87fc9caeec0d50becf4 /devel/icu
parent572049dc827a7f9850ba77afbe6cbb6caf0ccca3 (diff)
downloadports-775e3ee22a3520a527a4e368614bd96421e8ac4c.tar.gz
ports-775e3ee22a3520a527a4e368614bd96421e8ac4c.zip
- Fix CONFLICTS between icu3 and icu4
PR: ports/142910 Approved by: maintainer (timeout)
Notes
Notes: svn path=/head/; revision=251512
Diffstat (limited to 'devel/icu')
-rw-r--r--devel/icu/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 84bdfe5d63e9..703a8a4544ca 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icu
PORTVERSION= 3.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/ICU4C/${PORTVERSION}
DISTNAME= icu4c-${PORTVERSION:S/./_/g}
@@ -17,7 +17,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= International Components for Unicode (from IBM)
OPTIONS= THREADS "Build thread-safe version of the library" on
-CONFLICTS= icu2-[0-9]*
+CONFLICTS= icu2-[0-9]* icu-4*
USE_LDCONFIG= yes