- Update devel/icu to 4.6

- Deprecate devel/icu4

PR:             ports/152940

9 files changed, 261 insertions, 441 deletions

diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 280bbcf02a7b..31462b273237 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	icu
-PORTVERSION=	3.8.1
-PORTREVISION=	3
+PORTVERSION=	4.6
+
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/ICU4C/${PORTVERSION}
+MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
 DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	-src.tgz
 
@@ -17,7 +17,8 @@ MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	International Components for Unicode (from IBM)
 
 OPTIONS=	THREADS "Build thread-safe version of the library" on
-CONFLICTS=	icu2-[0-9]* icu-4*
+CONFLICTS=	icu2-[0-9]* icu-4.4*
+
 
 USE_LDCONFIG=		yes
 
@@ -29,8 +30,11 @@ CONFIGURE_ARGS+=	${OPSYS}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-samples=no
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
+MAKE_JOBS_SAFE=	yes
 
 USE_GMAKE=		yes
+INSTALL_TARGET=		install install-manx
 
 MAN1+=	derb.1
 MAN1+=	genbrk.1
@@ -45,39 +49,40 @@ MAN8+=	icupkg.8
 MAN8+=	genccode.8
 MAN8+=	gencmn.8
 MAN8+=	gensprep.8
-MAN8+=	genuca.8
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=1
-PLIST_SUB+=	ICUVER=${PORTVERSION}
+ICUMINOR=	${PORTVERSION:S/.//:E}
+.if ${ICUMINOR} == ""
+ICUMINOR=	0
+.endif
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=${ICUMINOR} ICUVER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${CC:T} == "cc"
-CFLAGS:=	${CFLAGS:N-funroll-loops:N-O*:N-*strict-aliasing} -O2 -fno-strict-aliasing
-.endif
-.if ${CXX:T} == "c++"
-CXXFLAGS:=	${CXXFLAGS:N-funroll-loops:N-O*:N-*strict-aliasing} -O2 -fno-strict-aliasing
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not install on sparc64: fails 3 iotests
 .endif
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
 .if defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads=no
 .else
 # This builds thread-safe, but not the thread-using version:
 CONFIGURE_ARGS+=	--enable-weak-threads
+.endif
+
 post-patch:
-	${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc
+.if defined(WITHOUT_THREADS)
+	@${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc
 .endif
+	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' ${WRKSRC}/Makefile.in
 
 iotest cintltst intltest:
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+	# Performing the ${.TARGET} test
 	-${GMAKE} -C ${WRKSRC}/test
 	cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \
 	    LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \
 	    ./${.TARGET}
-.endif
 
-post-build test: iotest cintltst intltest
+post-build test regression-test: iotest cintltst intltest
 
 .include <bsd.port.post.mk>
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 0f8fe7c770f0..c7e7e82a685b 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,2 @@
-MD5 (icu4c-3_8_1-src.tgz) = a827dbc9d909febd4ec39b90386868ba
-SHA256 (icu4c-3_8_1-src.tgz) = 16dda09dff3f770e629313a4c50a82fee88baf87d89a3bb2a28806be07766cee
-SIZE (icu4c-3_8_1-src.tgz) = 10998841
+SHA256 (icu4c-4_6-src.tgz) = b5a1ada8127d8b79187f887903e34a87dbecea2659a139993bf81ad7309ddffc
+SIZE (icu4c-4_6-src.tgz) = 15543712
diff --git a/devel/icu/files/patch-cc-flags b/devel/icu/files/patch-cc-flags
index 7de91a1a6aa6..6ec0a470775d 100644
--- a/devel/icu/files/patch-cc-flags
+++ b/devel/icu/files/patch-cc-flags
@@ -1,18 +1,22 @@
---- runConfigureICU	Fri Jan 16 17:26:40 2004
-+++ runConfigureICU	Mon Nov 15 11:05:50 2004
-@@ -289,7 +289,7 @@
+--- ./runConfigureICU.orig	2010-08-30 21:24:42.000000000 +0200
++++ ./runConfigureICU	2010-12-08 14:02:08.891252920 +0100
+@@ -277,10 +277,10 @@
+         DEBUG_CXXFLAGS='-g -O0'
+         ;;
      *BSD)
 -        THE_OS="BSD"
-+        THE_OS="$platform"
 -        THE_COMP="the GNU C++"
 -        CC=gcc; export CC
 -        CXX=g++; export CXX
++        THE_OS="$plateform"
 +        CC=${CC:=cc}; export CC
 +        CXX=${CXX:=c++}; export CXX
-+        THE_COMP="`$CC -v | fgrep -i ver`" # works with icc and gcc at least
++        THE_COMP="`$CC -v | fgrep -i ver`"
+         DEBUG_CFLAGS='-g -O0'
+         DEBUG_CXFLAGS='-g -O0'
          ;;
-     QNX)
-@@ -358,12 +358,4 @@
+@@ -327,14 +327,6 @@
+ 
  if test $release -eq 1
  then
 -    if test "$RELEASE_CFLAGS" = ""
@@ -25,3 +29,4 @@
 -    fi
      if test "$RELEASE_CFLAGS" != ""
      then
+         CFLAGS="$CFLAGS $RELEASE_CFLAGS"
diff --git a/devel/icu/files/patch-format b/devel/icu/files/patch-format
deleted file mode 100644
index 817d4fb1733b..000000000000
--- a/devel/icu/files/patch-format
+++ /dev/null
@@ -1,210 +0,0 @@
-Fix self-test(s) breaking, when build happens on days with other than
-24-hours (such as when daylight saving time kicks in). See:
-
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=128521
-	http://www.icu-project.org/trac/ticket/6018
-
-Index: /icu/trunk/source/i18n/calendar.cpp
-===================================================================
---- i18n/calendar.cpp (revision 22978)
-+++ i18n/calendar.cpp (revision 23166)
-@@ -1,5 +1,5 @@
- /*
- *******************************************************************************
--* Copyright (C) 1997-2007, International Business Machines Corporation and    *
-+* Copyright (C) 1997-2008, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
- *******************************************************************************
-@@ -74,6 +74,12 @@
- 
- #if defined( U_DEBUG_CALSVC ) || defined (U_DEBUG_CAL)
-+
-+/** 
-+ * fldName was removed as a duplicate implementation. 
-+ * use  udbg_ services instead, 
-+ * which depend on include files and library from ../tools/ctestfw
-+ */
-+#include "unicode/udbgutil.h"
- #include <stdio.h>
--
- 
- /**
-@@ -83,12 +89,8 @@
- * @internal
- */
--#error fldName() has been removed. Please use udbg_ucal_fieldName()  from libctestfw instead. The following code might work.
--
--static const char* fldName(UCalendarDateFields f) {
--	const char *udbg_ucal_fieldName(int32_t fld);
--	return udbg_ucal_fieldName((int32_t)f);
--}
--
--
-+
-+const char* fldName(UCalendarDateFields f) {
-+	return udbg_enumName(UDBG_UCalendarDateFields, (int32_t)f);
-+}
- 
- #if UCAL_DEBUG_DUMP
-Index: /icu/trunk/source/i18n/reldtfmt.cpp
-===================================================================
---- i18n/reldtfmt.cpp (revision 22561)
-+++ i18n/reldtfmt.cpp (revision 23166)
-@@ -1,5 +1,5 @@
- /*
- *******************************************************************************
--* Copyright (C) 2007, International Business Machines Corporation and    *
-+* Copyright (C) 2007-2008, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
- *******************************************************************************
-@@ -304,8 +304,13 @@
-         return 0;
-     }
--    // TODO: Cache the nowCal to avoid heap allocs?
-+    // TODO: Cache the nowCal to avoid heap allocs? Would be difficult, don't know the calendar type
-     Calendar *nowCal = cal.clone();
-     nowCal->setTime(Calendar::getNow(), status);
--    int32_t dayDiff = nowCal->fieldDifference(cal.getTime(status), Calendar::DATE, status);
-+
-+    // For the day difference, we are interested in the difference in the (modified) julian day number
-+    // which is midnight to midnight.  Using fieldDifference() is NOT correct here, because 
-+    // 6pm Jan 4th  to 10am Jan 5th should be considered "tomorrow".
-+    int32_t dayDiff = cal.get(UCAL_JULIAN_DAY, status) - nowCal->get(UCAL_JULIAN_DAY, status);
-+
-     delete nowCal;
-     return dayDiff;
-Index: /icu/trunk/source/test/intltest/dadrfmt.cpp
-===================================================================
---- test/intltest/dadrfmt.cpp (revision 22493)
-+++ test/intltest/dadrfmt.cpp (revision 23166)
-@@ -1,5 +1,5 @@
- /********************************************************************
-  * COPYRIGHT: 
-- * Copyright (c) 1997-2007, International Business Machines Corporation and
-+ * Copyright (c) 1997-2008, International Business Machines Corporation and
-  * others. All Rights Reserved.
-  ********************************************************************/
-@@ -94,4 +94,5 @@
-     UnicodeString kMILLIS("MILLIS="); // TODO: static
-     UnicodeString kRELATIVE_MILLIS("RELATIVE_MILLIS="); // TODO: static
-+    UnicodeString kRELATIVE_ADD("RELATIVE_ADD:"); // TODO: static
-     
-     UErrorCode status = U_ZERO_ERROR;
-@@ -170,5 +171,10 @@
-             }
-         }
--        
-+
-+        Calendar *cal = Calendar::createInstance(loc, status);
-+        if(U_FAILURE(status)) {
-+            errln("case %d: could not create calendar from %s", n, calLoc);
-+        }
-+
-         // parse 'date'
-         if(date.startsWith(kMILLIS)) {
-@@ -180,4 +186,28 @@
-             useDate = TRUE;
-             fromDate = udbg_stoi(millis) + now;
-+        } else if(date.startsWith(kRELATIVE_ADD)) {
-+            UnicodeString add = UnicodeString(date, kRELATIVE_ADD.length());  // "add" is a string indicating which fields to add
-+            if(fromSet.parseFrom(add, status)<0 || U_FAILURE(status)) {
-+                errln("case %d: could not parse date as RELATIVE_ADD calendar fields: %s", n, u_errorName(status));
-+                continue;
-+            }
-+            logln("Parsing ..\n");
-+            useDate=TRUE;
-+            cal->clear();
-+            cal->setTime(now, status);
-+            for (int q=0; q<UCAL_FIELD_COUNT; q++) {
-+                if (fromSet.isSet((UCalendarDateFields)q)) {
-+                    int32_t oldv = cal->get((UCalendarDateFields)q, status);
-+                    cal->add((UCalendarDateFields)q,
-+                                fromSet.get((UCalendarDateFields)q), status);
-+                    int32_t newv = cal->get((UCalendarDateFields)q, status);
-+                    logln("adding %d to %s ..went from %d to %d\n", fromSet.get((UCalendarDateFields)q), udbg_enumName(UDBG_UCalendarDateFields, q), oldv, newv);
-+                }
-+            }
-+            fromDate = cal->getTime(status);
-+            if(U_FAILURE(status)) {
-+                errln("case %d: could not apply date as RELATIVE_ADD calendar fields: %s", n, u_errorName(status));
-+                continue;
-+            }
-         } else if(fromSet.parseFrom(date, status)<0 || U_FAILURE(status)) {
-             errln("case %d: could not parse date as calendar fields: %s", n, u_errorName(status));
-@@ -185,8 +215,4 @@
-         }
-         
--        Calendar *cal = Calendar::createInstance(loc, status);
--        if(U_FAILURE(status)) {
--            errln("case %d: could not create calendar from %s", n, calLoc);
--        }
-         // now, do it.
-         if (fmt) {
-Index: /icu/trunk/source/test/testdata/format.txt
-===================================================================
---- test/testdata/format.txt (revision 22885)
-+++ test/testdata/format.txt (revision 23166)
-@@ -1,3 +1,3 @@
--// Copyright (c) 2007 International Business Machines
-+// Copyright (c) 2007-2008 International Business Machines
- // Corporation and others. All Rights Reserved.
- format:table(nofallback) {
-@@ -23,5 +23,8 @@
-             // locale: locale including calendar type
-             // spec:   either 'PATTERN=y mm h' etc, or 'DATE=SHORT,TIME=LONG'
--            // date:   either 'MILLIS=####' where #### is an unsigned long (millis), or a calendar spec ERA=0,YEAR=1, etc.. applied to the calendar type specified by the locale
-+            // date:   either 'MILLIS=####' where #### is millis,
-+            //        or a calendar spec ERA=0,YEAR=1, etc.. applied to the calendar type specified by the locale
-+            //        or RELATIVE_MILLIS=### where ### is a signed value which is added to the current millis
-+            //        or RELATIVE_ADD:DATE=1  which means that the field "DATE" will be added by +1 relative to current time
-             // str:   the expected unicode string
-             Cases { 
-@@ -61,5 +64,5 @@
-                     "en_US@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=86410000", // one day from now
-+                    "RELATIVE_ADD:DATE=1", // one day from now
-                     "Tomorrow"
-                },
-@@ -67,5 +70,5 @@
-                     "en_US@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=0", // one day before now
-+                    "RELATIVE_MILLIS=0", // today
-                     "Today"
-                },
-@@ -73,5 +76,5 @@
-                     "en_US@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=-86410000", // one day before now
-+                    "RELATIVE_ADD:DATE=-1", // one day before now
-                     "Yesterday"
-                },
-@@ -79,5 +82,5 @@
-                     "mt_MT@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=86410000", // one day from now
-+                    "RELATIVE_ADD:DATE=1", // one day from now
-                     "Għada"
-                },
-@@ -85,5 +88,5 @@
-                     "mt_MT@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=0", // one day before now
-+                    "RELATIVE_MILLIS=0", // today
-                     "Illum"
-                },
-@@ -91,5 +94,5 @@
-                     "mt_MT@calendar=gregorian",         
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=-86410000", // one day before now
-+                    "RELATIVE_ADD:DATE=-1", // one day before now
-                     "Lbieraħ"
-                },
-@@ -97,5 +100,5 @@
-                     "ru",
-                     "DATE=RELATIVE_SHORT",
--                    "RELATIVE_MILLIS=-172810000", // 2 days ago
-+                    "RELATIVE_ADD:DATE=-2", // 2 days ago
-                     "Позавчера"
-                },
diff --git a/devel/icu/files/patch-layoutex_ParagraphLayout.cpp b/devel/icu/files/patch-layoutex_ParagraphLayout.cpp
deleted file mode 100644
index 7f58b493140a..000000000000
--- a/devel/icu/files/patch-layoutex_ParagraphLayout.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
---- layoutex/ParagraphLayout.bak	2009-10-15 21:21:15.000000000 +0200
-+++ layoutex/ParagraphLayout.cpp	2009-10-15 21:22:44.000000000 +0200
-@@ -813,7 +813,7 @@
- 
-     return nullLanguageCode;
- }
--#elif
-+#else
- 
- // TODO - dummy implementation for right now...
- le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
-
-
diff --git a/devel/icu/files/patch-putil b/devel/icu/files/patch-putil
deleted file mode 100644
index f102043ddb96..000000000000
--- a/devel/icu/files/patch-putil
+++ /dev/null
@@ -1,9 +0,0 @@
---- common/putil.c	2007-12-12 13:57:26.000000000 -0500
-+++ common/putil.c	2008-01-28 13:04:02.000000000 -0500
-@@ -577,5 +577,5 @@
- /* These platforms are likely to use Olson timezone IDs. */
- #define CHECK_LOCALTIME_LINK 1
--#if defined(U_LINUX)
-+#if defined(U_LINUX) || defined(U_BSD)
- #define TZDEFAULT       "/etc/localtime"
- #define TZZONEINFO      "/usr/share/zoneinfo/"
diff --git a/devel/icu/pkg-descr b/devel/icu/pkg-descr
index 917de707e9a0..e351fe587c29 100644
--- a/devel/icu/pkg-descr
+++ b/devel/icu/pkg-descr
@@ -4,8 +4,4 @@ normalization, transliteration, etc.).
 
 More information on ICU can be found on the homepage
 
