diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/Makefile | 4 | ||||
| -rw-r--r-- | textproc/icu/PLIST | 21 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 19 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-ad | 12 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-af | 10 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_putilimp.h | 8 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_unicode_platform.h | 16 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-config_icu-config-bottom | 8 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-configure | 22 |
9 files changed, 72 insertions, 48 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 1001761fac7..54bfe3f4d40 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.85 2013/10/04 18:26:29 joerg Exp $ +# $NetBSD: Makefile,v 1.86 2013/10/19 08:47:36 adam Exp $ -DISTNAME= icu4c-51_2-src +DISTNAME= icu4c-52_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} CATEGORIES= textproc MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ diff --git a/textproc/icu/PLIST b/textproc/icu/PLIST index 32a8830fd36..ed9be6f4957 100644 --- a/textproc/icu/PLIST +++ b/textproc/icu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2013/06/04 06:39:45 adam Exp $ +@comment $NetBSD: PLIST,v 1.30 2013/10/19 08:47:36 adam Exp $ bin/derb bin/genbrk bin/gencfu @@ -138,6 +138,7 @@ include/unicode/udateintervalformat.h include/unicode/udatpg.h include/unicode/udisplaycontext.h include/unicode/uenum.h +include/unicode/uformattable.h include/unicode/ugender.h include/unicode/uidna.h include/unicode/uiter.h @@ -156,9 +157,11 @@ include/unicode/unistr.h include/unicode/unorm.h include/unicode/unorm2.h include/unicode/unum.h +include/unicode/unumsys.h include/unicode/uobject.h include/unicode/upluralrules.h include/unicode/uregex.h +include/unicode/uregion.h include/unicode/urename.h include/unicode/urep.h include/unicode/ures.h @@ -193,35 +196,35 @@ lib/icu/current lib/icu/pkgdata.inc lib/libicudata.a lib/libicudata.so -lib/libicudata.so.51 +lib/libicudata.so.52 lib/libicudata.so.${PKGVERSION} lib/libicui18n.a lib/libicui18n.so -lib/libicui18n.so.51 +lib/libicui18n.so.52 lib/libicui18n.so.${PKGVERSION} lib/libicuio.a lib/libicuio.so -lib/libicuio.so.51 +lib/libicuio.so.52 lib/libicuio.so.${PKGVERSION} lib/libicule.a lib/libicule.so -lib/libicule.so.51 +lib/libicule.so.52 lib/libicule.so.${PKGVERSION} lib/libiculx.a lib/libiculx.so -lib/libiculx.so.51 +lib/libiculx.so.52 lib/libiculx.so.${PKGVERSION} lib/libicutest.a lib/libicutest.so -lib/libicutest.so.51 +lib/libicutest.so.52 lib/libicutest.so.${PKGVERSION} lib/libicutu.a lib/libicutu.so -lib/libicutu.so.51 +lib/libicutu.so.52 lib/libicutu.so.${PKGVERSION} lib/libicuuc.a lib/libicuuc.so -lib/libicuuc.so.51 +lib/libicuuc.so.52 lib/libicuuc.so.${PKGVERSION} lib/pkgconfig/icu-i18n.pc lib/pkgconfig/icu-io.pc diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 56b4209c6aa..3bf3605297a 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,19 +1,20 @@ -$NetBSD: distinfo,v 1.39 2013/10/07 15:58:48 ryoon Exp $ +$NetBSD: distinfo,v 1.40 2013/10/19 08:47:36 adam Exp $ -SHA1 (icu4c-51_2-src.tgz) = 074a28dfc96d37ce72c831f3e3e2d686f1f76a14 -RMD160 (icu4c-51_2-src.tgz) = ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6 -Size (icu4c-51_2-src.tgz) = 21841928 bytes +SHA1 (icu4c-52_1-src.tgz) = 6de440b71668f1a65a9344cdaf7a437291416781 +RMD160 (icu4c-52_1-src.tgz) = cbfbb18c3991ba55ebb50c607d5208cbfeb9fce3 +Size (icu4c-52_1-src.tgz) = 23875368 bytes SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 -SHA1 (patch-ad) = 024dcc26c96a4c9de88890f2e2a093b2d08014a0 -SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842 +SHA1 (patch-ad) = 8189e81e9c624e3b7a42f9af65a4b2f334747284 +SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067 SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996 -SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810 -SHA1 (patch-common_unicode_platform.h) = b63efd1a91fd32c8c36ed2b0e066955c65f1cc66 +SHA1 (patch-common_putilimp.h) = fa01ff80b5e921444cbdab2ef273516c78d8afde +SHA1 (patch-common_unicode_platform.h) = 6b5989b06db0431f391809af05a1dca302f2e906 SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 -SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a +SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659 +SHA1 (patch-configure) = 05998976e3fb37a75d47476d3e8409794deccd31 SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1 SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447 diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad index c9cb1c735b6..53dc1148d92 100644 --- a/textproc/icu/patches/patch-ad +++ b/textproc/icu/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.12 2013/10/05 11:08:24 tron Exp $ +$NetBSD: patch-ad,v 1.13 2013/10/19 08:47:36 adam Exp $ ---- icudefs.mk.in.orig 2013-05-23 21:06:32.000000000 +0100 -+++ icudefs.mk.in 2013-10-05 12:01:05.000000000 +0100 -@@ -207,13 +207,13 @@ +--- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000 ++++ icudefs.mk.in +@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) ## If we can't use the shared libraries, use the static libraries ifneq ($(ENABLE_SHARED),YES) @@ -18,8 +18,8 @@ $NetBSD: patch-ad,v 1.12 2013/10/05 11:08:24 tron Exp $ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a SOBJ = $(SO) -@@ -306,5 +306,9 @@ - cross_buildroot = $(top_builddir) +@@ -311,5 +311,9 @@ ifneq ($(TEST_STATUS_FILE),) + TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)" endif +ifeq ($(DSO_LIBDIR),) diff --git a/textproc/icu/patches/patch-af b/textproc/icu/patches/patch-af index fb25f6aaed9..10f95868ba6 100644 --- a/textproc/icu/patches/patch-af +++ b/textproc/icu/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.12 2012/11/07 20:59:51 adam Exp $ +$NetBSD: patch-af,v 1.13 2013/10/19 08:47:36 adam Exp $ ---- runConfigureICU.orig 2011-07-19 21:19:38.000000000 +0000 +--- runConfigureICU.orig 2013-10-04 20:54:58.000000000 +0000 +++ runConfigureICU -@@ -284,7 +284,7 @@ case $platform in - RELEASE_CFLAGS='-O3' - RELEASE_CXXFLAGS='-O3' +@@ -315,7 +315,7 @@ case $platform in + CXXFLAGS="--std=c++03" + export CXXFLAGS ;; - *BSD) + *BSD | DragonFly) diff --git a/textproc/icu/patches/patch-common_putilimp.h b/textproc/icu/patches/patch-common_putilimp.h index 5c656a3896a..7d8495c6d6f 100644 --- a/textproc/icu/patches/patch-common_putilimp.h +++ b/textproc/icu/patches/patch-common_putilimp.h @@ -1,10 +1,10 @@ -$NetBSD: patch-common_putilimp.h,v 1.2 2012/11/07 20:59:51 adam Exp $ +$NetBSD: patch-common_putilimp.h,v 1.3 2013/10/19 08:47:36 adam Exp $ ---- common/putilimp.h.orig 2012-11-05 17:14:50.000000000 +0000 +--- common/putilimp.h.orig 2013-10-04 20:49:30.000000000 +0000 +++ common/putilimp.h -@@ -123,6 +123,8 @@ typedef size_t uintptr_t; +@@ -128,6 +128,8 @@ typedef size_t uintptr_t; /* not defined */ - #elif U_PLATFORM == U_PF_OS400 + #elif U_PLATFORM == U_PF_IPHONE /* not defined */ +#elif defined(__MirBSD__) + /* not defined */ diff --git a/textproc/icu/patches/patch-common_unicode_platform.h b/textproc/icu/patches/patch-common_unicode_platform.h index 6e2f2382498..dcdf8dfc956 100644 --- a/textproc/icu/patches/patch-common_unicode_platform.h +++ b/textproc/icu/patches/patch-common_unicode_platform.h @@ -1,19 +1,17 @@ -$NetBSD: patch-common_unicode_platform.h,v 1.4 2013/10/07 15:58:48 ryoon Exp $ +$NetBSD: patch-common_unicode_platform.h,v 1.5 2013/10/19 08:47:36 adam Exp $ -* For OpenBSD, include machine/endian.h. - ---- common/unicode/platform.h.orig 2013-05-23 20:01:56.000000000 +0000 +--- common/unicode/platform.h.orig 2013-10-04 20:49:10.000000000 +0000 +++ common/unicode/platform.h -@@ -144,7 +144,7 @@ - # include <android/api-level.h> - #elif defined(linux) || defined(__linux__) || defined(__linux) - # define U_PLATFORM U_PF_LINUX +@@ -151,7 +151,7 @@ + # else + # define U_PLATFORM U_PF_DARWIN + # endif -#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) +#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__) # define U_PLATFORM U_PF_BSD #elif defined(sun) || defined(__sun) /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ -@@ -381,6 +381,17 @@ +@@ -379,6 +379,17 @@ # define U_IS_BIG_ENDIAN 1 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) # define U_IS_BIG_ENDIAN 0 diff --git a/textproc/icu/patches/patch-config_icu-config-bottom b/textproc/icu/patches/patch-config_icu-config-bottom index 82f63c38e01..146a2bf23f1 100644 --- a/textproc/icu/patches/patch-config_icu-config-bottom +++ b/textproc/icu/patches/patch-config_icu-config-bottom @@ -1,8 +1,8 @@ -$NetBSD: patch-config_icu-config-bottom,v 1.2 2012/04/25 18:53:44 adam Exp $ +$NetBSD: patch-config_icu-config-bottom,v 1.3 2013/10/19 08:47:36 adam Exp $ ---- config/icu-config-bottom.orig 2012-04-05 20:46:38.000000000 +0000 +--- config/icu-config-bottom.orig 2013-10-04 20:50:00.000000000 +0000 +++ config/icu-config-bottom -@@ -352,11 +352,11 @@ do +@@ -355,11 +355,11 @@ do ;; --version) @@ -14,5 +14,5 @@ $NetBSD: patch-config_icu-config-bottom,v 1.2 2012/04/25 18:53:44 adam Exp $ - echo $ECHO_N $UNICODE_VERSION + echo $ECHO_N $UNICODE_VERSION${ECHO_C} ;; - + --host) diff --git a/textproc/icu/patches/patch-configure b/textproc/icu/patches/patch-configure new file mode 100644 index 00000000000..74f0f7a5f20 --- /dev/null +++ b/textproc/icu/patches/patch-configure @@ -0,0 +1,22 @@ +$NetBSD: patch-configure,v 1.1 2013/10/19 08:47:36 adam Exp $ + +Portability fix. + +--- configure.orig 2013-10-19 08:15:50.000000000 +0000 ++++ configure +@@ -7442,13 +7442,13 @@ fi + # Now that we're done using CPPFLAGS etc. for tests, we can change it + # for build. + +-if test "${CC}" == "clang"; then ++if test "${CC}" = "clang"; then + CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" + else + CLANGCFLAGS="" + fi + +-if test "${CXX}" == "clang++"; then ++if test "${CXX}" = "clang++"; then + CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" + else + CLANGCXXFLAGS="" |