diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile
index f5face46f1e..fd20858962c 100644
--- a/textproc/icu4c/Makefile
+++ b/textproc/icu4c/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/07/19 21:52:09 simon Exp $
+# $OpenBSD: Makefile,v 1.2 2007/08/06 21:17:43 steven Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		International Components for Unicode
 
 DISTNAME=		icu4c-3_6-src
-PKGNAME=		icu4c-3.6
+PKGNAME=		icu4c-3.6p0
 SO_VERSION=		0.0
 .for _lib in icudata icui18n icuio icule iculx icutu icuuc
 SHARED_LIBS+=		${_lib} ${SO_VERSION}
@@ -38,10 +38,8 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 WRKDIST=		${WRKDIR}/icu
 WRKSRC=			${WRKDIST}/source
 
-REGRESS_TARGET=		check
-
-pre-configure:
-	ln -sf ./icudt36l.dat ${WRKSRC}/data/in/icudt0l.dat
-	perl -pi -e 's,!!SO_VERSION!!,${SO_VERSION},' ${WRKSRC}/configure
+MAKE_FLAGS=		SO_TARGET_VERSION=${SO_VERSION}
+FAKE_FLAGS=		SO_TARGET_VERSION=${SO_VERSION} \
+			${DESTDIRNAME}=${WRKINST}
 
 .include <bsd.port.mk>
diff --git a/textproc/icu4c/patches/patch-source_common_Makefile_in b/textproc/icu4c/patches/patch-source_common_Makefile_in
index b7d35362201..19487f96c22 100644
--- a/textproc/icu4c/patches/patch-source_common_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_common_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-source_common_Makefile_in,v 1.1.1.1 2007/07/19 21:52:09 simon Exp $
---- source/common/Makefile.in.orig	Tue Jun 26 22:06:27 2007
-+++ source/common/Makefile.in	Tue Jun 26 22:08:42 2007
+$OpenBSD: patch-source_common_Makefile_in,v 1.2 2007/08/06 21:17:43 steven Exp $
+--- source/common/Makefile.in.orig	Fri Jun 30 16:42:58 2006
++++ source/common/Makefile.in	Mon Aug  6 19:07:32 2007
 @@ -60,7 +60,7 @@ CPPFLAGS += -I$(top_builddir)/common
  endif
  CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/i18n $(LIBCPPFLAGS)
@@ -10,3 +10,16 @@ $OpenBSD: patch-source_common_Makefile_in,v 1.1.1.1 2007/07/19 21:52:09 simon Ex
  
  # $(LIBICUDT) is either stub data or the real DLL common data.
  LIBS = $(LIBICUDT) $(DEFAULT_LIBS)
+@@ -124,12 +124,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc b/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc
new file mode 100644
index 00000000000..da40e89bd6c
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_config_mh-bsd-gcc
@@ -0,0 +1,27 @@
+$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
+@@ -21,7 +21,7 @@ LD_RPATH=	
+ LD_RPATH_PRE=	-Wl,-rpath,
+ 
+ ## Compiler switch to embed a library name
+-LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++LD_SONAME =
+ 
+ ## 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 3b041dc3713..ec0e5d4e47c 100644
--- a/textproc/icu4c/patches/patch-source_configure
+++ b/textproc/icu4c/patches/patch-source_configure
@@ -2,7 +2,7 @@ Needed to adjust the version numbering scheme. Without it,
 librairies ends up with weird names.
 
 --- source/configure.orig	Tue Aug 15 10:24:14 2006
-+++ source/configure	Mon Jun 25 21:22:29 2007
++++ source/configure	Mon Aug  6 16:46:52 2007
 @@ -309,7 +309,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
@@ -12,16 +12,14 @@ librairies ends up with weird names.
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1347,7 +1347,8 @@ echo "$as_me: error: Cannot determine ICU version numb
+@@ -1347,6 +1347,7 @@ echo "$as_me: error: Cannot determine ICU version numb
     { (exit 1); exit 1; }; }
      fi
  fi
--LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
 +ENTRYPOINT_VERSION=`echo $VERSION | sed -e 's/\.//'`
-+LIB_VERSION=!!SO_VERSION!!
+ LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`
  LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'`
  
- 
 @@ -8363,6 +8364,7 @@ s,@ECHO_T@,$ECHO_T,;t t
  s,@LIBS@,$LIBS,;t t
  s,@PACKAGE@,$PACKAGE,;t t