-WWW: http://icu.sourceforge.net/
-WWW: http://ibm.com/software/globalization/icu
-
-- Bjoern A. Zeeb
-bzeeb+freebsdports@zabbadoz.net
+WWW: http://site.icu-project.org/
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 2b9df0bd0602..d3303e19febc 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -1,187 +1,233 @@
-bin/derb
-bin/genbrk
-bin/gencnval
-bin/genctd
-bin/genrb
-bin/icu-config
-bin/makeconv
-bin/pkgdata
-bin/uconv
-sbin/genccode
-sbin/gencmn
-sbin/gensprep
-sbin/genuca
 sbin/icupkg
-sbin/icuswap
-include/layout/LEFontInstance.h
-include/layout/LEGlyphFilter.h
-include/layout/LEGlyphStorage.h
-include/layout/LEInsertionList.h
-include/layout/LELanguages.h
-include/layout/LEScripts.h
-include/layout/LESwaps.h
-include/layout/LETypes.h
-include/layout/LayoutEngine.h
-include/layout/ParagraphLayout.h
-include/layout/RunArrays.h
-include/layout/loengine.h
-@dirrm include/layout
-include/unicode/basictz.h
-include/unicode/brkiter.h
-include/unicode/calendar.h
-include/unicode/caniter.h
-include/unicode/chariter.h
-include/unicode/choicfmt.h
-include/unicode/coleitr.h
-include/unicode/coll.h
-include/unicode/curramt.h
-include/unicode/currunit.h
-include/unicode/datefmt.h
-include/unicode/dbbi.h
-include/unicode/dcfmtsym.h
-include/unicode/decimfmt.h
-include/unicode/docmain.h
-include/unicode/dtfmtsym.h
-include/unicode/dtptngen.h
-include/unicode/dtrule.h
-include/unicode/fieldpos.h
-include/unicode/fmtable.h
-include/unicode/format.h
-include/unicode/gregocal.h
-include/unicode/locid.h
-include/unicode/measfmt.h
-include/unicode/measunit.h
-include/unicode/measure.h
-include/unicode/msgfmt.h
-include/unicode/normlzr.h
-include/unicode/numfmt.h
-include/unicode/parseerr.h
-include/unicode/parsepos.h
-include/unicode/platform.h
-include/unicode/ppalmos.h
-include/unicode/putil.h
-include/unicode/pwin32.h
-include/unicode/rbbi.h
-include/unicode/rbnf.h
-include/unicode/rbtz.h
-include/unicode/regex.h
-include/unicode/rep.h
-include/unicode/resbund.h
-include/unicode/schriter.h
-include/unicode/search.h
-include/unicode/simpletz.h
-include/unicode/smpdtfmt.h
-include/unicode/sortkey.h
-include/unicode/strenum.h
-include/unicode/stsearch.h
-include/unicode/symtable.h
-include/unicode/tblcoll.h
-include/unicode/timezone.h
-include/unicode/translit.h
-include/unicode/tzrule.h
-include/unicode/tztrans.h
-include/unicode/ubidi.h
-include/unicode/ubrk.h
-include/unicode/ucal.h
-include/unicode/ucasemap.h
-include/unicode/ucat.h
-include/unicode/uchar.h
-include/unicode/uchriter.h
-include/unicode/uclean.h
-include/unicode/ucnv.h
-include/unicode/ucnv_cb.h
-include/unicode/ucnv_err.h
-include/unicode/ucol.h
-include/unicode/ucoleitr.h
-include/unicode/uconfig.h
-include/unicode/ucsdet.h
-include/unicode/ucurr.h
-include/unicode/udat.h
-include/unicode/udata.h
-include/unicode/udatpg.h
-include/unicode/udeprctd.h
-include/unicode/udraft.h
-include/unicode/uenum.h
-include/unicode/uidna.h
-include/unicode/uintrnal.h
-include/unicode/uiter.h
-include/unicode/uloc.h
-include/unicode/ulocdata.h
-include/unicode/umachine.h
-include/unicode/umisc.h
-include/unicode/umsg.h
-include/unicode/unifilt.h
-include/unicode/unifunct.h
-include/unicode/unimatch.h
-include/unicode/unirepl.h
-include/unicode/uniset.h
-include/unicode/unistr.h
-include/unicode/unorm.h
-include/unicode/unum.h
-include/unicode/uobject.h
-include/unicode/uobslete.h
-include/unicode/uregex.h
-include/unicode/urename.h
-include/unicode/urep.h
-include/unicode/ures.h
-include/unicode/uscript.h
-include/unicode/usearch.h
-include/unicode/uset.h
-include/unicode/usetiter.h
-include/unicode/ushape.h
-include/unicode/usprep.h
-include/unicode/ustdio.h
-include/unicode/ustream.h
-include/unicode/ustring.h
-include/unicode/usystem.h
-include/unicode/utext.h
-include/unicode/utf.h
-include/unicode/utf16.h
-include/unicode/utf32.h
-include/unicode/utf8.h
-include/unicode/utf_old.h
-include/unicode/utmscale.h
-include/unicode/utrace.h
-include/unicode/utrans.h
-include/unicode/utypes.h
-include/unicode/uversion.h
-include/unicode/vtzone.h
-@dirrm include/unicode
-lib/icu/%%ICUVER%%/Makefile.inc
-lib/icu/current
-lib/icu/Makefile.inc
-lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicudata.so
-lib/libicudata.so.%%ICUMAJOR%%
+sbin/gensprep
+sbin/gennorm2
+sbin/gencmn
+sbin/genccode
 lib/libsicuuc.a
