diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile
index 05b73d5e017..556ac0c2d83 100644
--- a/textproc/icu4c/Makefile
+++ b/textproc/icu4c/Makefile
@@ -1,15 +1,17 @@
-# $OpenBSD: Makefile,v 1.6 2008/10/31 09:56:15 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2009/01/27 22:11:15 landry Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		International Components for Unicode
 
-DISTNAME=		icu4c-4_0-src
-PKGNAME=		icu4c-4.0
-SO_VERSION=		1.0
+VERSION=		4.0.1
+DISTNAME=		icu4c-${VERSION:S/./_/g}-src
+PKGNAME=		icu4c-${VERSION}
+SO_VERSION=		1.1
 .for _lib in icudata icui18n icuio icule iculx icutu icuuc
 SHARED_LIBS+=		${_lib} ${SO_VERSION}
 .endfor
+SUBST_VARS+=		VERSION
 CATEGORIES=		textproc devel
 
 HOMEPAGE=		http://www.icu-project.org
@@ -24,18 +26,27 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c m pthread stdc++
 
-MASTER_SITES=		ftp://ftp.software.ibm.com/software/globalization/icu/4.0/ \
+MASTER_SITES=		http://download.icu-project.org/files/icu4c/${VERSION}/ \
 			${MASTER_SITE_SOURCEFORGE:=icu/}
 EXTRACT_SUFX=		.tgz
 
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--disable-renaming
+			--disable-renaming \
+			--disable-extras \
+			--disable-samples
+
+SEPARATE_BUILD=		concurrent
 
 WRKDIST=		${WRKDIR}/icu
 WRKSRC=			${WRKDIST}/source
 
-MAKE_FLAGS=		SO_TARGET_VERSION=${SO_VERSION}
+MAKE_FLAGS+=		SO_TARGET_VERSION=${SO_VERSION} \
+			SO_TARGET_VERSION_MAJOR=${SO_VERSION:R} \
+			PKGDATA_INVOKE_OPTS="SO_TARGET_VERSION=${SO_VERSION} SO_TARGET_VERSION_MAJOR=${SO_VERSION:R}"
+
+post-install:
+	find ${PREFIX}/lib -type l -name 'libicu*.so*' -exec rm '{}' \;
 
 .include <bsd.port.mk>
diff --git a/textproc/icu4c/distinfo b/textproc/icu4c/distinfo
index 30d0a75aff6..d371b973c77 100644
--- a/textproc/icu4c/distinfo
+++ b/textproc/icu4c/distinfo
@@ -1,5 +1,5 @@
-MD5 (icu4c-4_0-src.tgz) = KasJ2Etyp0lTy7TT1XWeFA==
-RMD160 (icu4c-4_0-src.tgz) = yA3FC5F3tgoBkeoJXEwcM2DSxvQ=
-SHA1 (icu4c-4_0-src.tgz) = /x0/oITS3/FA9rX1PcFWb9teuxc=
-SHA256 (icu4c-4_0-src.tgz) = p1YbhrxICInqaE2Dma86PgezPdALrXhN45NsyO2aE4c=
-SIZE (icu4c-4_0-src.tgz) = 12326130
+MD5 (icu4c-4_0_1-src.tgz) = L27MqTWUj325LZJdiNDQeA==
+RMD160 (icu4c-4_0_1-src.tgz) = 5A5//d0xNKNP5+e8mNd2xbZ7Y3w=
+SHA1 (icu4c-4_0_1-src.tgz) = ZaZenNVnDhEwMd75RI9l+4+E9Ho=
+SHA256 (icu4c-4_0_1-src.tgz) = /k0zzHOTw1XfexMIDhw3F+waysL4z+RStpHzPF9Gclk=
+SIZE (icu4c-4_0_1-src.tgz) = 12356471
diff --git a/textproc/icu4c/patches/patch-source_common_Makefile_in b/textproc/icu4c/patches/patch-source_common_Makefile_in
index 74980d03f5f..b3f1030d93b 100644
--- a/textproc/icu4c/patches/patch-source_common_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_common_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_common_Makefile_in,v 1.3 2008/10/31 09:56:15 landry Exp $
+$OpenBSD: patch-source_common_Makefile_in,v 1.4 2009/01/27 22:11:15 landry Exp $
 --- source/common/Makefile.in.orig	Mon Sep 22 21:03:28 2008
 +++ source/common/Makefile.in	Wed Oct 29 11:51:13 2008
 @@ -62,7 +62,7 @@ CPPFLAGS += -I$(top_builddir)/common
