port-update: icu2

	IBM has released a new version of ICU.

	Major changes can be found at
	http://oss.software.ibm.com/icu/download/2.6/

PR:		ports/53347
Submitted by:	Bjoern A. Zeeb <bzeeb+freebsdports@zabbadoz.net>
Approved by:	maintainer timeout

4 files changed, 60 insertions, 47 deletions

diff --git a/devel/icu2/Makefile b/devel/icu2/Makefile
index d1c78eede821..db03c1243038 100644
--- a/devel/icu2/Makefile
+++ b/devel/icu2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	icu2
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	devel
-MASTER_SITES=	http://oss.software.ibm.com/icu/download/${PORTVERSION}/
+MASTER_SITES=	ftp://www-126.ibm.com/pub/icu/${PORTVERSION}/
 DISTNAME=	icu-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
@@ -27,7 +26,7 @@ INSTALL_WRKSRC=		${ICUWRKSRC}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	runConfigureICU
-CONFIGURE_ARGS=		FreeBSD
+CONFIGURE_ARGS+=	FreeBSD
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-samples=no --enable-tests=no
@@ -49,6 +48,7 @@ MAN5+=	convrtrs.txt.5
 MAN8+=	decmn.8
 MAN8+=	genccode.8
 MAN8+=	gencmn.8
+MAN8+=	genidna.8
 MAN8+=	gennames.8
 MAN8+=	gennorm.8
 MAN8+=	genprops.8
diff --git a/devel/icu2/distinfo b/devel/icu2/distinfo
index 6398c2897492..4ba4ed044dd6 100644
--- a/devel/icu2/distinfo
+++ b/devel/icu2/distinfo
@@ -1 +1 @@
-MD5 (icu-2.4.tgz) = 77d56e4dca9ec0fd635151ce1dc72137
+MD5 (icu-2.6.tgz) = 6d316b8a95fec8fb708b38dc2b62aa83
diff --git a/devel/icu2/files/patch-aa b/devel/icu2/files/patch-aa
index 2b7a697aa056..158a177fe35d 100644
--- a/devel/icu2/files/patch-aa
+++ b/devel/icu2/files/patch-aa
@@ -1,21 +1,18 @@
---- source/Makefile.in.orig	Wed Jul 24 22:44:02 2002
-+++ source/Makefile.in	Fri Oct 25 18:00:54 2002
-@@ -132,7 +132,8 @@
- 	$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
- 	$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
- 	$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/README
--	$(INSTALL_PROGRAM) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
-+	cp $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
-+	chmod 0555 $(DESTDIR)$(bindir)/icu-config
- 
- ifeq ($(DOXYGEN),)
- install-doc:
-@@ -180,7 +181,7 @@
+--- source/Makefile.in.orig	Mon Jun  9 04:38:48 2003
++++ source/Makefile.in	Sat Jun 14 23:07:14 2003
+@@ -180,12 +180,14 @@
  
  $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
  	-$(RMV) $@
 -	$(INSTALL_DATA) $(top_srcdir)/config/icu-config-top $@
-+	cp $(top_srcdir)/config/icu-config-top $@
++	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
++	@chmod u+w $@
  	@echo "# Following from @platform_make_fragment@" >> $@
  	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
  	sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
+ 	cat $(top_srcdir)/config/icu-config-bottom >> $@
+ 	echo "# Rebuilt on "`date` >> $@
++	@chmod u-w $@
+ 
+ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uversion.h
+ 	@echo
diff --git a/devel/icu2/pkg-plist b/devel/icu2/pkg-plist
index 287bc8ea7c0e..f572580eab6c 100644
--- a/devel/icu2/pkg-plist
+++ b/devel/icu2/pkg-plist
@@ -7,11 +7,24 @@ bin/genrb
 bin/makeconv
 bin/pkgdata
 bin/uconv
-include/unicode/bidi.h
+include/layout/ArabicLayoutEngine.h
+include/layout/GXLayoutEngine.h
+include/layout/HanLayoutEngine.h
+include/layout/IndicLayoutEngine.h
+include/layout/LayoutEngine.h
+include/layout/OpenTypeLayoutEngine.h
+include/layout/ThaiLayoutEngine.h
+include/layout/LEFontInstance.h
+include/layout/LEGlyphFilter.h
+include/layout/LELanguages.h
+include/layout/LEScripts.h
+include/layout/LESwaps.h
+include/layout/LETypes.h
+include/layout/ParagraphLayout.h
+include/layout/RunArrays.h
 include/unicode/brkiter.h
 include/unicode/caniter.h
 include/unicode/chariter.h
-include/unicode/convert.h
 include/unicode/dbbi.h
 include/unicode/docmain.h
 include/unicode/locid.h
@@ -44,7 +57,6 @@ include/unicode/uiter.h
 include/unicode/uloc.h
 include/unicode/umachine.h
 include/unicode/umisc.h
-include/unicode/unicode.h
 include/unicode/unifilt.h
 include/unicode/unifunct.h
 include/unicode/unimatch.h
@@ -71,7 +83,6 @@ include/unicode/calendar.h
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
 include/unicode/coll.h
-include/unicode/cpdtrans.h
 include/unicode/datefmt.h
 include/unicode/dcfmtsym.h
 include/unicode/decimfmt.h
@@ -80,12 +91,9 @@ include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
 include/unicode/gregocal.h
-include/unicode/hextouni.h
 include/unicode/msgfmt.h
-include/unicode/nultrans.h
 include/unicode/numfmt.h
 include/unicode/rbnf.h
-include/unicode/rbt.h
 include/unicode/search.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
@@ -102,30 +110,49 @@ include/unicode/udat.h
 include/unicode/umsg.h
 include/unicode/unifltlg.h
 include/unicode/unirepl.h
