Upgrade ICU from 3.4.1 to 3.6. Build WITHOUT_THREADS by default -- using

threads is broken on ia64 (marcel is investigating) and seems useless
elsewhere.

Filter `-funroll-loops' out of CFLAGS for now -- it seems to cause
miscompilation occasionally.

Correct the dependencies to stop requiring a particular version number
of the ICU's libraries to ease future upgrades.

11 files changed, 71 insertions, 99 deletions

diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 1cdb985a0c99..c615b95a7804 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -175,7 +175,7 @@ BOOST_LIBS+=	thread
 .endif
 
 .if defined (WITH_ICU)
-LIB_DEPENDS+=	icuuc.34:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
 BOOST_ICU_OPTS=	"-sICU_PATH=${LOCALBASE}"
 .endif
 
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 7b9df739c7f3..ef290e70d571 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	icu
-PORTVERSION=	3.4.1
+PORTVERSION=	3.6
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
+MASTER_SITE_SUBDIR=${PORTNAME}
+DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	International Components for Unicode (from IBM)
 
-OPTIONS=	THREADS "Build multi-threaded version of the library" on
+OPTIONS=	THREADS "Build multi-threaded version of the library" off
 CONFLICTS=	icu2-[0-9]*
 
 INSTALLS_SHLIB=		yes
@@ -30,38 +33,32 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-samples=no
 
 USE_GMAKE=		yes
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS:N-funroll-loops}" CC="${CC}" CXX="${CXX}"
+CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS:N-funroll-loops}"
 
 MAN1+=	derb.1
 MAN1+=	gencnval.1
+MAN1+=	genctd.1
 MAN1+=	genrb.1
 MAN1+=	icu-config.1
 MAN1+=	makeconv.1
 MAN1+=	pkgdata.1
 MAN1+=	uconv.1
-MAN8+=	decmn.8
 MAN8+=	genccode.8
 MAN8+=	gencmn.8
 MAN8+=	gensprep.8
 MAN8+=	genuca.8
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=0
 PLIST_SUB+=	ICUVER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "sparc64"
-post-patch:
-	${REINPLACE_CMD} 's,-fPIC,-fpic,' ${WRKSRC}/config/mh-bsd-gcc
-.endif
-
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads=yes
-CONFIGURE_ENV+=		THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \
-			THREADSCFLAGS="${PTHREAD_CFLAGS}" \
-			THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \
-			PTHREAD_LIBS="${PTHREAD_LIBS}"
+post-patch:
+	${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc
 .else
 CONFIGURE_ARGS+=	--enable-threads=no
 .endif
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index af8f70f4acae..b1b38eb69616 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
-MD5 (icu-3.4.1.tgz) = 2a16f58bcb26e5010c946dca9ec08d5f
-SHA256 (icu-3.4.1.tgz) = bbeab775bfd46c4882b589bdde3f6e469b7834d4738c44df1cef671dfe436959
-SIZE (icu-3.4.1.tgz) = 9320610
+MD5 (icu4c-3_6-src.tgz) = 6243f7a19e03e05403ce84e597510d4c
+SHA256 (icu4c-3_6-src.tgz) = 5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
+SIZE (icu4c-3_6-src.tgz) = 10183358
diff --git a/devel/icu/files/patch-aa b/devel/icu/files/patch-aa
deleted file mode 100644
index a089bc1c8e90..000000000000
--- a/devel/icu/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in	Fri Jul  9 11:43:36 2004
-+++ Makefile.in	Wed Nov 17 11:14:49 2004
-@@ -175,11 +175,13 @@
- $(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_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/icu/pkg-descr b/devel/icu/pkg-descr
index 6cac96d9cf70..917de707e9a0 100644
--- a/devel/icu/pkg-descr
+++ b/devel/icu/pkg-descr
@@ -3,6 +3,8 @@ providing Unicode support (p.ex. character set conversions, locales,
 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
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 511871170fc6..b05928aa2853 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -1,12 +1,12 @@
 bin/derb
 bin/genbrk
 bin/gencnval
+bin/genctd
 bin/genrb
 bin/icu-config
 bin/makeconv
 bin/pkgdata
 bin/uconv
-sbin/decmn
 sbin/genccode
 sbin/gencmn
 sbin/gensprep
@@ -86,6 +86,7 @@ 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
@@ -93,6 +94,7 @@ 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
@@ -122,6 +124,7 @@ 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
@@ -138,38 +141,38 @@ lib/icu/%%ICUVER%%/Makefile.inc
 lib/icu/current
 lib/icu/Makefile.inc
 lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.1
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicudata.so
 lib/libicudata.so.%%ICUMAJOR%%
 lib/libsicuuc.a
-lib/libicuuc.so.%%ICUMAJOR%%.1
+lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
 lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.1
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicui18n.so
 lib/libicui18n.so.%%ICUMAJOR%%
 lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.1
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicule.so
 lib/libicule.so.%%ICUMAJOR%%
 lib/libsiculx.a
-lib/libiculx.so.%%ICUMAJOR%%.1
+lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
 lib/libsicuio.a
-lib/libicuio.so.%%ICUMAJOR%%.1
+lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
 lib/libsicutu.a
-lib/libicutu.so.%%ICUMAJOR%%.1
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicutu.so.%%ICUMAJOR%%
 lib/libicutu.so
-share/icu/%%ICUVER%%/config/mh-bsd-gcc
-share/icu/%%ICUVER%%/mkinstalldirs
-share/icu/%%ICUVER%%/license.html
-@dirrm share/icu/%%ICUVER%%/config
-@dirrm share/icu/%%ICUVER%%
-@dirrm share/icu
+%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+%%DATADIR%%/%%ICUVER%%/mkinstalldirs
+%%DATADIR%%/%%ICUVER%%/license.html
+@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 7b9df739c7f3..ef290e70d571 100644
--- a/devel/icu4/Makefile
+++ b/devel/icu4/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	icu
-PORTVERSION=	3.4.1
+PORTVERSION=	3.6
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}	\
+		ftp://ftp.software.ibm.com/software/globalization/icu/${PORTVERSION}/
+MASTER_SITE_SUBDIR=${PORTNAME}
+DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	International Components for Unicode (from IBM)
 
-OPTIONS=	THREADS "Build multi-threaded version of the library" on
+OPTIONS=	THREADS "Build multi-threaded version of the library" off
 CONFLICTS=	icu2-[0-9]*
 
 INSTALLS_SHLIB=		yes
@@ -30,38 +33,32 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-samples=no
 
 USE_GMAKE=		yes
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" CC="${CC}" CXX="${CXX}"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS:N-funroll-loops}" CC="${CC}" CXX="${CXX}"
+CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS:N-funroll-loops}"
 
 MAN1+=	derb.1
 MAN1+=	gencnval.1
+MAN1+=	genctd.1
 MAN1+=	genrb.1
 MAN1+=	icu-config.1
 MAN1+=	makeconv.1
 MAN1+=	pkgdata.1
 MAN1+=	uconv.1
-MAN8+=	decmn.8
 MAN8+=	genccode.8
 MAN8+=	gencmn.8
 MAN8+=	gensprep.8
 MAN8+=	genuca.8
 
 ICUMAJOR=	${PORTVERSION:S/.//:R}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUMINOR=0
 PLIST_SUB+=	ICUVER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "sparc64"
-post-patch:
-	${REINPLACE_CMD} 's,-fPIC,-fpic,' ${WRKSRC}/config/mh-bsd-gcc
-.endif
-
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads=yes
-CONFIGURE_ENV+=		THREADSCPPFLAGS="${PTHREAD_CFLAGS}" \
-			THREADSCFLAGS="${PTHREAD_CFLAGS}" \
-			THREADSCXXFLAGS="${PTHREAD_CFLAGS}" \
-			PTHREAD_LIBS="${PTHREAD_LIBS}"
+post-patch:
+	${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' ${WRKSRC}/config/mh-bsd-gcc
 .else
 CONFIGURE_ARGS+=	--enable-threads=no
 .endif
diff --git a/devel/icu4/distinfo b/devel/icu4/distinfo
index af8f70f4acae..b1b38eb69616 100644
--- a/devel/icu4/distinfo
+++ b/devel/icu4/distinfo
@@ -1,3 +1,3 @@
-MD5 (icu-3.4.1.tgz) = 2a16f58bcb26e5010c946dca9ec08d5f
-SHA256 (icu-3.4.1.tgz) = bbeab775bfd46c4882b589bdde3f6e469b7834d4738c44df1cef671dfe436959
-SIZE (icu-3.4.1.tgz) = 9320610
+MD5 (icu4c-3_6-src.tgz) = 6243f7a19e03e05403ce84e597510d4c
+SHA256 (icu4c-3_6-src.tgz) = 5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
+SIZE (icu4c-3_6-src.tgz) = 10183358
diff --git a/devel/icu4/files/patch-aa b/devel/icu4/files/patch-aa
deleted file mode 100644
index a089bc1c8e90..000000000000
--- a/devel/icu4/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in	Fri Jul  9 11:43:36 2004
-+++ Makefile.in	Wed Nov 17 11:14:49 2004
-@@ -175,11 +175,13 @@
- $(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_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/icu4/pkg-descr b/devel/icu4/pkg-descr
index 6cac96d9cf70..917de707e9a0 100644
--- a/devel/icu4/pkg-descr
+++ b/devel/icu4/pkg-descr
@@ -3,6 +3,8 @@ providing Unicode support (p.ex. character set conversions, locales,
 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
diff --git a/devel/icu4/pkg-plist b/devel/icu4/pkg-plist
index 511871170fc6..b05928aa2853 100644
--- a/devel/icu4/pkg-plist
+++ b/devel/icu4/pkg-plist
@@ -1,12 +1,12 @@
 bin/derb
 bin/genbrk
 bin/gencnval
+bin/genctd
 bin/genrb
 bin/icu-config
 bin/makeconv
 bin/pkgdata
 bin/uconv
-sbin/decmn
 sbin/genccode
 sbin/gencmn
 sbin/gensprep
@@ -86,6 +86,7 @@ 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
@@ -93,6 +94,7 @@ 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
@@ -122,6 +124,7 @@ 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
@@ -138,38 +141,38 @@ lib/icu/%%ICUVER%%/Makefile.inc
 lib/icu/current
 lib/icu/Makefile.inc
 lib/libsicudata.a
-lib/libicudata.so.%%ICUMAJOR%%.1
+lib/libicudata.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicudata.so
 lib/libicudata.so.%%ICUMAJOR%%
 lib/libsicuuc.a
-lib/libicuuc.so.%%ICUMAJOR%%.1
+lib/libicuuc.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuuc.so
 lib/libicuuc.so.%%ICUMAJOR%%
 lib/libsicui18n.a
-lib/libicui18n.so.%%ICUMAJOR%%.1
+lib/libicui18n.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicui18n.so
 lib/libicui18n.so.%%ICUMAJOR%%
 lib/libsicule.a
-lib/libicule.so.%%ICUMAJOR%%.1
+lib/libicule.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicule.so
 lib/libicule.so.%%ICUMAJOR%%
 lib/libsiculx.a
-lib/libiculx.so.%%ICUMAJOR%%.1
+lib/libiculx.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libiculx.so
 lib/libiculx.so.%%ICUMAJOR%%
 lib/libsicuio.a
-lib/libicuio.so.%%ICUMAJOR%%.1
+lib/libicuio.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicuio.so
 lib/libicuio.so.%%ICUMAJOR%%
 lib/libsicutu.a
-lib/libicutu.so.%%ICUMAJOR%%.1
+lib/libicutu.so.%%ICUMAJOR%%.%%ICUMINOR%%
 lib/libicutu.so.%%ICUMAJOR%%
 lib/libicutu.so
-share/icu/%%ICUVER%%/config/mh-bsd-gcc
-share/icu/%%ICUVER%%/mkinstalldirs
-share/icu/%%ICUVER%%/license.html
-@dirrm share/icu/%%ICUVER%%/config
-@dirrm share/icu/%%ICUVER%%
-@dirrm share/icu
+%%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
+%%DATADIR%%/%%ICUVER%%/mkinstalldirs
+%%DATADIR%%/%%ICUVER%%/license.html
+@dirrm %%DATADIR%%/%%ICUVER%%/config
+@dirrm %%DATADIR%%/%%ICUVER%%
+@dirrm %%DATADIR%%
 @dirrm lib/icu/%%ICUVER%%
 @dirrm lib/icu