diff options
| author | mm <mm@FreeBSD.org> | 2010-03-26 06:38:33 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-03-26 06:38:33 +0800 |
| commit | c740f38dda35210c83c2e54f5364ff5524b5cdef (patch) | |
| tree | 8e778f2681753b08a94bd3f4a79dad7516768b95 /devel | |
| parent | 485f0bf55e972193b9af36764b7432a02552b532 (diff) | |
| download | freebsd-ports-gnome-c740f38dda35210c83c2e54f5364ff5524b5cdef.tar.gz freebsd-ports-gnome-c740f38dda35210c83c2e54f5364ff5524b5cdef.tar.zst freebsd-ports-gnome-c740f38dda35210c83c2e54f5364ff5524b5cdef.zip | |
- Fix CONFLICTS between icu3 and icu4
PR: ports/142910
Approved by: maintainer (timeout)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/icu/Makefile | 4 | ||||
| -rw-r--r-- | devel/icu4/Makefile | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile index 9aa46dc12bcb..7707bdb3e955 100644 --- a/devel/icu4/Makefile +++ b/devel/icu4/Makefile @@ -16,7 +16,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]* icu3-[0-9] +CONFLICTS= icu2-[0-9]* icu-3* LATEST_LINK= icu4 USE_LDCONFIG= yes |