diff options
author | obache <obache@pkgsrc.org> | 2014-06-08 08:32:10 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2014-06-08 08:32:10 +0000 |
commit | 914eaf22c5f566d2a8829db59f163144fe067bd8 (patch) | |
tree | 97cf0138e54a295668ee8df790abacf8f2264522 /textproc/icu | |
parent | 82cf7c052024dc7855aedd58029fdc780405ed8a (diff) | |
download | pkgsrc-914eaf22c5f566d2a8829db59f163144fe067bd8.tar.gz |
Use Cygwin package way instead of tons patches affect to other platforms.
Diffstat (limited to 'textproc/icu')
-rw-r--r-- | textproc/icu/Makefile | 23 | ||||
-rw-r--r-- | textproc/icu/distinfo | 14 | ||||
-rw-r--r-- | textproc/icu/patches/patch-ad | 12 | ||||
-rw-r--r-- | textproc/icu/patches/patch-common_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-config_mh-cygwin | 27 | ||||
-rw-r--r-- | textproc/icu/patches/patch-data_Makefile.in | 18 | ||||
-rw-r--r-- | textproc/icu/patches/patch-i18n_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-io_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-layout_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-layoutex_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-stubdata_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-tools_ctestfw_Makefile.in | 13 | ||||
-rw-r--r-- | textproc/icu/patches/patch-tools_toolutil_Makefile.in | 13 |
13 files changed, 22 insertions, 176 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 0e69fb76622..cc994b2655a 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2014/06/03 09:08:05 obache Exp $ +# $NetBSD: Makefile,v 1.90 2014/06/08 08:32:10 obache Exp $ DISTNAME= icu4c-53_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} @@ -98,11 +98,26 @@ CFLAGS+= -march=i486 . endif .endif -INSTALLATION_DIRS= bin - .if ${OPSYS} == "Cygwin" +SO_MAJOR= ${PKGVERSION_NOREV:R} +. for l in data i18n io le lx test tu uc +GENERATE_PLIST+= ${ECHO} bin/cygicu${l}${SO_MAJOR}.dll; +GENERATE_PLIST+= ${ECHO} lib/libicu${l}${SO_MAJOR}.dll.a; +. endfor + post-install: - mv ${DESTDIR}${PREFIX}/lib/cygicudata.dll ${DESTDIR}${PREFIX}/bin/ + mv ${DESTDIR}${PREFIX}/lib/cygicu*.dll ${DESTDIR}${PREFIX}/bin/ +. for l in data i18n io le lx test tu uc + ${LN} -s libicu${l}${SO_MAJOR}.dll.a ${DESTDIR}${PREFIX}/lib/libicu${l}.dll.a +. endfor + +SUBST_CLASSES+= icu-config +SUBST_STAGE.icu-config= post-install +SUBST_FILES.icu-config= ${DESTDIR}${PREFIX}/bin/icu-config +SUBST_SED.icu-config+= -e '/^ICUUC_FILE=/ s/libdir/bindir/' +SUBST_SED.icu-config+= -e 's/l$${LIBICU}/l$${ICUPREFIX}/g' +SUBST_SED.icu-config+= -e '/l$${ICUPREFIX}/ s/$${ICULIBSUFFIX_VERSION}//g' + .endif .include "../../mk/bsd.pkg.mk" diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index bb06b19eed8..be7afc9f1a3 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2014/05/05 21:25:11 ryoon Exp $ +$NetBSD: distinfo,v 1.47 2014/06/08 08:32:10 obache Exp $ SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9 @@ -7,23 +7,13 @@ SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17 -SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284 +SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067 -SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 -SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659 SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025 SHA1 (patch-configure) = 6888d11d4e0eb809c50780fec7fbff53861d1901 SHA1 (patch-configure.ac) = 8a273518838ecb38378ca4577f8b93985e4e86b6 -SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1 -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-ad b/textproc/icu/patches/patch-ad index 53dc1148d92..a4ef00ae7cc 100644 --- a/textproc/icu/patches/patch-ad +++ b/textproc/icu/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.13 2013/10/19 08:47:36 adam Exp $ +$NetBSD: patch-ad,v 1.14 2014/06/08 08:32:10 obache Exp $ --- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000 +++ icudefs.mk.in @@ -18,13 +18,3 @@ $NetBSD: patch-ad,v 1.13 2013/10/19 08:47:36 adam Exp $ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a SOBJ = $(SO) -@@ -311,5 +311,9 @@ ifneq ($(TEST_STATUS_FILE),) - TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)" - endif - -+ifeq ($(DSO_LIBDIR),) -+DSO_LIBDIR= $(DESTDIR)$(libdir) -+endif -+ - # optional include at top - -include $(top_builddir)/icudefs.local diff --git a/textproc/icu/patches/patch-common_Makefile.in b/textproc/icu/patches/patch-common_Makefile.in deleted file mode 100644 index 780a5f0c592..00000000000 --- a/textproc/icu/patches/patch-common_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index f923ef5c125..00000000000 --- a/textproc/icu/patches/patch-config_mh-cygwin +++ /dev/null @@ -1,27 +0,0 @@ -$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 deleted file mode 100644 index d8b40c7bd91..00000000000 --- a/textproc/icu/patches/patch-data_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-data_Makefile.in,v 1.2 2013/10/05 11:43:32 tron 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 -+ifneq ($(OPSYS),Cygwin) - 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 deleted file mode 100644 index 86a8bb9ff71..00000000000 --- a/textproc/icu/patches/patch-i18n_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index c80f112df50..00000000000 --- a/textproc/icu/patches/patch-io_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 60a44e120b8..00000000000 --- a/textproc/icu/patches/patch-layout_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 8dde07d8400..00000000000 --- a/textproc/icu/patches/patch-layoutex_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 2181a5e72ae..00000000000 --- a/textproc/icu/patches/patch-stubdata_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 66eedfa4dfd..00000000000 --- a/textproc/icu/patches/patch-tools_ctestfw_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 1158ced5fae..00000000000 --- a/textproc/icu/patches/patch-tools_toolutil_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$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)) |