-include/unicode/unitohex.h
 include/unicode/unum.h
 include/unicode/usearch.h
 include/unicode/utrans.h
 include/unicode/ustdio.h
 include/unicode/ustream.h
-lib/libicudata.a
+include/unicode/ucat.h
+include/unicode/uidna.h
+include/unicode/loengine.h
 lib/libicudata.so.%%ICUMAJOR%%.0
-lib/libicuuc.a
+lib/libicudata.so.%%ICUMAJOR%%
+lib/libicudata.so
+lib/libicudata.a
+lib/libicuio.so.%%ICUMAJOR%%.0
+lib/libicuio.so.%%ICUMAJOR%%
+lib/libicuio.so
+lib/libicuio.a
+lib/libicule.so.%%ICUMAJOR%%.0
+lib/libicule.so.%%ICUMAJOR%%
+lib/libicule.so
+lib/libicule.a
+lib/libiculx.so.%%ICUMAJOR%%.0
+lib/libiculx.so.%%ICUMAJOR%%
+lib/libiculx.so
+lib/libiculx.a
 lib/libicuuc.so.%%ICUMAJOR%%.0
-lib/libicui18n.a
+lib/libicuuc.so.%%ICUMAJOR%%
+lib/libicuuc.so
+lib/libicuuc.a
 lib/libicui18n.so.%%ICUMAJOR%%.0
-lib/libicuctestfw.a
-lib/libicuctestfw.so.%%ICUMAJOR%%.0
-lib/libicutoolutil.a
+lib/libicui18n.so.%%ICUMAJOR%%
+lib/libicui18n.so
+lib/libicui18n.a
 lib/libicutoolutil.so.%%ICUMAJOR%%.0
-lib/libustdio.a
-lib/libustdio.so.%%ICUMAJOR%%.0
+lib/libicutoolutil.so.%%ICUMAJOR%%
+lib/libicutoolutil.so
+lib/libicutoolutil.a
 lib/icu/%%ICUVER%%/Makefile.inc
 lib/icu/current
 lib/icu/Makefile.inc
 share/icu/%%ICUVER%%/config/mh-bsd-gcc
 share/icu/%%ICUVER%%/mkinstalldirs
 share/icu/%%ICUVER%%/README
+sbin/genidna
 sbin/genuca
 sbin/genccode
 sbin/genpname
@@ -135,22 +162,11 @@ sbin/gennorm
 sbin/gencmn
 sbin/decmn
 sbin/gentz
-@exec if test -r %D/lib/libicudata.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicudata.so.%%ICUMAJOR%%.0 %D/lib/libicudata.so.%%ICUMAJOR%%; ln -sf %D/lib/libicudata.so.%%ICUMAJOR%%.0 %D/lib/libicudata.so; } fi
-@exec if test -r %D/lib/libicuuc.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicuuc.so.%%ICUMAJOR%%.0 %D/lib/libicuuc.so.%%ICUMAJOR%%; ln -sf %D/lib/libicuuc.so.%%ICUMAJOR%%.0 %D/lib/libicuuc.so; } fi
-@exec if test -r %D/lib/libicui18n.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicui18n.so.%%ICUMAJOR%%.0 %D/lib/libicui18n.so.%%ICUMAJOR%%; ln -sf %D/lib/libicui18n.so.%%ICUMAJOR%%.0 %D/lib/libicui18n.so; } fi
-@exec if test -r %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0 %D/lib/libicuctestfw.so.%%ICUMAJOR%%; ln -sf %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0 %D/lib/libicuctestfw.so; } fi
-@exec if test -r %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0 %D/lib/libicutoolutil.so.%%ICUMAJOR%%; ln -sf %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0 %D/lib/libicutoolutil.so; } fi
-@exec if test -r %D/lib/libustdio.so.%%ICUMAJOR%%.0; then { ln -sf %D/lib/libustdio.so.%%ICUMAJOR%%.0 %D/lib/libustdio.so.%%ICUMAJOR%%; ln -sf %D/lib/libustdio.so.%%ICUMAJOR%%.0 %D/lib/libustdio.so; } fi
-@unexec if test ! -r %D/lib/libicudata.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicudata.so.%%ICUMAJOR%%;	rm -f %D/lib/libicudata.so;	} fi
-@unexec if test ! -r %D/lib/libicuuc.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicuuc.so.%%ICUMAJOR%%;	rm -f %D/lib/libicuuc.so;	} fi
-@unexec if test ! -r %D/lib/libicui18n.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libicui18n.so.%%ICUMAJOR%%;	rm -f %D/lib/libicui18n.so;	} fi
-@unexec if test ! -r %D/lib/libicuctestfw.so.%%ICUMAJOR%%.0; then	{ rm -f %D/lib/libicuctestfw.so.%%ICUMAJOR%%;	rm -f %D/lib/libicuctestfw.so;	} fi
-@unexec if test ! -r %D/lib/libicutoolutil.so.%%ICUMAJOR%%.0; then	{ rm -f %D/lib/libicutoolutil.so.%%ICUMAJOR%%;	rm -f %D/lib/libicutoolutil.so;	} fi
-@unexec if test ! -r %D/lib/libustdio.so.%%ICUMAJOR%%.0; then		{ rm -f %D/lib/libustdio.so.%%ICUMAJOR%%;	rm -f %D/lib/libustdio.so;	} fi
 @dirrm share/icu/%%ICUVER%%/config
 @dirrm share/icu/%%ICUVER%%
 @dirrm share/icu
 @dirrm lib/icu/%%ICUVER%%
 @dirrm lib/icu
 @dirrm include/unicode
+@dirrm include/layout
 @dirrm etc/icu