diff --git a/textproc/icu4c/patches/patch-source_data_Makefile_in b/textproc/icu4c/patches/patch-source_data_Makefile_in
deleted file mode 100644
index 96f7ff80dd1..00000000000
--- a/textproc/icu4c/patches/patch-source_data_Makefile_in
+++ /dev/null
@@ -1,21 +0,0 @@
-Needed to be able to retrieve all the encoded data.
-
---- source/data/Makefile.in.orig	Sat Aug 12 00:22:24 2006
-+++ source/data/Makefile.in	Thu Jun 14 14:56:39 2007
-@@ -344,7 +344,7 @@ $(OUTTMPDIR)/icudata.lst: $(SRCLISTDEPS) $(ICUDATA_SOU
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
- 	@echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
- 	@-$(RMV) $@
--	$(INVOKE) $(BINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@
-+	$(INVOKE) $(BINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(subst 0,36,$(ICUDATA_SOURCE_ARCHIVE)) > $@
- else
- 	@echo "$@" > $@
- endif
-@@ -354,6 +354,7 @@ endif
- build-dir: $(BUILD_DIRS)
- $(BUILD_DIRS):
- 	-$(MKINSTALLDIRS) $(BUILD_DIRS)
-+	ln -sf ./icudt0l ./out/build/icudt36l
- 
- 
- # Now, sections for building each kind of data.
diff --git a/textproc/icu4c/patches/patch-source_i18n_Makefile_in b/textproc/icu4c/patches/patch-source_i18n_Makefile_in
new file mode 100644
index 00000000000..c7106bbd96d
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_i18n_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source_i18n_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
+--- source/i18n/Makefile.in.orig	Mon Aug  6 19:10:18 2007
++++ source/i18n/Makefile.in	Mon Aug  6 19:10:27 2007
+@@ -114,12 +114,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_icudefs_mk_in b/textproc/icu4c/patches/patch-source_icudefs_mk_in
index a5ff8178a8e..c618718fdcd 100644
--- a/textproc/icu4c/patches/patch-source_icudefs_mk_in
+++ b/textproc/icu4c/patches/patch-source_icudefs_mk_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-source_icudefs_mk_in,v 1.1.1.1 2007/07/19 21:52:09 simon Exp $
---- source/icudefs.mk.in.orig	Mon Jun 25 21:13:39 2007
-+++ source/icudefs.mk.in	Mon Jun 25 21:23:00 2007
+$OpenBSD: patch-source_icudefs_mk_in,v 1.2 2007/08/06 21:17:43 steven Exp $
+--- source/icudefs.mk.in.orig	Tue Sep 20 22:32:08 2005
++++ source/icudefs.mk.in	Mon Aug  6 18:58:08 2007
 @@ -42,7 +42,7 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
  
  ICUDATA_DIR = @pkgicudatadir@/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
diff --git a/textproc/icu4c/patches/patch-source_io_Makefile_in b/textproc/icu4c/patches/patch-source_io_Makefile_in
new file mode 100644
index 00000000000..55510b6e5b6
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_io_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source_io_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
+--- source/io/Makefile.in.orig	Mon Aug  6 19:08:02 2007
++++ source/io/Makefile.in	Mon Aug  6 19:08:14 2007
+@@ -99,12 +99,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_layout_Makefile_in b/textproc/icu4c/patches/patch-source_layout_Makefile_in
new file mode 100644
index 00000000000..880eae8a601
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_layout_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source_layout_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
+--- source/layout/Makefile.in.orig	Mon Aug  6 19:08:27 2007
++++ source/layout/Makefile.in	Mon Aug  6 19:08:34 2007
+@@ -168,12 +168,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_layoutex_Makefile_in b/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
new file mode 100644
index 00000000000..221b614c523
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source_layoutex_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
+--- source/layoutex/Makefile.in.orig	Mon Aug  6 19:09:59 2007
++++ source/layoutex/Makefile.in	Mon Aug  6 19:10:10 2007
+@@ -98,12 +98,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
index eaa555f658d..4d8c328b334 100644
--- a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
@@ -1,8 +1,8 @@
 Needed to fix a linker warning message about size mismatch. Credits to
 Andreas Vogele <andreas@kurzegrasse.de> for this one.
 
---- source/stubdata/Makefile.in.orig	Wed Jun 13 14:18:58 2007
-+++ source/stubdata/Makefile.in	Wed Jun 13 13:30:25 2007
+--- source/stubdata/Makefile.in.orig	Fri Dec  2 11:21:34 2005
++++ source/stubdata/Makefile.in	Mon Aug  6 19:27:16 2007
 @@ -41,6 +41,7 @@ ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
  
  DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
@@ -11,3 +11,16 @@ Andreas Vogele <andreas@kurzegrasse.de> for this one.
  DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
  
  ifneq ($(top_builddir),$(top_srcdir))
+@@ -87,12 +88,6 @@ 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
+ endif
+ ifneq ($(IMPORT_LIB_EXT),)
+ 	$(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
diff --git a/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c b/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c
new file mode 100644
index 00000000000..79150dbd64c
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_tools_pkgdata_dllmode_c
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 00000000000..547a179ac0a
--- /dev/null
+++ b/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.1 2007/08/06 21:17:43 steven Exp $
+--- source/tools/toolutil/Makefile.in.orig	Mon Aug  6 19:21:08 2007
++++ source/tools/toolutil/Makefile.in	Mon Aug  6 19:21:17 2007
+@@ -86,12 +86,6 @@ 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
+ endif
+ 
+ dist-local:
diff --git a/textproc/icu4c/pkg/PLIST b/textproc/icu4c/pkg/PLIST
index 39dd84fa735..d2264bc3c9f 100644
--- a/textproc/icu4c/pkg/PLIST
+++ b/textproc/icu4c/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/19 21:52:09 simon Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/08/06 21:17:43 steven Exp $
 bin/derb
 bin/genbrk
 bin/gencnval
@@ -138,26 +138,12 @@ lib/icu/3.6/
 lib/icu/3.6/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
-lib/libicudata.so
-lib/libicudata.so.0
 @lib lib/libicudata.so.${LIBicudata_VERSION}
-lib/libicui18n.so
-lib/libicui18n.so.0
 @lib lib/libicui18n.so.${LIBicui18n_VERSION}
-lib/libicuio.so
-lib/libicuio.so.0
 @lib lib/libicuio.so.${LIBicuio_VERSION}
-lib/libicule.so
-lib/libicule.so.0
 @lib lib/libicule.so.${LIBicule_VERSION}
-lib/libiculx.so
-lib/libiculx.so.0
 @lib lib/libiculx.so.${LIBiculx_VERSION}
-lib/libicutu.so
-lib/libicutu.so.0
 @lib lib/libicutu.so.${LIBicutu_VERSION}
-lib/libicuuc.so
-lib/libicuuc.so.0
 @lib lib/libicuuc.so.${LIBicuuc_VERSION}
 @man man/man1/derb.1
 @man man/man1/genbrk.1