@@ -10,25 +10,3 @@ $OpenBSD: patch-source_common_Makefile_in,v 1.3 2008/10/31 09:56:15 landry Exp $
  
  # $(LIBICUDT) is either stub data or the real DLL common data.
  LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
-@@ -126,21 +126,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- $(SVC_HOOK_INC):
diff --git a/textproc/icu4c/patches/patch-source_config_icu-config-bottom b/textproc/icu4c/patches/patch-source_config_icu-config-bottom
index e5d0559e341..becde296d5b 100644
--- a/textproc/icu4c/patches/patch-source_config_icu-config-bottom
+++ b/textproc/icu4c/patches/patch-source_config_icu-config-bottom
@@ -1,6 +1,6 @@
-$OpenBSD: patch-source_config_icu-config-bottom,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/config/icu-config-bottom.orig	Mon Sep 22 21:03:42 2008
-+++ source/config/icu-config-bottom	Wed Oct 29 11:15:42 2008
+$OpenBSD: patch-source_config_icu-config-bottom,v 1.3 2009/01/27 22:11:15 landry Exp $
+--- source/config/icu-config-bottom.orig	Thu Jan 15 08:46:10 2009
++++ source/config/icu-config-bottom	Sat Jan 24 17:02:50 2009
 @@ -3,7 +3,7 @@
  ## Copyright (c) 2002-2007, International Business Machines Corporation and
  ## others. All Rights Reserved.
@@ -10,3 +10,12 @@ $OpenBSD: patch-source_config_icu-config-bottom,v 1.2 2008/10/31 09:56:15 landry
      
  #  echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
  if [ "x$PKGDATA_MODE" = "x" ]; then
+@@ -45,7 +45,7 @@ allflags()
+     echo "  --ldflags-layout       Print ICU layout engine link directive. Use in addition to --ldflags"
+     echo "  --ldflags-libsonly     Same as --ldflags, but only the -l directives"
+     echo "  --ldflags-searchpath   Print only -L (search path) directive"
+-    echo "  --ldflags-system       Print only system libs ICU links with (-lpthread, -lm)"
++    echo "  --ldflags-system       Print only system libs ICU links with (-pthread, -lm)"
+     echo "  --ldflags-icuio        Print ICU icuio link directive. Use in addition to --ldflags "
+     echo "  --ldflags-obsolete     Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) "
+     echo "  --mandir               Print manpage (man) path"
diff --git a/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc b/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc
index da40e89bd6c..7939868fdba 100644
--- a/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc
+++ b/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc
@@ -1,6 +1,9 @@
-$OpenBSD: patch-source_config_mh-bsd-gcc,v 1.1 2007/08/06 21:17:43 steven Exp $
---- source/config/mh-bsd-gcc.orig	Thu Mar 23 19:51:52 2006
-+++ source/config/mh-bsd-gcc	Mon Aug  6 17:46:30 2007
+$OpenBSD: patch-source_config_mh-bsd-gcc,v 1.2 2009/01/27 22:11:15 landry Exp $
+
+Prevents build system from setting DT_SONAME into shared libs.
+
+--- source/config/mh-bsd-gcc.orig	Thu Jan 15 08:46:10 2009
++++ source/config/mh-bsd-gcc	Sat Jan 24 13:35:37 2009
 @@ -21,7 +21,7 @@ LD_RPATH=	
  LD_RPATH_PRE=	-Wl,-rpath,
  
@@ -10,18 +13,3 @@ $OpenBSD: patch-source_config_mh-bsd-gcc,v 1.1 2007/08/06 21:17:43 steven Exp $
  
  ## Shared object suffix
  SO = so
