Correctly install DLLs for Cygwin. The dynamic data library build is

still a bit fishy, but this gets it to a mostly usable state at least.

13 files changed, 189 insertions, 3 deletions

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index b21daf4c9bf..1001761fac7 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2013/06/04 06:39:45 adam Exp $
+# $NetBSD: Makefile,v 1.85 2013/10/04 18:26:29 joerg Exp $
 
 DISTNAME=	icu4c-51_2-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
@@ -47,13 +47,15 @@ CFLAGS.SunOS+=		-std=c99
 PLIST_SUBST+=		MH_NAME=mh-irix
 .elif ${OPSYS} == "Darwin"
 PLIST_SUBST+=		MH_NAME=mh-darwin
+.elif ${OPSYS} == "Cygwin"
+PLIST_SUBST+=		MH_NAME=mh-cygwin
 .else
 # For unknown systems, set the filename to mh-unknown so that the user
 # gets a warning about missing files.
 PLIST_SUBST+=		MH_NAME=mh-unknown
 .endif
 
-.if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
 INSTALL_UNSTRIPPED=	yes
 .endif
 
@@ -66,4 +68,11 @@ CFLAGS+=	-march=i486
 .  endif
 .endif
 
+INSTALLATION_DIRS=	bin
+
+.if ${OPSYS} == "Cygwin"
+post-install:
+	mv ${DESTDIR}${PREFIX}/lib/cygicudata.dll ${DESTDIR}${PREFIX}/bin/
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/PLIST.Cygwin b/textproc/icu/PLIST.Cygwin
new file mode 100644
index 00000000000..a48c855ece6
--- /dev/null
+++ b/textproc/icu/PLIST.Cygwin
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST.Cygwin,v 1.1 2013/10/04 18:26:29 joerg Exp $
+bin/cygicudata.dll
+bin/cygicui18n.dll
+bin/cygicuio.dll
+bin/cygicule.dll
+bin/cygiculx.dll
+bin/cygicutest.dll
+bin/cygicutu.dll
+bin/cygicuuc.dll
+lib/libicudata.dll.a
+lib/libicudatadll.a
+lib/libicui18n.dll.a
+lib/libicuio.dll.a
+lib/libicule.dll.a
+lib/libiculx.dll.a
+lib/libicutest.dll.a
+lib/libicutu.dll.a
+lib/libicuuc.dll.a
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 5cc905b9b40..5c643eed8ae 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2013/06/04 06:39:45 adam Exp $
+$NetBSD: distinfo,v 1.36 2013/10/04 18:26:29 joerg Exp $
 
 SHA1 (icu4c-51_2-src.tgz) = 074a28dfc96d37ce72c831f3e3e2d686f1f76a14
 RMD160 (icu4c-51_2-src.tgz) = ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6
@@ -8,7 +8,17 @@ SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e
 SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842
+SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996
 SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810
 SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfbaa
 SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
 SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
+SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659
+SHA1 (patch-data_Makefile.in) = 15034bdaebdcf7152e429deda4df685dd3658594
+SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd
+SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447
+SHA1 (patch-layout_Makefile.in) = 6914279785c618d4078d4595a9097df006043eed
+SHA1 (patch-layoutex_Makefile.in) = b1284874108d22b1ca6803c98b1ce9bd6d1682fe
+SHA1 (patch-stubdata_Makefile.in) = 358c84811cd8138fed2e108d33f8bcfdac1ac585
+SHA1 (patch-tools_ctestfw_Makefile.in) = 7d7874baee8785b6f1c889e7db1dd4acff5d5797
+SHA1 (patch-tools_toolutil_Makefile.in) = be08c92bef0f367f502a712acbad869952102cc8
diff --git a/textproc/icu/patches/patch-common_Makefile.in b/textproc/icu/patches/patch-common_Makefile.in
new file mode 100644
index 00000000000..780a5f0c592
--- /dev/null
+++ b/textproc/icu/patches/patch-common_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-common_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- common/Makefile.in.orig	2013-10-03 18:02:27.484530600 +0000
++++ common/Makefile.in
+@@ -146,7 +146,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-config_mh-cygwin b/textproc/icu/patches/patch-config_mh-cygwin
new file mode 100644
index 00000000000..f923ef5c125
--- /dev/null
+++ b/textproc/icu/patches/patch-config_mh-cygwin
@@ -0,0 +1,27 @@
+$NetBSD: patch-config_mh-cygwin,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- config/mh-cygwin.orig	2013-10-03 16:25:57.188493800 +0000
++++ config/mh-cygwin
+@@ -84,12 +84,11 @@ IMPORT_LIB_EXT = .dll.a
+ ## Versioned target for a shared library.
+ ## Since symbolic links don't work the same way on Windows,
+ ## we only use the version major number.
+-#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
+-FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
++FINAL_SO_TARGET=$(SO_TARGET)
+ MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
+ 
+ IMPORT_LIB = $(subst cyg,lib,$(FINAL_SO_TARGET)).$(A)#M#
+-MIDDLE_IMPORT_LIB = $(subst cyg,lib,$(basename $(SO_TARGET)))$(SO_TARGET_VERSION_MAJOR).$(SO).$(A)#M#
++MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
+ FINAL_IMPORT_LIB = $(IMPORT_LIB)#M#
+ 
+ # The following is for Makefile.inc's use.
+@@ -103,6 +102,7 @@ ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJ
+ 
+ ## Install libraries as executable
+ INSTALL-L=$(INSTALL_PROGRAM)
++DSO_LIBDIR = $(DESTDIR)$(bindir)
+ 
+ ##  Bind internal references
+ 
diff --git a/textproc/icu/patches/patch-data_Makefile.in b/textproc/icu/patches/patch-data_Makefile.in
new file mode 100644
index 00000000000..1704ecf65b5
--- /dev/null
+++ b/textproc/icu/patches/patch-data_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-data_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- data/Makefile.in.orig	2013-05-23 20:06:20.000000000 +0000
++++ data/Makefile.in
+@@ -24,9 +24,13 @@ LIB_STATIC_ICUDATA_NAME=$(LIBSICU)$(DATA
+ ifeq ($(PKGDATA_OPTS),)
+ PKGDATA_OPTS = -O $(top_builddir)/data/icupkg.inc
+ endif
++ifeq ($(DSO_LIBDIR),)
+ ifeq ($(PKGDATA_VERSIONING),)
+ PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION)
+ endif
++else
++PKGDATA_VERSIONING =
++endif
+ 
+ # This allows all the data to be in one directory
+ ifeq ($(PKGDATA_MODE),dll)
diff --git a/textproc/icu/patches/patch-i18n_Makefile.in b/textproc/icu/patches/patch-i18n_Makefile.in
new file mode 100644
index 00000000000..86a8bb9ff71
--- /dev/null
+++ b/textproc/icu/patches/patch-i18n_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-i18n_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- i18n/Makefile.in.orig	2013-10-03 16:26:29.194516200 +0000
++++ i18n/Makefile.in
+@@ -125,7 +125,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-io_Makefile.in b/textproc/icu/patches/patch-io_Makefile.in
new file mode 100644
index 00000000000..c80f112df50
--- /dev/null
+++ b/textproc/icu/patches/patch-io_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-io_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- io/Makefile.in.orig	2013-10-03 16:27:26.937546600 +0000
++++ io/Makefile.in
+@@ -99,7 +99,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-layout_Makefile.in b/textproc/icu/patches/patch-layout_Makefile.in
new file mode 100644
index 00000000000..60a44e120b8
--- /dev/null
+++ b/textproc/icu/patches/patch-layout_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-layout_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- layout/Makefile.in.orig	2013-10-03 16:27:26.927532200 +0000
++++ layout/Makefile.in
+@@ -183,7 +183,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-layoutex_Makefile.in b/textproc/icu/patches/patch-layoutex_Makefile.in
new file mode 100644
index 00000000000..8dde07d8400
--- /dev/null
+++ b/textproc/icu/patches/patch-layoutex_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-layoutex_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- layoutex/Makefile.in.orig	2013-10-03 16:27:26.917517800 +0000
++++ layoutex/Makefile.in
+@@ -100,7 +100,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-stubdata_Makefile.in b/textproc/icu/patches/patch-stubdata_Makefile.in
new file mode 100644
index 00000000000..2181a5e72ae
--- /dev/null
+++ b/textproc/icu/patches/patch-stubdata_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-stubdata_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- stubdata/Makefile.in.orig	2013-10-03 16:27:26.907503400 +0000
++++ stubdata/Makefile.in
+@@ -85,7 +85,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-tools_ctestfw_Makefile.in b/textproc/icu/patches/patch-tools_ctestfw_Makefile.in
new file mode 100644
index 00000000000..66eedfa4dfd
--- /dev/null
+++ b/textproc/icu/patches/patch-tools_ctestfw_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_ctestfw_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- tools/ctestfw/Makefile.in.orig	2013-10-03 16:26:50.324900200 +0000
++++ tools/ctestfw/Makefile.in
+@@ -81,7 +81,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))
diff --git a/textproc/icu/patches/patch-tools_toolutil_Makefile.in b/textproc/icu/patches/patch-tools_toolutil_Makefile.in
new file mode 100644
index 00000000000..1158ced5fae
--- /dev/null
+++ b/textproc/icu/patches/patch-tools_toolutil_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_toolutil_Makefile.in,v 1.1 2013/10/04 18:26:29 joerg Exp $
+
+--- tools/toolutil/Makefile.in.orig	2013-10-03 16:26:46.529442600 +0000
++++ tools/toolutil/Makefile.in
+@@ -92,7 +92,7 @@ ifneq ($(ENABLE_STATIC),)
+ 	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+-	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL-L) $(FINAL_SO_TARGET) $(DSO_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))