Fri Oct 6 05:42:01 2017 UTC ()
Fix building on Darwin


(adam)
diff -r1.67 -r1.68 pkgsrc/textproc/icu/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/icu/patches/patch-i18n_digitlst.cpp
cvs diff -r1.67 -r1.68 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2017/10/05 22:50:30 1.67
+++ pkgsrc/textproc/icu/distinfo 2017/10/06 05:42:01 1.68
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.67 2017/10/05 22:50:30 maya Exp $ 1$NetBSD: distinfo,v 1.68 2017/10/06 05:42:01 adam Exp $
2 2
3SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82 3SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
4RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809 4RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
5SHA512 (icu4c-59_1-src.tgz) = 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4 5SHA512 (icu4c-59_1-src.tgz) = 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
6Size (icu4c-59_1-src.tgz) = 22706578 bytes 6Size (icu4c-59_1-src.tgz) = 22706578 bytes
7SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 7SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4
8SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 8SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
9SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 9SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20
10SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 10SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
11SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c 11SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
12SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 12SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8
13SHA1 (patch-common_uposixdefs.h) = 52a6fa2c531068de285d9babb1a98b84c564450e 13SHA1 (patch-common_uposixdefs.h) = 52a6fa2c531068de285d9babb1a98b84c564450e
14SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 14SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886
15SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 15SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
16SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 16SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
17SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 17SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
18SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2 18SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2
19SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d 19SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
20SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 20SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
21SHA1 (patch-i18n_digitlst.cpp) = 6f4721d94f0985f5fbce1de75070ebff6a929246 21SHA1 (patch-i18n_digitlst.cpp) = 000abf4ad9d963e3e786eeccf5a74f01fac33838
22SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 22SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
23SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2 23SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
24SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110 24SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110
cvs diff -r1.3 -r1.4 pkgsrc/textproc/icu/patches/Attic/patch-i18n_digitlst.cpp (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/Attic/patch-i18n_digitlst.cpp 2017/10/05 22:50:30 1.3
+++ pkgsrc/textproc/icu/patches/Attic/patch-i18n_digitlst.cpp 2017/10/06 05:42:01 1.4
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-i18n_digitlst.cpp,v 1.3 2017/10/05 22:50:30 maya Exp $ 1$NetBSD: patch-i18n_digitlst.cpp,v 1.4 2017/10/06 05:42:01 adam Exp $
2 2
3Never include xlocale.h - not portable header, also removed in current 3Do not include xlocale.h, except for Darwin - not portable header,
4glibc. 4also removed in current glibc.
5 5
6--- i18n/digitlst.cpp.orig 2017-01-20 00:20:31.000000000 +0000 6--- i18n/digitlst.cpp.orig 2017-01-20 00:20:31.000000000 +0000
7+++ i18n/digitlst.cpp 7+++ i18n/digitlst.cpp
8@@ -61,11 +61,7 @@ 8@@ -61,10 +61,10 @@
9 #endif 9 #endif
10  10
11 #if U_USE_STRTOD_L 11 #if U_USE_STRTOD_L
12-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN 12-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
13-# include <locale.h> 13-# include <locale.h>
14-# else 14-# else
15-# include <xlocale.h> 15+# ifdef __APPLE__
16-# endif 16 # include <xlocale.h>
17+# include <locale.h> 17+# else
 18+# include <locale.h>
 19 # endif
18 #endif 20 #endif
19  21
20 // ***************************************************************************