-@@ -55,10 +55,10 @@ STATIC_O = ao
- 
- ## Versioned libraries rules
- 
--%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
--	$(RM) $@ && ln -s ${<F} $@
--%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
--	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
-+%.$(SO).$(SO_TARGET_VERSION_MAJOR):
-+	
-+%.$(SO):
-+	
- 
- ## End FreeBSD-specific setup
- 
diff --git a/textproc/icu4c/patches/patch-source_configure b/textproc/icu4c/patches/patch-source_configure
index 3f322e9907f..a03b0dff7ac 100644
--- a/textproc/icu4c/patches/patch-source_configure
+++ b/textproc/icu4c/patches/patch-source_configure
@@ -1,21 +1,55 @@
-Needed to adjust the version numbering scheme. Without it,
-librairies ends up with weird names.
-
---- source/configure.orig	Mon Sep 22 21:04:14 2008
-+++ source/configure	Wed Oct 29 11:15:42 2008
-@@ -1359,6 +1359,7 @@ echo "$as_me: error: Cannot determine ICU version numb
-    { (exit 1); exit 1; }; }
-     fi
- fi
-+ENTRYPOINT_VERSION=`echo $VERSION | sed -e 's/\.//'`
- LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
- LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
+$OpenBSD: patch-source_configure,v 1.4 2009/01/27 22:11:15 landry Exp $
+--- source/configure.orig	Sat Jan 24 17:03:07 2009
++++ source/configure	Sat Jan 24 17:03:48 2009
+@@ -4108,13 +4108,13 @@ OLD_LIBS=${LIBS}
+ if test $threads = true; then
+ 
+ 
+-echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_attr_init in -phtread" >&5
++echo $ECHO_N "checking for pthread_attr_init in -phtread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-phtread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4177,7 +4177,7 @@ if test $ac_cv_lib_pthread_pthread_attr_init = yes; th
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-phtread $LIBS"
+ 
+ fi
+ 
+@@ -4318,13 +4318,13 @@ fi
+       ICU_USE_THREADS=1
+     else
+ 
+-echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_mutex_init in -phtread" >&5
++echo $ECHO_N "checking for pthread_mutex_init in -phtread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-phtread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4387,7 +4387,7 @@ if test $ac_cv_lib_pthread_pthread_mutex_init = yes; t
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-phtread $LIBS"
+ 
+ fi
  
