Fri Oct 9 23:15:34 2015 UTC ()
Update to 56.1

Changelog:
Release Overview
The features for this release include support of CLDR 28 and Unicode 8.0.

For more details, including migration issues, see below.
Common Changes

    CLDR 28: For details of the many changes in CLDR, see CLDR 28.
    Unicode data updated to Unicode 8.0: 41 new emoji characters, 5,771 new ideographs for Chinese/Japanese/Korean, 6 new scripts, improved character properties data, etc.
    ICU data size reduced by about 7.2% (1.8MB) via sharing string values across resource bundles. [#11537]
    DateIntervalFormat now handles intervals with seconds, and sets FieldPosition more consistently. [#11706, #11726]
    DateFormat::createInstanceForSkeleton() caches DateFormat patterns rather than DateTimePatternGenerator instances, for better performance (for cache hits) and lower heap memory consumption. [#11780]
    StringSearch (based on collation) defaults to matches on normalization boundaries rather than grapheme cluster boundaries, which yields more matches on Indic text. [#11750]
    RuleBasedNumberFormat (spelled-out numbers) now handles rounding (Java only), infinity, NaN. [#11653, #11760, #8223]
    Most of the old Normalizer/unorm.h had been replaced by (and reimplemented via) Normalizer2, and is now deprecated. [#7303]
    COLON has been withdrawn as a date pattern character corresponding to the date field [UDAT_]TIME_SEPARATOR_FIELD; there is currently no pattern character corresponding to that field. [#11773]
    Support for locale key "cf" to specify currency format style, and interaction with NumberFormat values for UNumberFormatStyle: [#11787]
        For NumberFormat style UNUM_CURRENCY / CURRENCYSTYLE, the default is "standard" currency style (typically using minus sign for negative numbers), but the new locale key "cf" may be used with values "standard" or "account" to specify currency format style ("account" indicates accounting style, often using parentheses for negative numbers).
        For other NumberFormat styles, the locale key "cf" is ignored (they override the locale preference):
            UNUM_CURRENCY_ISO / ISOCURRENCYSTYLE
            UNUM_CURRENCY_PLURAL / PLURALCURRENCYSTYLE
            UNUM_CURRENCY_ACCOUNTING / ACCOUNTINGCURRENCYSTYLE
            UNUM_CASH_CURRENCY / CASHCURRENCYSTYLE
        A new NumberFormat style is availble to explicitly specify standard style, ignoring the  the locale key "cf"
            UNUM_CURRENCY_STANDARD / STANDARDCURRENCYSTYLE

ICU4C Specific Changes

    C API support for CompactDecimalFormat via UNumberFormatStyle additions: UNUM_DECIMAL_COMPACT_SHORT, UNUM_DECIMAL_COMPACT_LONG [#11693]
    Larger UnicodeString object stores more characters inside the object without heap allocation; the UnicodeString object size is now build-time-configurable. [#11551]
        On 64-bit machines, increase from object size 40 bytes with 15 internal UChars to a new default of 64 bytes with 27 UChars.
    Some C++ classes now have swap() and moveFrom() methods, and support C++11 move semantics on compilers that support them. [#10086]
        UnicodeString, LocalPointer, LocalArray
    DecimalFormat code refactored to fix bugs, improve maintainability, and improve performance. [#10458]
    New FilteredBreakIterator suppresses certain segment boundaries. For example, it can suppress the sentence boundary in the middle of "Mr. Smith". [#11248]
    The internal, shared cache has been changed from unbounded to bounded. [#11767]
    For [U]BreakIterator with type UBRK_SENTENCE, the locale key "ss" can now be used with value "standard" to specify that standard sentence break suppression data should be used, or with value "none" to indicate that no break suppression data should be used (the default). [#11770]
    Collator: first-time startup time improved 20% due to precalculated unsafe-backward table [#11886]
    A number of memory leaks and buffer overruns have been fixed based on static code analysis, mostly in data build tools


(ryoon)
diff -r1.100 -r1.101 pkgsrc/textproc/icu/Makefile
diff -r1.33 -r1.34 pkgsrc/textproc/icu/PLIST
diff -r1.55 -r1.56 pkgsrc/textproc/icu/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_putil.cpp
diff -r1.1 -r0 pkgsrc/textproc/icu/patches/patch-common_ucnv__io.cpp
diff -r1.6 -r1.7 pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h
diff -r1.7 -r1.8 pkgsrc/textproc/icu/patches/patch-configure
diff -r1.4 -r1.5 pkgsrc/textproc/icu/patches/patch-configure.ac

cvs diff -r1.100 -r1.101 pkgsrc/textproc/icu/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/icu/Makefile 2015/09/29 02:15:54 1.100
+++ pkgsrc/textproc/icu/Makefile 2015/10/09 23:15:34 1.101
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.100 2015/09/29 02:15:54 tnn Exp $ 1# $NetBSD: Makefile,v 1.101 2015/10/09 23:15:34 ryoon Exp $
2 2
3DISTNAME= icu4c-55_1-src 3DISTNAME= icu4c-56_1-src
4PKGREVISION= 1 
5PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} 4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
6CATEGORIES= textproc 5CATEGORIES= textproc
7MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.icu-project.org/ 10HOMEPAGE= http://www.icu-project.org/
12COMMENT= Robust and full-featured Unicode services 11COMMENT= Robust and full-featured Unicode services
13LICENSE= mit 12LICENSE= mit
14 13
15WRKSRC= ${WRKDIR}/icu/source 14WRKSRC= ${WRKDIR}/icu/source
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake

cvs diff -r1.33 -r1.34 pkgsrc/textproc/icu/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/icu/PLIST 2015/04/06 07:22:54 1.33
+++ pkgsrc/textproc/icu/PLIST 2015/10/09 23:15:34 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.33 2015/04/06 07:22:54 adam Exp $ 1@comment $NetBSD: PLIST,v 1.34 2015/10/09 23:15:34 ryoon Exp $
2bin/derb 2bin/derb
3bin/genbrk 3bin/genbrk
4bin/gencfu 4bin/gencfu
5bin/gencnval 5bin/gencnval
6bin/gendict 6bin/gendict
7bin/genrb 7bin/genrb
8bin/icu-config 8bin/icu-config
9bin/icuinfo 9bin/icuinfo
10bin/makeconv 10bin/makeconv
11bin/pkgdata 11bin/pkgdata
12bin/uconv 12bin/uconv
13include/layout/LEFontInstance.h 13include/layout/LEFontInstance.h
14include/layout/LEGlyphFilter.h 14include/layout/LEGlyphFilter.h
@@ -191,71 +191,71 @@ include/unicode/utmscale.h @@ -191,71 +191,71 @@ include/unicode/utmscale.h
191include/unicode/utrace.h 191include/unicode/utrace.h
192include/unicode/utrans.h 192include/unicode/utrans.h
193include/unicode/utypes.h 193include/unicode/utypes.h
194include/unicode/uvernum.h 194include/unicode/uvernum.h
195include/unicode/uversion.h 195include/unicode/uversion.h
196include/unicode/vtzone.h 196include/unicode/vtzone.h
197lib/icu/${PKGVERSION}/Makefile.inc 197lib/icu/${PKGVERSION}/Makefile.inc
198lib/icu/${PKGVERSION}/pkgdata.inc 198lib/icu/${PKGVERSION}/pkgdata.inc
199lib/icu/Makefile.inc 199lib/icu/Makefile.inc
200lib/icu/current 200lib/icu/current
201lib/icu/pkgdata.inc 201lib/icu/pkgdata.inc
202lib/libicudata.a 202lib/libicudata.a
203lib/libicudata.so 203lib/libicudata.so
204lib/libicudata.so.55 204lib/libicudata.so.56
205lib/libicudata.so.${PKGVERSION} 205lib/libicudata.so.${PKGVERSION}
206lib/libicui18n.a 206lib/libicui18n.a
207lib/libicui18n.so 207lib/libicui18n.so
208lib/libicui18n.so.55 208lib/libicui18n.so.56
209lib/libicui18n.so.${PKGVERSION} 209lib/libicui18n.so.${PKGVERSION}
210lib/libicuio.a 210lib/libicuio.a
211lib/libicuio.so 211lib/libicuio.so
212lib/libicuio.so.55 212lib/libicuio.so.56
213lib/libicuio.so.${PKGVERSION} 213lib/libicuio.so.${PKGVERSION}
214lib/libicule.a 214lib/libicule.a
215lib/libicule.so 215lib/libicule.so
216lib/libicule.so.55 216lib/libicule.so.56
217lib/libicule.so.${PKGVERSION} 217lib/libicule.so.${PKGVERSION}
218lib/libiculx.a 218lib/libiculx.a
219lib/libiculx.so 219lib/libiculx.so
220lib/libiculx.so.55 220lib/libiculx.so.56
221lib/libiculx.so.${PKGVERSION} 221lib/libiculx.so.${PKGVERSION}
222lib/libicutest.a 222lib/libicutest.a
223lib/libicutest.so 223lib/libicutest.so
224lib/libicutest.so.55 224lib/libicutest.so.56
225lib/libicutest.so.${PKGVERSION} 225lib/libicutest.so.${PKGVERSION}
226lib/libicutu.a 226lib/libicutu.a
227lib/libicutu.so 227lib/libicutu.so
228lib/libicutu.so.55 228lib/libicutu.so.56
229lib/libicutu.so.${PKGVERSION} 229lib/libicutu.so.${PKGVERSION}
230lib/libicuuc.a 230lib/libicuuc.a
231lib/libicuuc.so 231lib/libicuuc.so
232lib/libicuuc.so.55 232lib/libicuuc.so.56
233lib/libicuuc.so.${PKGVERSION} 233lib/libicuuc.so.${PKGVERSION}
234lib/pkgconfig/icu-i18n.pc 234lib/pkgconfig/icu-i18n.pc
235lib/pkgconfig/icu-io.pc 235lib/pkgconfig/icu-io.pc
236lib/pkgconfig/icu-le.pc 236lib/pkgconfig/icu-le.pc
237lib/pkgconfig/icu-lx.pc 237lib/pkgconfig/icu-lx.pc
238lib/pkgconfig/icu-uc.pc 238lib/pkgconfig/icu-uc.pc
239man/man1/derb.1 239man/man1/derb.1
240man/man1/genbrk.1 240man/man1/genbrk.1
241man/man1/gencfu.1 241man/man1/gencfu.1
242man/man1/gencnval.1 242man/man1/gencnval.1
243man/man1/gendict.1 243man/man1/gendict.1
244man/man1/genrb.1 244man/man1/genrb.1
245man/man1/icu-config.1 245man/man1/icu-config.1
246man/man1/makeconv.1 246man/man1/makeconv.1
247man/man1/pkgdata.1 247man/man1/pkgdata.1
248man/man1/uconv.1 248man/man1/uconv.1
249man/man8/genccode.8 249man/man8/genccode.8
250man/man8/gencmn.8 250man/man8/gencmn.8
251man/man8/gensprep.8 251man/man8/gensprep.8
252man/man8/icupkg.8 252man/man8/icupkg.8
253sbin/genccode 253sbin/genccode
254sbin/gencmn 254sbin/gencmn
255sbin/gennorm2 255sbin/gennorm2
256sbin/gensprep 256sbin/gensprep
257sbin/icupkg 257sbin/icupkg
258share/icu/${PKGVERSION}/config/${MH_NAME} 258share/icu/${PKGVERSION}/config/mh-bsd-gcc
259share/icu/${PKGVERSION}/install-sh 259share/icu/${PKGVERSION}/install-sh
260share/icu/${PKGVERSION}/license.html 260share/icu/${PKGVERSION}/license.html
261share/icu/${PKGVERSION}/mkinstalldirs 261share/icu/${PKGVERSION}/mkinstalldirs

cvs diff -r1.55 -r1.56 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2015/09/29 02:15:54 1.55
+++ pkgsrc/textproc/icu/distinfo 2015/10/09 23:15:34 1.56
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1$NetBSD: distinfo,v 1.55 2015/09/29 02:15:54 tnn Exp $ 1$NetBSD: distinfo,v 1.56 2015/10/09 23:15:34 ryoon Exp $
2 2
3SHA1 (icu4c-55_1-src.tgz) = 3bb301c11be0e239c653e8aa2925c53f6f4dc88d 3SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de
4RMD160 (icu4c-55_1-src.tgz) = 94dcaaac13b41de3588b01f39febe1b1cbd5765d 4RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0
5Size (icu4c-55_1-src.tgz) = 25600847 bytes 5Size (icu4c-56_1-src.tgz) = 25721871 bytes
6SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff 6SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff
7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
9SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 9SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09
10SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 10SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
11SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a 11SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a
12SHA1 (patch-common_putil.cpp) = 3d35bdea709ded1ae5926729fb23995ca8734687 12SHA1 (patch-common_putil.cpp) = 3058a542bcb2fdfa34b36acf389570990acd0da5
13SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 13SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
14SHA1 (patch-common_ucnv__io.cpp) = d521ac029edece65de06d5e1e8a8814269b0489e 
15SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c 14SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
16SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c 15SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8
17SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 16SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
18SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 17SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
19SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 18SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
20SHA1 (patch-configure) = 430389c77d35b93f1831e0444598eb86f61e315b 19SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4
21SHA1 (patch-configure.ac) = babf9edd0bef353e9fb8c47917658c0a65af5a36 20SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
22SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e 21SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e

cvs diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_putil.cpp (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-common_putil.cpp 2014/10/26 19:46:48 1.1
+++ pkgsrc/textproc/icu/patches/patch-common_putil.cpp 2015/10/09 23:15:34 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-common_putil.cpp,v 1.1 2014/10/26 19:46:48 bsiegert Exp $ 1$NetBSD: patch-common_putil.cpp,v 1.2 2015/10/09 23:15:34 ryoon Exp $
2 2
3--- common/putil.cpp.orig 2014-10-25 17:54:47.000000000 +0000 3--- common/putil.cpp.orig 2015-10-08 03:53:44.000000000 +0000
4+++ common/putil.cpp 4+++ common/putil.cpp
5@@ -117,6 +117,14 @@ 5@@ -117,6 +117,14 @@
6 #endif 6 #endif
7 7
8 /* 8 /*
9+ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined. 9+ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
10+ */ 10+ */
11+#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ == 1040 \ 11+#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ == 1040 \
12+ && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE)) 12+ && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
13+U_CFUNC struct tm *localtime_r(const time_t *, struct tm *); 13+U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
14+#endif 14+#endif
15+ 15+
16+/* 16+/*
17 * Only include langinfo.h if we have a way to get the codeset. If we later 17 * Only include langinfo.h if we have a way to get the codeset. If we later
18 * depend on more feature, we can test on U_HAVE_NL_LANGINFO. 18 * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
19 * 19 *

File Deleted: pkgsrc/textproc/icu/patches/Attic/patch-common_ucnv__io.cpp

cvs diff -r1.6 -r1.7 pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h 2013/12/03 21:16:06 1.6
+++ pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h 2015/10/09 23:15:34 1.7
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-common_unicode_platform.h,v 1.6 2013/12/03 21:16:06 bsiegert Exp $ 1$NetBSD: patch-common_unicode_platform.h,v 1.7 2015/10/09 23:15:34 ryoon Exp $
2 2
3--- common/unicode/platform.h.orig 2013-10-04 20:49:10.000000000 +0000 3--- common/unicode/platform.h.orig 2015-10-08 03:53:34.000000000 +0000
4+++ common/unicode/platform.h 4+++ common/unicode/platform.h
5@@ -151,7 +151,7 @@ 5@@ -159,7 +159,7 @@
6 # else 6 # else
7 # define U_PLATFORM U_PF_DARWIN 7 # define U_PLATFORM U_PF_DARWIN
8 # endif 8 # endif
9-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) 9-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
10+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__) 10+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
11 # define U_PLATFORM U_PF_BSD 11 # if defined(__FreeBSD__)
12 #elif defined(sun) || defined(__sun) 12 # include <sys/endian.h>
13 /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ 13 # endif
14@@ -379,6 +379,18 @@ 14@@ -388,6 +388,18 @@
15 # define U_IS_BIG_ENDIAN 1 15 # define U_IS_BIG_ENDIAN 1
16 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) 16 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
17 # define U_IS_BIG_ENDIAN 0 17 # define U_IS_BIG_ENDIAN 0
18+#elif U_PLATFORM == U_PF_BSD 18+#elif U_PLATFORM == U_PF_BSD
19+#include <sys/types.h> 19+#include <sys/types.h>
20+#if defined(__OpenBSD__) 20+#if defined(__OpenBSD__)
21+#include <machine/endian.h> 21+#include <machine/endian.h>
22+#else 22+#else
23+#include <sys/endian.h> 23+#include <sys/endian.h>
24+#endif 24+#endif
25+#if _BYTE_ORDER == _LITTLE_ENDIAN 25+#if _BYTE_ORDER == _LITTLE_ENDIAN
26+# define U_IS_BIG_ENDIAN 0 26+# define U_IS_BIG_ENDIAN 0
27+#else 27+#else

cvs diff -r1.7 -r1.8 pkgsrc/textproc/icu/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure 2015/08/31 15:26:19 1.7
+++ pkgsrc/textproc/icu/patches/patch-configure 2015/10/09 23:15:34 1.8
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1$NetBSD: patch-configure,v 1.7 2015/08/31 15:26:19 sevan Exp $ 1$NetBSD: patch-configure,v 1.8 2015/10/09 23:15:34 ryoon Exp $
2 2
3Portability fix. 3Portability fix.
4Solaris seems to need -std=c99 with recent pkgsrc so keep it. 4Solaris seems to need -std=c99 with recent pkgsrc so keep it.
5Add support for Bitrig. 5Add support for Bitrig.
6 6
7--- configure.orig Fri Mar 27 21:17:48 2015 7--- configure.orig 2015-10-08 04:00:24.000000000 +0000
8+++ configure 8+++ configure
9@@ -5147,7 +5147,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ 9@@ -5174,7 +5174,7 @@ rm -f core conftest.err conftest.$ac_obj
10 *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;; 10 *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
11 esac 11 esac
12 fi ;; 12 fi ;;
13-*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;; 13-*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
14+*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;; 14+*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;;
15 *-*-aix*) 15 *-*-aix*)
16 if test "$GCC" = yes; then 16 if test "$GCC" = yes; then
17 icu_cv_host_frag=mh-aix-gcc 17 icu_cv_host_frag=mh-aix-gcc
18@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ 18@@ -5199,6 +5199,7 @@ rm -f core conftest.err conftest.$ac_obj
19 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; 19 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
20 *-*-nto*) icu_cv_host_frag=mh-qnx ;; 20 *-*-nto*) icu_cv_host_frag=mh-qnx ;;
21 *-ncr-*) icu_cv_host_frag=mh-mpras ;; 21 *-ncr-*) icu_cv_host_frag=mh-mpras ;;
22+-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;; 22+-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;;
23 *) icu_cv_host_frag=mh-unknown ;; 23 *) icu_cv_host_frag=mh-unknown ;;
24 esac 24 esac
25  25
26@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then 26@@ -5736,6 +5737,29 @@ if test "x$plugins" = "xtrue"; then
27 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 
28 fi 27 fi
29  28
 29
30+# check if sys/atomic.h is present. 30+# check if sys/atomic.h is present.
31+for ac_header in sys/atomic.h 31+for ac_header in sys/atomic.h
32+do : 32+do :
33+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" 33+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
34+if test "x$ac_cv_header_sys_atomic_h" = xyes; then : 34+if test "x$ac_cv_header_sys_atomic_h" = xyes; then :
35+ cat >>confdefs.h <<_ACEOF 35+ cat >>confdefs.h <<_ACEOF
36+#define HAVE_SYS_ATOMIC_H 1 36+#define HAVE_SYS_ATOMIC_H 1
37+_ACEOF 37+_ACEOF
38+ 38+
39+fi 39+fi
40+ 40+
41+done 41+done
42+ 42+
43+case "${host}" in 43+case "${host}" in
44+*-netbsd*) 44+*-netbsd*)
45+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 45+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
46+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 46+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
47+fi 47+fi
48+;; 48+;;
49+*) 49+*)
50+;; 50+;;
51+esac 51+esac
52+ 52+
53 U_ENABLE_DYLOAD=1 53 U_ENABLE_DYLOAD=1
54 enable=yes 54 enable=yes
55 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5 55 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5
56@@ -7655,7 +7679,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR 56@@ -7729,7 +7753,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
57 case "${host}" in 57 case "${host}" in
58 *-*-solaris*) platform=U_SOLARIS ;; 58 *-*-solaris*) platform=U_SOLARIS ;;
59 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;; 59 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;;
60- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;; 60- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;;
61+ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; 61+ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;;
62 *-*-aix*) platform=U_AIX ;; 62 *-*-aix*) platform=U_AIX ;;
63 *-*-hpux*) platform=U_HPUX ;; 63 *-*-hpux*) platform=U_HPUX ;;
64 *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; 64 *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;
65@@ -7691,13 +7715,13 @@ fi 65@@ -7765,13 +7789,13 @@ fi
66 # Now that we're done using CPPFLAGS etc. for tests, we can change it 66 # Now that we're done using CPPFLAGS etc. for tests, we can change it
67 # for build. 67 # for build.
68  68
69-if test "${CC}" == "clang"; then 69-if test "${CC}" == "clang"; then
70+if test "${CC}" = "clang"; then 70+if test "${CC}" = "clang"; then
71 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 71 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
72 else 72 else
73 CLANGCFLAGS="" 73 CLANGCFLAGS=""
74 fi 74 fi
75  75
76-if test "${CXX}" == "clang++"; then 76-if test "${CXX}" == "clang++"; then
77+if test "${CXX}" = "clang++"; then 77+if test "${CXX}" = "clang++"; then
78 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 78 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"

cvs diff -r1.4 -r1.5 pkgsrc/textproc/icu/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure.ac 2015/08/31 15:26:19 1.4
+++ pkgsrc/textproc/icu/patches/patch-configure.ac 2015/10/09 23:15:34 1.5
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1$NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $ 1$NetBSD: patch-configure.ac,v 1.5 2015/10/09 23:15:34 ryoon Exp $
2 2
3* Detect NetBSD libatomic 3* Detect NetBSD libatomic
4* test(1) portability fix 4* test(1) portability fix
5* Add support for Bitrig 5* Add support for Bitrig
6 6
7--- configure.ac.orig Fri Mar 27 21:17:48 2015 7--- configure.ac.orig 2015-10-08 04:00:26.000000000 +0000
8+++ configure.ac 8+++ configure.ac
9@@ -409,6 +409,18 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then 9@@ -427,6 +427,18 @@ if test "x$plugins" = "xtrue"; then
10 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 
11 fi 10 fi
12  11
 12
13+# check if sys/atomic.h is present. 13+# check if sys/atomic.h is present.
14+AC_CHECK_HEADERS([sys/atomic.h]) 14+AC_CHECK_HEADERS([sys/atomic.h])
15+case "${host}" in 15+case "${host}" in
16+*-netbsd*) 16+*-netbsd*)
17+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 17+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
18+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 18+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
19+fi 19+fi
20+;; 20+;;
21+*) 21+*)
22+;; 22+;;
23+esac 23+esac
24+ 24+
25 U_ENABLE_DYLOAD=1 25 U_ENABLE_DYLOAD=1
26 enable=yes 26 enable=yes
27 AC_MSG_CHECKING([whether to enable dynamic loading of plugins]) 27 AC_MSG_CHECKING([whether to enable dynamic loading of plugins. Ignored if plugins disabled.])
28@@ -1234,7 +1246,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR 28@@ -1251,7 +1263,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
29 case "${host}" in 29 case "${host}" in
30 *-*-solaris*) platform=U_SOLARIS ;; 30 *-*-solaris*) platform=U_SOLARIS ;;
31 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;; 31 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;;
32- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;; 32- *-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;;
33+ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; 33+ *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;;
34 *-*-aix*) platform=U_AIX ;; 34 *-*-aix*) platform=U_AIX ;;
35 *-*-hpux*) platform=U_HPUX ;; 35 *-*-hpux*) platform=U_HPUX ;;
36 *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; 36 *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;
37@@ -1253,6 +1265,7 @@ case "${host}" in 37@@ -1270,6 +1282,7 @@ case "${host}" in
38 *-*-beos) platform=U_BEOS ;; 38 *-*-beos) platform=U_BEOS ;;
39 *-*-irix*) platform=U_IRIX ;; 39 *-*-irix*) platform=U_IRIX ;;
40 *-ncr-*) platform=U_MPRAS ;; 40 *-ncr-*) platform=U_MPRAS ;;
41+ *-*-sco3.2v5*) platform=USCOOSR5 ;; 41+ *-*-sco3.2v5*) platform=USCOOSR5 ;;
42 *) platform=U_UNKNOWN_PLATFORM ;; 42 *) platform=U_UNKNOWN_PLATFORM ;;
43 esac 43 esac
44 AC_SUBST(ICUDATA_CHAR) 44 AC_SUBST(ICUDATA_CHAR)
45@@ -1270,13 +1283,13 @@ fi 45@@ -1287,13 +1300,13 @@ fi
46 # Now that we're done using CPPFLAGS etc. for tests, we can change it 46 # Now that we're done using CPPFLAGS etc. for tests, we can change it
47 # for build. 47 # for build.
48  48
49-if test "${CC}" == "clang"; then 49-if test "${CC}" == "clang"; then
50+if test "${CC}" = "clang"; then 50+if test "${CC}" = "clang"; then
51 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 51 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
52 else 52 else
53 CLANGCFLAGS="" 53 CLANGCFLAGS=""
54 fi 54 fi
55  55
56-if test "${CXX}" == "clang++"; then 56-if test "${CXX}" == "clang++"; then
57+if test "${CXX}" = "clang++"; then 57+if test "${CXX}" = "clang++"; then
58 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 58 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"