+lib/libsicutu.a
+lib/libsicutest.a
+lib/libsiculx.a
+lib/libsicule.a
+lib/libsicuio.a
+lib/libsicui18n.a
+lib/libsicudata.a
 lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
-lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicui18n.so
-lib/libicui18n.so.%%ICUMAJOR%%
-lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicule.so
-lib/libicule.so.%%ICUMAJOR%%
-lib/libsiculx.a
+lib/libicuuc.so
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutu.so.%%ICUMAJOR%%
+lib/libicutu.so
+lib/libicutest.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicutest.so.%%ICUMAJOR%%
+lib/libicutest.so
 lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
-lib/libsicuio.a
+lib/libiculx.so
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicule.so.%%ICUMAJOR%%
+lib/libicule.so
 lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
-lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
-lib/libicutu.so.%%ICUMAJOR%%
-lib/libicutu.so
-%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+lib/libicuio.so
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicui18n.so.%%ICUMAJOR%%
+lib/libicui18n.so
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
+lib/libicudata.so.%%ICUMAJOR%%
+lib/libicudata.so
+lib/icu/pkgdata.inc
+lib/icu/current
+lib/icu/Makefile.inc
+lib/icu/%%ICUVER%%/pkgdata.inc
+lib/icu/%%ICUVER%%/Makefile.inc
+libdata/pkgconfig/icu-io.pc
+libdata/pkgconfig/icu-le.pc
+libdata/pkgconfig/icu-i18n.pc
+libdata/pkgconfig/icu-lx.pc
+libdata/pkgconfig/icu-uc.pc
+include/unicode/vtzone.h
+include/unicode/uversion.h
+include/unicode/uvernum.h
+include/unicode/utypes.h
+include/unicode/utrans.h
+include/unicode/utrace.h
+include/unicode/utmscale.h
+include/unicode/utf_old.h
+include/unicode/utf8.h
+include/unicode/utf32.h
+include/unicode/utf16.h
+include/unicode/utf.h
+include/unicode/utext.h
+include/unicode/usystem.h
+include/unicode/ustring.h
+include/unicode/ustream.h
+include/unicode/ustdio.h
+include/unicode/usprep.h
+include/unicode/uspoof.h
+include/unicode/ushape.h
+include/unicode/usetiter.h
+include/unicode/uset.h
+include/unicode/usearch.h
+include/unicode/uscript.h
+include/unicode/ures.h
+include/unicode/urep.h
+include/unicode/urename.h
+include/unicode/uregex.h
+include/unicode/uobslete.h
+include/unicode/uobject.h
+include/unicode/unum.h
+include/unicode/unorm2.h
+include/unicode/unorm.h
+include/unicode/unistr.h
+include/unicode/uniset.h
+include/unicode/unirepl.h
+include/unicode/unimatch.h
+include/unicode/unifunct.h
+include/unicode/unifilt.h
+include/unicode/umsg.h
+include/unicode/umisc.h
+include/unicode/umachine.h
+include/unicode/ulocdata.h
+include/unicode/uloc.h
+include/unicode/uldnames.h
+include/unicode/uiter.h
+include/unicode/uintrnal.h
+include/unicode/uidna.h
+include/unicode/uenum.h
+include/unicode/udraft.h
+include/unicode/udeprctd.h
+include/unicode/udatpg.h
+include/unicode/udata.h
+include/unicode/udat.h
+include/unicode/ucurr.h
+include/unicode/ucsdet.h
+include/unicode/uconfig.h
+include/unicode/ucoleitr.h
+include/unicode/ucol.h
+include/unicode/ucnvsel.h
+include/unicode/ucnv_err.h
+include/unicode/ucnv_cb.h
+include/unicode/ucnv.h
+include/unicode/uclean.h
+include/unicode/uchriter.h
+include/unicode/uchar.h
+include/unicode/ucat.h
+include/unicode/ucasemap.h
+include/unicode/ucal.h
+include/unicode/ubrk.h
+include/unicode/ubidi.h
+include/unicode/tztrans.h
+include/unicode/tzrule.h
+include/unicode/translit.h
+include/unicode/tmutfmt.h
+include/unicode/tmutamt.h
+include/unicode/tmunit.h
+include/unicode/timezone.h
+include/unicode/tblcoll.h
+include/unicode/symtable.h
+include/unicode/stsearch.h
+include/unicode/stringpiece.h
+include/unicode/strenum.h
+include/unicode/std_string.h
+include/unicode/sortkey.h
+include/unicode/smpdtfmt.h
+include/unicode/simpletz.h
+include/unicode/selfmt.h
+include/unicode/search.h
+include/unicode/schriter.h
+include/unicode/resbund.h
+include/unicode/rep.h
+include/unicode/regex.h
+include/unicode/rbtz.h
+include/unicode/rbnf.h
+include/unicode/rbbi.h
+include/unicode/pwin32.h
+include/unicode/putil.h
+include/unicode/ptypes.h
+include/unicode/ppalmos.h
+include/unicode/plurrule.h
+include/unicode/plurfmt.h
+include/unicode/platform.h
+include/unicode/parsepos.h
+include/unicode/parseerr.h
+include/unicode/numsys.h
+include/unicode/numfmt.h
+include/unicode/normlzr.h
+include/unicode/normalizer2.h
+include/unicode/msgfmt.h
+include/unicode/measure.h
+include/unicode/measunit.h
+include/unicode/measfmt.h
+include/unicode/locid.h
+include/unicode/locdspnm.h
+include/unicode/localpointer.h
+include/unicode/idna.h
+include/unicode/icuplug.h
+include/unicode/icudataver.h
+include/unicode/gregocal.h
+include/unicode/fpositer.h
+include/unicode/format.h
+include/unicode/fmtable.h
+include/unicode/fieldpos.h
+include/unicode/errorcode.h
+include/unicode/dtrule.h
+include/unicode/dtptngen.h
+include/unicode/dtitvinf.h
+include/unicode/dtitvfmt.h
+include/unicode/dtintrv.h
+include/unicode/dtfmtsym.h
+include/unicode/docmain.h
+include/unicode/decimfmt.h
+include/unicode/dcfmtsym.h
+include/unicode/dbbi.h
+include/unicode/datefmt.h
+include/unicode/currunit.h
+include/unicode/currpinf.h
+include/unicode/curramt.h
+include/unicode/colldata.h
+include/unicode/coll.h
+include/unicode/coleitr.h
+include/unicode/choicfmt.h
+include/unicode/chariter.h
+include/unicode/caniter.h
+include/unicode/calendar.h
+include/unicode/bytestream.h
+include/unicode/brkiter.h
+include/unicode/bmsearch.h
+include/unicode/bms.h
+include/unicode/basictz.h
+include/layout/plruns.h
+include/layout/playout.h
+include/layout/loengine.h
+include/layout/RunArrays.h
+include/layout/ParagraphLayout.h
+include/layout/LayoutEngine.h
+include/layout/LETypes.h
+include/layout/LESwaps.h
+include/layout/LEScripts.h
+include/layout/LELanguages.h
+include/layout/LEInsertionList.h
+include/layout/LEGlyphStorage.h
+include/layout/LEGlyphFilter.h
+include/layout/LEFontInstance.h
+bin/uconv
+bin/pkgdata
+bin/makeconv
+bin/icuinfo
+bin/icu-config
+bin/genrb
+bin/genctd
+bin/gencnval
+bin/gencfu
+bin/genbrk
+bin/derb
 %%DATADIR%%/%%ICUVER%%/mkinstalldirs
 %%DATADIR%%/%%ICUVER%%/license.html
+%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+@dirrm lib/icu/%%ICUVER%%
+@dirrm lib/icu
+@dirrm include/unicode
+@dirrm include/layout
 @dirrm %%DATADIR%%/%%ICUVER%%/config
 @dirrm %%DATADIR%%/%%ICUVER%%
 @dirrm %%DATADIR%%
-@dirrm lib/icu/%%ICUVER%%
-@dirrm lib/icu
diff --git a/devel/icu4/Makefile b/devel/icu4/Makefile
index ff507951fb25..dba8d34763c2 100644
--- a/devel/icu4/Makefile
+++ b/devel/icu4/Makefile
@@ -13,11 +13,13 @@ MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
 DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	-src.tgz
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	International Components for Unicode (from IBM)
 
+DEPRECATED=	devel/icu is now following 4.x version
+
 OPTIONS=	THREADS "Build thread-safe version of the library" on
-CONFLICTS=	icu2-[0-9]* icu-3*
+CONFLICTS=	icu2-[0-9]* icu-4.6*
 LATEST_LINK=	icu4
 
 USE_LDCONFIG=	yes