-@@ -9091,6 +9092,7 @@ s,@ECHO_T@,$ECHO_T,;t t
- s,@LIBS@,$LIBS,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
-+s,@ENTRYPOINT_VERSION@,$ENTRYPOINT_VERSION,;t t
- s,@LIB_VERSION@,$LIB_VERSION,;t t
- s,@LIB_VERSION_MAJOR@,$LIB_VERSION_MAJOR,;t t
- s,@UNICODE_VERSION@,$UNICODE_VERSION,;t t
diff --git a/textproc/icu4c/patches/patch-source_i18n_Makefile_in b/textproc/icu4c/patches/patch-source_i18n_Makefile_in
deleted file mode 100644
index a0f8008bdf0..00000000000
--- a/textproc/icu4c/patches/patch-source_i18n_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_i18n_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/i18n/Makefile.in.orig	Mon Sep 22 21:03:06 2008
-+++ source/i18n/Makefile.in	Wed Oct 29 11:29:53 2008
-@@ -118,21 +118,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- install-headers:
diff --git a/textproc/icu4c/patches/patch-source_icudefs_mk_in b/textproc/icu4c/patches/patch-source_icudefs_mk_in
deleted file mode 100644
index 74098ac6456..00000000000
--- a/textproc/icu4c/patches/patch-source_icudefs_mk_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-source_icudefs_mk_in,v 1.3 2008/10/31 09:56:15 landry Exp $
---- source/icudefs.mk.in.orig	Mon Sep 22 21:04:14 2008
-+++ source/icudefs.mk.in	Wed Oct 29 11:15:42 2008
-@@ -44,7 +44,7 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
- 
- ICUDATA_DIR = @pkgicudatadir@/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
- 
--ICUDATA_BASENAME_VERSION = $(ICUPREFIX)dt@LIB_VERSION_MAJOR@
-+ICUDATA_BASENAME_VERSION = $(ICUPREFIX)dt@ENTRYPOINT_VERSION@
- ICUDATA_ENTRY_POINT = $(ICUDATA_BASENAME_VERSION)
- ICUDATA_CHAR = @ICUDATA_CHAR@
- ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)$(ICUDATA_CHAR)
diff --git a/textproc/icu4c/patches/patch-source_io_Makefile_in b/textproc/icu4c/patches/patch-source_io_Makefile_in
deleted file mode 100644
index 3f53ecf6c84..00000000000
--- a/textproc/icu4c/patches/patch-source_io_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_io_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/io/Makefile.in.orig	Mon Sep 22 21:03:42 2008
-+++ source/io/Makefile.in	Wed Oct 29 11:45:50 2008
-@@ -101,21 +101,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- install-headers:
diff --git a/textproc/icu4c/patches/patch-source_layout_LESwaps_h b/textproc/icu4c/patches/patch-source_layout_LESwaps_h
new file mode 100644
index 00000000000..6dc57d8b826
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_layout_LESwaps_h
@@ -0,0 +1,62 @@
+$OpenBSD: patch-source_layout_LESwaps_h,v 1.1 2009/01/27 22:11:15 landry Exp $
+
+Suggested by jasper. workaround for broken font tables.
+
+--- source/layout/LESwaps.h.orig	Mon Sep 22 21:04:12 2008
++++ source/layout/LESwaps.h	Sun Nov 16 15:12:06 2008
+@@ -2,6 +2,7 @@
+ /*
+  *
+  * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved
++ * with additions by Sun Microsystems 2002-2006
+  *
+  */
+ 
+@@ -17,12 +18,21 @@
+ 
+ U_NAMESPACE_BEGIN
+ 
++// There exist popular font file which contain unaligned tables
++// (e.g. "Watanabe Gothic"'s "mort" table)
++// On some platforms unaligned memory accesses cause a crash.
++// The ALLOW_UNALIGNED hack prevents these crashes by assuming that
++// every use of the SWAPx macros in ICU's layout engine is intended
++// for loading a big endian value and replaces them appropriately.
++#define ALLOW_UNALIGNED_HACK
++
+ /**
+  * A convenience macro which invokes the swapWord member function
+  * from a concise call.
+  *
+  * @stable ICU 2.8
+  */
++#ifndef ALLOW_UNALIGNED_HACK
+ #define SWAPW(value) LESwaps::swapWord((const le_uint16 &) (value))
+ 
+ /**
+@@ -32,6 +42,25 @@ U_NAMESPACE_BEGIN
+  * @stable ICU 2.8
+  */
+ #define SWAPL(value) LESwaps::swapLong((const le_uint32 &) (value))
++
++#else // ALLOW_UNALIGNED_HACK
++
++#define SWAPW(rValue) loadBigEndianWord(reinterpret_cast<const le_uint16&>(rValue))
++#define SWAPL(rValue) loadBigEndianLong(reinterpret_cast<const le_uint32&>(rValue))
++
++inline le_uint16 loadBigEndianWord( const le_uint16& rValue )
++{
++    const le_uint8* p = reinterpret_cast<const le_uint8*>(&rValue);
++    return ((p[0] << 8) + p[1]);
++}
++
++inline le_uint32 loadBigEndianLong( const le_uint32& rValue )
++{
++    const le_uint8* p = reinterpret_cast<const le_uint8*>(&rValue);
++    return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) +p[3]);
++}
++
++#endif // ALLOW_UNALIGNED_HACK
+ 
+ /**
+  * This class is used to access data which stored in big endian order
diff --git a/textproc/icu4c/patches/patch-source_layout_Makefile_in b/textproc/icu4c/patches/patch-source_layout_Makefile_in
deleted file mode 100644
index d106f5d3f49..00000000000
--- a/textproc/icu4c/patches/patch-source_layout_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_layout_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/layout/Makefile.in.orig	Mon Sep 22 21:04:12 2008
-+++ source/layout/Makefile.in	Wed Oct 29 11:34:57 2008
-@@ -171,21 +171,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- install-headers:
diff --git a/textproc/icu4c/patches/patch-source_layoutex_Makefile_in b/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
deleted file mode 100644
index 5ed5d6274f2..00000000000
--- a/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-source_layoutex_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/layoutex/Makefile.in.orig	Mon Sep 22 21:04:10 2008
-+++ source/layoutex/Makefile.in	Wed Oct 29 11:35:11 2008
-@@ -102,21 +102,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- install-headers:
diff --git a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
index 6d74349e1d5..5443909fb08 100644
--- a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
@@ -11,25 +11,3 @@ Andreas Vogele <andreas@kurzegrasse.de> for this one.
  DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
  
  ifneq ($(top_builddir),$(top_srcdir))
-@@ -87,21 +88,9 @@ ifneq ($(ENABLE_STATIC),)
- endif
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
- endif
--endif
- ifneq ($(IMPORT_LIB_EXT),)
- 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
--ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
--endif
--ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
--endif
--endif
- endif
- 
- dist-local:
diff --git a/textproc/icu4c/patches/patch-source_test_intltest_usettest_cpp b/textproc/icu4c/patches/patch-source_test_intltest_usettest_cpp
new file mode 100644
index 00000000000..1bf862ded62
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_test_intltest_usettest_cpp
@@ -0,0 +1,15 @@
+$OpenBSD: patch-source_test_intltest_usettest_cpp,v 1.1 2009/01/27 22:11:15 landry Exp $
+
+Fix for regression tests
+
+--- source/test/intltest/usettest.cpp.orig	Sat Jan 24 16:44:37 2009
++++ source/test/intltest/usettest.cpp	Sat Jan 24 16:35:13 2009
+@@ -1641,7 +1641,7 @@ void UnicodeSetTest::TestSurrogate() {
+     for (int i=0; DATA[i] != 0; ++i) {
+         UErrorCode ec = U_ZERO_ERROR;
+         logln((UnicodeString)"Test pattern " + i + " :" + UnicodeString(DATA[i], -1, US_INV));
+-        UnicodeSet set(UnicodeString(DATA[i], -1, US_INV), ec);
++        UnicodeSet set(UnicodeString((const char *)DATA[i], -1, US_INV), ec);
+         if (U_FAILURE(ec)) {
+             errln("FAIL: UnicodeSet constructor");
+             continue;
diff --git a/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c b/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c
deleted file mode 100644
index 79150dbd64c..00000000000
--- a/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-source_tools_pkgdata_dllmode_c,v 1.1 2007/08/06 21:17:43 steven Exp $
---- source/tools/pkgdata/dllmode.c.orig	Fri Feb 24 20:47:48 2006
-+++ source/tools/pkgdata/dllmode.c	Mon Aug  6 19:11:42 2007
-@@ -120,9 +120,6 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile
- #endif
- 
-     uprv_strcpy(tmp, "all: $(TARGETDIR)/$(FINAL_SO_TARGET) $(BATCH_TARGET)");
--    if (o->version) {
--        uprv_strcat(tmp, " $(TARGETDIR)/$(MIDDLE_SO_TARGET) $(TARGETDIR)/$(SO_TARGET)");
--    }
-     uprv_strcat(tmp, "\n\n");
-     T_FileStream_writeLine(makefile, tmp);
-     
-@@ -260,13 +257,6 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile
-     T_FileStream_writeLine(makefile, "\t$(INSTALL-L) $(TARGETDIR)/$(basename $(FINAL_SO_TARGET))$(IMPORT_LIB_EXT) $(INSTALLTO)/$(basename( $(FINAL_SO_TARGET))$(IMPORT_LIB_EXT)\n");
-     T_FileStream_writeLine(makefile, "endif\n");
-     if (o->version) {
--        T_FileStream_writeLine(makefile, "ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))\n");
--        T_FileStream_writeLine(makefile, "\tcd $(INSTALLTO) && $(RM) $(SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(SO_TARGET)\n");
--        T_FileStream_writeLine(makefile, "ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))\n");
--        T_FileStream_writeLine(makefile, "\tcd $(INSTALLTO) && $(RM) $(MIDDLE_SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET)\n");
--        T_FileStream_writeLine(makefile, "endif\n");
--        T_FileStream_writeLine(makefile, "endif\n");
--
- #ifdef OS390
-         T_FileStream_writeLine(makefile, "ifneq ($(IMPORT_LIB_EXT),)\n");
-         T_FileStream_writeLine(makefile, "\tcd $(INSTALLTO) && $(RM) $(basename $(MIDDLE_SO_TARGET))$(IMPORT_LIB_EXT) && ln -s $(basename $(FINAL_SO_TARGET))$(IMPORT_LIB_EXT) $(basename $(MIDDLE_SO_TARGET))$(IMPORT_LIB_EXT)\n");
diff --git a/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in b/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
deleted file mode 100644
index 8a1befb57dc..00000000000
--- a/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.2 2008/10/31 09:56:15 landry Exp $
---- source/tools/toolutil/Makefile.in.orig	Mon Sep 22 21:03:38 2008
-+++ source/tools/toolutil/Makefile.in	Wed Oct 29 11:15:42 2008
-@@ -85,12 +85,6 @@ install-library: all-local
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
- ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
--ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
--ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
--	cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
--endif
--endif
- endif
- 
- dist-local:
diff --git a/textproc/icu4c/pkg/PLIST b/textproc/icu4c/pkg/PLIST
index 560b10d5d4f..5cf7df1c9dd 100644
--- a/textproc/icu4c/pkg/PLIST
+++ b/textproc/icu4c/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/10/31 09:56:15 landry Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/01/27 22:11:15 landry Exp $
 @bin bin/derb
 @bin bin/genbrk
 @bin bin/gencnval
@@ -7,7 +7,6 @@
 bin/icu-config
 @bin bin/makeconv
 @bin bin/pkgdata
-@bin bin/uconv
 include/layout/
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.h
@@ -25,6 +24,8 @@ include/layout/playout.h
 include/layout/plruns.h
 include/unicode/
 include/unicode/basictz.h
+include/unicode/bms.h
+include/unicode/bmsearch.h
 include/unicode/brkiter.h
 include/unicode/calendar.h
 include/unicode/caniter.h
@@ -32,6 +33,7 @@ include/unicode/chariter.h
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
 include/unicode/coll.h
+include/unicode/colldata.h
 include/unicode/curramt.h
 include/unicode/currunit.h
 include/unicode/datefmt.h
@@ -150,8 +152,8 @@ include/unicode/utypes.h
 include/unicode/uversion.h
 include/unicode/vtzone.h
 lib/icu/
-lib/icu/4.0/
-lib/icu/4.0/Makefile.inc
+lib/icu/${VERSION}/
+lib/icu/${VERSION}/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
 @lib lib/libicudata.so.${LIBicudata_VERSION}
@@ -169,7 +171,6 @@ lib/icu/current
 @man man/man1/icu-config.1
 @man man/man1/makeconv.1
 @man man/man1/pkgdata.1
-@man man/man1/uconv.1
 @man man/man8/genccode.8
 @man man/man8/gencmn.8
 @man man/man8/gensprep.8
@@ -182,9 +183,9 @@ lib/icu/current
 @bin sbin/icupkg
 @bin sbin/icuswap
 share/icu/
-share/icu/4.0/
-share/icu/4.0/config/
-share/icu/4.0/config/mh-bsd-gcc
-share/icu/4.0/license.html
-@comment share/icu/4.0/install-sh
-@comment share/icu/4.0/mkinstalldirs
+share/icu/${VERSION}/
+share/icu/${VERSION}/config/
+share/icu/${VERSION}/config/mh-bsd-gcc
+@comment share/icu/${VERSION}/install-sh
+share/icu/${VERSION}/license.html
+@comment share/icu/${VERSION}/mkinstalldirs