Wed Nov 7 20:59:51 2012 UTC ()
Changes 50.1:
* Unicode 6.2: Turkish Lira Sign, improved word & line segmentation (BreakIterator) for symbols
* CLDR 22.1: Data coverage & quality improved across all major languages; new short width type for weekday names; new zhuyin (Bopomofo) collation for Chinese; improved data for CompactDecimalFormat & RBNF
* Time zone data: 2012h
* Ordinal-number support in MessageFormat & PluralRules
* Deprecate setLocale(locale) in PluralFormat
* Dictionary-based break iterators (word segmentation):
* Support Chinese & Japanese, use more compact dictionary format, port all but Khmer support to Java
* Update Khmer dictionary
* Change Java util.ListFormat to text.ListFormatter and other updates, use CLDR data, port to C++
* Add updated IBM-eucJP and IBM-5233 converter
* Improve number formatting performance
* C++ GenderInfo: Effective combined gender of a list of people's genders (ported from Java)
* Thread safety support cannot be removed (see the Readme)
* Default compilers: Clang is now used if available (see the Readme)
* C++ Collator API cleanup, subclassing-API-breaking changes (see the Readme)
* Add option to genrb tool for writing java resource bundle files
* Time zone format APIs


(adam)
diff -r1.76 -r1.77 pkgsrc/textproc/icu/Makefile
diff -r1.25 -r1.26 pkgsrc/textproc/icu/PLIST
diff -r1.30 -r1.31 pkgsrc/textproc/icu/distinfo
diff -r1.14 -r1.15 pkgsrc/textproc/icu/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/textproc/icu/patches/patch-ab
diff -r1.11 -r1.12 pkgsrc/textproc/icu/patches/patch-af
diff -r1.10 -r1.11 pkgsrc/textproc/icu/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_putilimp.h
diff -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h
diff -r1.1 -r0 pkgsrc/textproc/icu/patches/patch-common_unicode_uset_h
diff -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-tools_genrb_derb.c

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

--- pkgsrc/textproc/icu/Makefile 2012/10/25 06:55:56 1.76
+++ pkgsrc/textproc/icu/Makefile 2012/11/07 20:59:50 1.77
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.76 2012/10/25 06:55:56 asau Exp $ 1# $NetBSD: Makefile,v 1.77 2012/11/07 20:59:50 adam Exp $
2 2
3DISTNAME= icu4c-49_1_2-src 3DISTNAME= icu4c-50_1-src
4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} 4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
5PKGREVISION= 1 
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_TOOLS+= gmake 15USE_TOOLS+= gmake
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18TEST_TARGET= check 17TEST_TARGET= check

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

--- pkgsrc/textproc/icu/PLIST 2012/07/03 18:37:26 1.25
+++ pkgsrc/textproc/icu/PLIST 2012/11/07 20:59:50 1.26
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1@comment $NetBSD: PLIST,v 1.25 2012/07/03 18:37:26 adam Exp $ 1@comment $NetBSD: PLIST,v 1.26 2012/11/07 20:59:50 adam Exp $
2bin/derb 2bin/derb
3bin/genbrk 3bin/genbrk
4bin/gencfu 4bin/gencfu
5bin/gencnval 5bin/gencnval
6bin/genctd 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
15include/layout/LEGlyphStorage.h 15include/layout/LEGlyphStorage.h
16include/layout/LEInsertionList.h 16include/layout/LEInsertionList.h
17include/layout/LELanguages.h 17include/layout/LELanguages.h
18include/layout/LEScripts.h 18include/layout/LEScripts.h
19include/layout/LESwaps.h 19include/layout/LESwaps.h
@@ -49,30 +49,32 @@ include/unicode/dcfmtsym.h @@ -49,30 +49,32 @@ include/unicode/dcfmtsym.h
49include/unicode/decimfmt.h 49include/unicode/decimfmt.h
50include/unicode/docmain.h 50include/unicode/docmain.h
51include/unicode/dtfmtsym.h 51include/unicode/dtfmtsym.h
52include/unicode/dtintrv.h 52include/unicode/dtintrv.h
53include/unicode/dtitvfmt.h 53include/unicode/dtitvfmt.h
54include/unicode/dtitvinf.h 54include/unicode/dtitvinf.h
55include/unicode/dtptngen.h 55include/unicode/dtptngen.h
56include/unicode/dtrule.h 56include/unicode/dtrule.h
57include/unicode/errorcode.h 57include/unicode/errorcode.h
58include/unicode/fieldpos.h 58include/unicode/fieldpos.h
59include/unicode/fmtable.h 59include/unicode/fmtable.h
60include/unicode/format.h 60include/unicode/format.h
61include/unicode/fpositer.h 61include/unicode/fpositer.h
 62include/unicode/gender.h
62include/unicode/gregocal.h 63include/unicode/gregocal.h
63include/unicode/icudataver.h 64include/unicode/icudataver.h
64include/unicode/icuplug.h 65include/unicode/icuplug.h
65include/unicode/idna.h 66include/unicode/idna.h
 67include/unicode/listformatter.h
66include/unicode/localpointer.h 68include/unicode/localpointer.h
67include/unicode/locdspnm.h 69include/unicode/locdspnm.h
68include/unicode/locid.h 70include/unicode/locid.h
69include/unicode/measfmt.h 71include/unicode/measfmt.h
70include/unicode/measunit.h 72include/unicode/measunit.h
71include/unicode/measure.h 73include/unicode/measure.h
72include/unicode/messagepattern.h 74include/unicode/messagepattern.h
73include/unicode/msgfmt.h 75include/unicode/msgfmt.h
74include/unicode/normalizer2.h 76include/unicode/normalizer2.h
75include/unicode/normlzr.h 77include/unicode/normlzr.h
76include/unicode/numfmt.h 78include/unicode/numfmt.h
77include/unicode/numsys.h 79include/unicode/numsys.h
78include/unicode/parseerr.h 80include/unicode/parseerr.h
@@ -123,27 +125,29 @@ include/unicode/uclean.h @@ -123,27 +125,29 @@ include/unicode/uclean.h
123include/unicode/ucnv.h 125include/unicode/ucnv.h
124include/unicode/ucnv_cb.h 126include/unicode/ucnv_cb.h
125include/unicode/ucnv_err.h 127include/unicode/ucnv_err.h
126include/unicode/ucnvsel.h 128include/unicode/ucnvsel.h
127include/unicode/ucol.h 129include/unicode/ucol.h
128include/unicode/ucoleitr.h 130include/unicode/ucoleitr.h
129include/unicode/uconfig.h 131include/unicode/uconfig.h
130include/unicode/ucsdet.h 132include/unicode/ucsdet.h
131include/unicode/ucurr.h 133include/unicode/ucurr.h
132include/unicode/udat.h 134include/unicode/udat.h
133include/unicode/udata.h 135include/unicode/udata.h
134include/unicode/udateintervalformat.h 136include/unicode/udateintervalformat.h
135include/unicode/udatpg.h 137include/unicode/udatpg.h
 138include/unicode/udisplaycontext.h
136include/unicode/uenum.h 139include/unicode/uenum.h
 140include/unicode/ugender.h
137include/unicode/uidna.h 141include/unicode/uidna.h
138include/unicode/uiter.h 142include/unicode/uiter.h
139include/unicode/uldnames.h 143include/unicode/uldnames.h
140include/unicode/uloc.h 144include/unicode/uloc.h
141include/unicode/ulocdata.h 145include/unicode/ulocdata.h
142include/unicode/umachine.h 146include/unicode/umachine.h
143include/unicode/umisc.h 147include/unicode/umisc.h
144include/unicode/umsg.h 148include/unicode/umsg.h
145include/unicode/unifilt.h 149include/unicode/unifilt.h
146include/unicode/unifunct.h 150include/unicode/unifunct.h
147include/unicode/unimatch.h 151include/unicode/unimatch.h
148include/unicode/unirepl.h 152include/unicode/unirepl.h
149include/unicode/uniset.h 153include/unicode/uniset.h
@@ -178,65 +182,66 @@ include/unicode/utmscale.h @@ -178,65 +182,66 @@ include/unicode/utmscale.h
178include/unicode/utrace.h 182include/unicode/utrace.h
179include/unicode/utrans.h 183include/unicode/utrans.h
180include/unicode/utypes.h 184include/unicode/utypes.h
181include/unicode/uvernum.h 185include/unicode/uvernum.h
182include/unicode/uversion.h 186include/unicode/uversion.h
183include/unicode/vtzone.h 187include/unicode/vtzone.h
184lib/icu/${PKGVERSION}/Makefile.inc 188lib/icu/${PKGVERSION}/Makefile.inc
185lib/icu/${PKGVERSION}/pkgdata.inc 189lib/icu/${PKGVERSION}/pkgdata.inc
186lib/icu/Makefile.inc 190lib/icu/Makefile.inc
187lib/icu/current 191lib/icu/current
188lib/icu/pkgdata.inc 192lib/icu/pkgdata.inc
189lib/libicudata.a 193lib/libicudata.a
190lib/libicudata.so 194lib/libicudata.so
191lib/libicudata.so.49 195lib/libicudata.so.50
192lib/libicudata.so.${PKGVERSION} 196lib/libicudata.so.${PKGVERSION}
193lib/libicui18n.a 197lib/libicui18n.a
194lib/libicui18n.so 198lib/libicui18n.so
195lib/libicui18n.so.49 199lib/libicui18n.so.50
196lib/libicui18n.so.${PKGVERSION} 200lib/libicui18n.so.${PKGVERSION}
197lib/libicuio.a 201lib/libicuio.a
198lib/libicuio.so 202lib/libicuio.so
199lib/libicuio.so.49 203lib/libicuio.so.50
200lib/libicuio.so.${PKGVERSION} 204lib/libicuio.so.${PKGVERSION}
201lib/libicule.a 205lib/libicule.a
202lib/libicule.so 206lib/libicule.so
203lib/libicule.so.49 207lib/libicule.so.50
204lib/libicule.so.${PKGVERSION} 208lib/libicule.so.${PKGVERSION}
205lib/libiculx.a 209lib/libiculx.a
206lib/libiculx.so 210lib/libiculx.so
207lib/libiculx.so.49 211lib/libiculx.so.50
208lib/libiculx.so.${PKGVERSION} 212lib/libiculx.so.${PKGVERSION}
209lib/libicutest.a 213lib/libicutest.a
210lib/libicutest.so 214lib/libicutest.so
211lib/libicutest.so.49 215lib/libicutest.so.50
212lib/libicutest.so.${PKGVERSION} 216lib/libicutest.so.${PKGVERSION}
213lib/libicutu.a 217lib/libicutu.a
214lib/libicutu.so 218lib/libicutu.so
215lib/libicutu.so.49 219lib/libicutu.so.50
216lib/libicutu.so.${PKGVERSION} 220lib/libicutu.so.${PKGVERSION}
217lib/libicuuc.a 221lib/libicuuc.a
218lib/libicuuc.so 222lib/libicuuc.so
219lib/libicuuc.so.49 223lib/libicuuc.so.50
220lib/libicuuc.so.${PKGVERSION} 224lib/libicuuc.so.${PKGVERSION}
221lib/pkgconfig/icu-i18n.pc 225lib/pkgconfig/icu-i18n.pc
222lib/pkgconfig/icu-io.pc 226lib/pkgconfig/icu-io.pc
223lib/pkgconfig/icu-le.pc 227lib/pkgconfig/icu-le.pc
224lib/pkgconfig/icu-lx.pc 228lib/pkgconfig/icu-lx.pc
225lib/pkgconfig/icu-uc.pc 229lib/pkgconfig/icu-uc.pc
226man/man1/derb.1 230man/man1/derb.1
227man/man1/genbrk.1 231man/man1/genbrk.1
 232man/man1/gencfu.1
228man/man1/gencnval.1 233man/man1/gencnval.1
229man/man1/genctd.1 234man/man1/gendict.1
230man/man1/genrb.1 235man/man1/genrb.1
231man/man1/icu-config.1 236man/man1/icu-config.1
232man/man1/makeconv.1 237man/man1/makeconv.1
233man/man1/pkgdata.1 238man/man1/pkgdata.1
234man/man1/uconv.1 239man/man1/uconv.1
235man/man8/genccode.8 240man/man8/genccode.8
236man/man8/gencmn.8 241man/man8/gencmn.8
237man/man8/gensprep.8 242man/man8/gensprep.8
238man/man8/icupkg.8 243man/man8/icupkg.8
239sbin/genccode 244sbin/genccode
240sbin/gencmn 245sbin/gencmn
241sbin/gennorm2 246sbin/gennorm2
242sbin/gensprep 247sbin/gensprep

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

--- pkgsrc/textproc/icu/distinfo 2012/07/10 19:14:47 1.30
+++ pkgsrc/textproc/icu/distinfo 2012/11/07 20:59:50 1.31
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.30 2012/07/10 19:14:47 bsiegert Exp $ 1$NetBSD: distinfo,v 1.31 2012/11/07 20:59:50 adam Exp $
2 2
3SHA1 (icu4c-49_1_2-src.tgz) = d8cee6d2b2a91a0da7464acd97a5b7b462d93225 3SHA1 (icu4c-50_1-src.tgz) = 9a3369c00a8be8eff935d2893849ad2eb246c0ef
4RMD160 (icu4c-49_1_2-src.tgz) = e34aa54f4387ae4c195c72427a2bd25933456e94 4RMD160 (icu4c-50_1-src.tgz) = 454afee3631da53520d2b66126a8b5f528685b7d
5Size (icu4c-49_1_2-src.tgz) = 19010646 bytes 5Size (icu4c-50_1-src.tgz) = 21181132 bytes
6SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6 6SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230
7SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4 7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
9SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb 9SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e
10SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2 10SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842
11SHA1 (patch-common_putilimp.h) = 45aa7bf3fcf1da1bf8705aa64a135f8a1caeba7e 11SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810
12SHA1 (patch-common_unicode_platform.h) = b95b826d8b1d9104fca71db85b8eaaa6b0c19843 12SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfbaa
13SHA1 (patch-common_unicode_uset_h) = 4a429952f1ff3ca787217e65eb62198f3d3f967e 
14SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 13SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
15SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a 14SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
 15SHA1 (patch-tools_genrb_derb.c) = 2c652a66f842236721f03e159efc14b0313e4a8f

cvs diff -r1.14 -r1.15 pkgsrc/textproc/icu/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/Attic/patch-aa 2012/04/25 18:53:44 1.14
+++ pkgsrc/textproc/icu/patches/Attic/patch-aa 2012/11/07 20:59:51 1.15
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1$NetBSD: patch-aa,v 1.14 2012/04/25 18:53:44 adam Exp $ 1$NetBSD: patch-aa,v 1.15 2012/11/07 20:59:51 adam Exp $
2 2
3Add linker flags for finding the libraries to pkg-config files. 3Add linker flags for finding the libraries to pkg-config files.
4Avoid using programs which need elevated privileges during the build. 4Avoid using programs which need elevated privileges during the build.
5 5
6--- Makefile.in.orig 2012-04-05 20:49:28.000000000 +0000 6--- Makefile.in.orig 2012-11-05 17:18:12.000000000 +0000
7+++ Makefile.in 7+++ Makefile.in
8@@ -238,7 +238,7 @@ config/icu-uc.pc: config/icu.pc Makefile 8@@ -247,7 +247,7 @@ config/icu-uc.pc: config/icu.pc Makefile
9 @cat config/icu.pc > $@ 9 @cat config/icu.pc > $@
10 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@ 10 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@
11 @echo "Name: $(PACKAGE)-uc" >> $@ 11 @echo "Name: $(PACKAGE)-uc" >> $@
12- @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@ 12- @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@
13+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@ 13+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@
14 @echo "Libs.private:" '$${baselibs}' >> $@ 14 @echo "Libs.private:" '$${baselibs}' >> $@
15 @echo $@ updated. 15 @echo $@ updated.
16  16
17@@ -247,7 +247,7 @@ config/icu-i18n.pc: config/icu.pc Makefi 17@@ -256,7 +256,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
18 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@ 18 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@
19 @echo "Name: $(PACKAGE)-i18n" >> $@ 19 @echo "Name: $(PACKAGE)-i18n" >> $@
20 @echo "Requires: icu-uc" >> $@ 20 @echo "Requires: icu-uc" >> $@
21- @echo "Libs:" "${ICULIBS_I18N}" >> $@ 21- @echo "Libs:" "${ICULIBS_I18N}" >> $@
22+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_I18N}" >> $@ 22+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_I18N}" >> $@
23 @echo $@ updated. 23 @echo $@ updated.
24  24
25 config/icu-io.pc: config/icu.pc Makefile icudefs.mk 25 config/icu-io.pc: config/icu.pc Makefile icudefs.mk
26@@ -255,7 +255,7 @@ config/icu-io.pc: config/icu.pc Makefile 26@@ -264,7 +264,7 @@ config/icu-io.pc: config/icu.pc Makefile
27 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@ 27 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@
28 @echo "Name: $(PACKAGE)-io" >> $@ 28 @echo "Name: $(PACKAGE)-io" >> $@
29 @echo "Requires: icu-i18n" >> $@ 29 @echo "Requires: icu-i18n" >> $@
30- @echo "Libs:" "${ICULIBS_IO}" >> $@ 30- @echo "Libs:" "${ICULIBS_IO}" >> $@
31+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_IO}" >> $@ 31+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_IO}" >> $@
32 @echo $@ updated. 32 @echo $@ updated.
33  33
34 config/icu-le.pc: config/icu.pc Makefile icudefs.mk 34 config/icu-le.pc: config/icu.pc Makefile icudefs.mk
35@@ -263,7 +263,7 @@ config/icu-le.pc: config/icu.pc Makefile 35@@ -272,7 +272,7 @@ config/icu-le.pc: config/icu.pc Makefile
36 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@ 36 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@
37 @echo "Name: $(PACKAGE)-le" >> $@ 37 @echo "Name: $(PACKAGE)-le" >> $@
38 @echo "Requires: icu-uc" >> $@ 38 @echo "Requires: icu-uc" >> $@
39- @echo "Libs:" "${ICULIBS_LE}" >> $@ 39- @echo "Libs:" "${ICULIBS_LE}" >> $@
40+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LE}" >> $@ 40+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LE}" >> $@
41 @echo $@ updated. 41 @echo $@ updated.
42  42
43 config/icu-lx.pc: config/icu.pc Makefile icudefs.mk 43 config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
44@@ -271,7 +271,7 @@ config/icu-lx.pc: config/icu.pc Makefile 44@@ -280,7 +280,7 @@ config/icu-lx.pc: config/icu.pc Makefile
45 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@ 45 @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@
46 @echo "Name: $(PACKAGE)-lx" >> $@ 46 @echo "Name: $(PACKAGE)-lx" >> $@
47 @echo "Requires: icu-le" >> $@ 47 @echo "Requires: icu-le" >> $@
48- @echo "Libs:" "${ICULIBS_LX}" >> $@ 48- @echo "Libs:" "${ICULIBS_LX}" >> $@
49+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LX}" >> $@ 49+ @echo "Libs:" ${COMPILER_RPATH_FLAG}'$${libdir} -L$${libdir}' "${ICULIBS_LX}" >> $@
50 @echo $@ updated. 50 @echo $@ updated.
51  51
52  52
53@@ -293,7 +293,7 @@ $(top_builddir)/config/pkgdataMakefile: 53@@ -302,7 +302,7 @@ $(top_builddir)/config/pkgdataMakefile:
54  54
55 $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed 55 $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
56 -$(RMV) $@ 56 -$(RMV) $@
57- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@ 57- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
58+ cp -f $(top_srcdir)/config/icu-config-top $@ 58+ cp -f $(top_srcdir)/config/icu-config-top $@
59 chmod u+w $@ 59 chmod u+w $@
60 @echo "# Following from @platform_make_fragment@" >> $@ 60 @echo "# Following from @platform_make_fragment@" >> $@
61 LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ 61 LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@

cvs diff -r1.11 -r1.12 pkgsrc/textproc/icu/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/Attic/patch-ab 2011/07/25 10:16:54 1.11
+++ pkgsrc/textproc/icu/patches/Attic/patch-ab 2012/11/07 20:59:51 1.12
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.11 2011/07/25 10:16:54 adam Exp $ 1$NetBSD: patch-ab,v 1.12 2012/11/07 20:59:51 adam Exp $
2 2
3--- config/mh-darwin.orig 2011-07-19 21:16:46.000000000 +0000 3--- config/mh-darwin.orig 2011-07-19 21:16:46.000000000 +0000
4+++ config/mh-darwin 4+++ config/mh-darwin
5@@ -25,11 +25,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CF 5@@ -28,11 +28,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CF
6 SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) 6 SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
7  7
8 ## Compiler switches to embed a library name and version information 8 ## Compiler switches to embed a library name and version information
9-ifeq ($(ENABLE_RPATH),YES) 9-ifeq ($(ENABLE_RPATH),YES)
10 LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) 10 LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
11-else 11-else
12-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) 12-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
13-endif 13-endif
14  14
15 ## Compiler switch to embed a runtime search path 15 ## Compiler switch to embed a runtime search path
16 LD_RPATH= 16 LD_RPATH=

cvs diff -r1.11 -r1.12 pkgsrc/textproc/icu/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/Attic/patch-af 2012/04/25 18:53:44 1.11
+++ pkgsrc/textproc/icu/patches/Attic/patch-af 2012/11/07 20:59:51 1.12
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-af,v 1.11 2012/04/25 18:53:44 adam Exp $ 1$NetBSD: patch-af,v 1.12 2012/11/07 20:59:51 adam Exp $
2 2
3--- runConfigureICU.orig 2011-07-19 21:19:38.000000000 +0000 3--- runConfigureICU.orig 2011-07-19 21:19:38.000000000 +0000
4+++ runConfigureICU 4+++ runConfigureICU
5@@ -286,7 +286,7 @@ case $platform in 5@@ -284,7 +284,7 @@ case $platform in
6 RELEASE_CFLAGS='-O3' 6 RELEASE_CFLAGS='-O3'
7 RELEASE_CXXFLAGS='-O3' 7 RELEASE_CXXFLAGS='-O3'
8 ;; 8 ;;
9- *BSD) 9- *BSD)
10+ *BSD | DragonFly) 10+ *BSD | DragonFly)
11 THE_OS="BSD" 11 THE_OS="BSD"
12 THE_COMP="the GNU C++" 12 THE_COMP="the GNU C++"
13 CC=gcc; export CC 13 CC=gcc; export CC

cvs diff -r1.10 -r1.11 pkgsrc/textproc/icu/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/Attic/patch-ad 2011/07/25 10:16:54 1.10
+++ pkgsrc/textproc/icu/patches/Attic/patch-ad 2012/11/07 20:59:51 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.10 2011/07/25 10:16:54 adam Exp $ 1$NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $
2 2
3--- icudefs.mk.in.orig 2010-12-07 12:14:06.000000000 +0000 3--- icudefs.mk.in.orig 2010-12-07 12:14:06.000000000 +0000
4+++ icudefs.mk.in 4+++ icudefs.mk.in
5@@ -190,13 +190,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) 5@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
6  6
7 ## If we can't use the shared libraries, use the static libraries 7 ## If we can't use the shared libraries, use the static libraries
8 ifneq ($(ENABLE_SHARED),YES) 8 ifneq ($(ENABLE_SHARED),YES)
9-STATIC_PREFIX_WHEN_USED = s 9-STATIC_PREFIX_WHEN_USED = s
10+STATIC_PREFIX_WHEN_USED =  10+STATIC_PREFIX_WHEN_USED =
11 else 11 else
12 STATIC_PREFIX_WHEN_USED =  12 STATIC_PREFIX_WHEN_USED =
13 endif 13 endif
14  14
15 # Static library prefix and file extension 15 # Static library prefix and file extension
16-STATIC_PREFIX = s 16-STATIC_PREFIX = s
17+STATIC_PREFIX = 17+STATIC_PREFIX =
18 LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) 18 LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)

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

--- pkgsrc/textproc/icu/patches/patch-common_putilimp.h 2012/07/10 19:14:48 1.1
+++ pkgsrc/textproc/icu/patches/patch-common_putilimp.h 2012/11/07 20:59:51 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-common_putilimp.h,v 1.1 2012/07/10 19:14:48 bsiegert Exp $ 1$NetBSD: patch-common_putilimp.h,v 1.2 2012/11/07 20:59:51 adam Exp $
2 2
3--- common/putilimp.h.orig Fri Jun 22 08:38:46 2012 3--- common/putilimp.h.orig 2012-11-05 17:14:50.000000000 +0000
4+++ common/putilimp.h 4+++ common/putilimp.h
5@@ -119,6 +119,8 @@ typedef size_t uintptr_t; 5@@ -123,6 +123,8 @@ typedef size_t uintptr_t;
6 # define U_TIMEZONE _timezone 6 /* not defined */
7 #elif U_PLATFORM == U_PF_OS400 7 #elif U_PLATFORM == U_PF_OS400
8 /* not defined */ 8 /* not defined */
9+#elif defined(__MirBSD__) 9+#elif defined(__MirBSD__)
10+ /* not defined */ 10+ /* not defined */
11 #else 11 #else
12 # define U_TIMEZONE timezone 12 # define U_TIMEZONE timezone
13 #endif 13 #endif

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

--- pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h 2012/07/03 18:37:26 1.2
+++ pkgsrc/textproc/icu/patches/patch-common_unicode_platform.h 2012/11/07 20:59:51 1.3
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1$NetBSD: patch-common_unicode_platform.h,v 1.2 2012/07/03 18:37:26 adam Exp $ 1$NetBSD: patch-common_unicode_platform.h,v 1.3 2012/11/07 20:59:51 adam Exp $
2 2
3--- common/unicode/platform.h.orig 2012-06-01 14:52:38.000000000 +0000 3--- common/unicode/platform.h.orig 2012-11-05 17:14:34.000000000 +0000
4+++ common/unicode/platform.h 4+++ common/unicode/platform.h
5@@ -131,7 +131,8 @@ 5@@ -144,7 +144,7 @@
6 # include <android/api-level.h> 6 # include <android/api-level.h>
7 #elif defined(linux) || defined(__linux__) || defined(__linux) 7 #elif defined(linux) || defined(__linux__) || defined(__linux)
8 # define U_PLATFORM U_PF_LINUX 8 # define U_PLATFORM U_PF_LINUX
9-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) 9-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
10+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ 10+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
11+ defined(__NetBSD__) || defined(__DragonFly__) 
12 # define U_PLATFORM U_PF_BSD 11 # define U_PLATFORM U_PF_BSD
13 #elif defined(sun) || defined(__sun) 12 #elif defined(sun) || defined(__sun)
14 /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ 13 /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
15@@ -346,6 +347,13 @@ 14@@ -381,6 +381,13 @@
16 # define U_IS_BIG_ENDIAN 1 15 # define U_IS_BIG_ENDIAN 1
17 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN) 16 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
18 # define U_IS_BIG_ENDIAN 0 17 # define U_IS_BIG_ENDIAN 0
19+#elif U_PLATFORM == U_PF_BSD 18+#elif U_PLATFORM == U_PF_BSD
20+#include <sys/endian.h> 19+#include <sys/endian.h>
21+#if _BYTE_ORDER == _LITTLE_ENDIAN 20+#if _BYTE_ORDER == _LITTLE_ENDIAN
22+# define U_IS_BIG_ENDIAN 0 21+# define U_IS_BIG_ENDIAN 0
23+#else 22+#else
24+# define U_IS_BIG_ENDIAN 1 23+# define U_IS_BIG_ENDIAN 1
25+#endif 24+#endif
26 #elif U_PLATFORM == U_PF_OS390 || U_PLATFORM == U_PF_OS400 || defined(__s390__) || defined(__s390x__) 25 #elif U_PLATFORM == U_PF_OS390 || U_PLATFORM == U_PF_OS400 || defined(__s390__) || defined(__s390x__)
27 /* These platforms do not appear to predefine any endianness macros. */ 26 /* These platforms do not appear to predefine any endianness macros. */
28 # define U_IS_BIG_ENDIAN 1 27 # define U_IS_BIG_ENDIAN 1

File Deleted: pkgsrc/textproc/icu/patches/Attic/patch-common_unicode_uset_h

File Added: pkgsrc/textproc/icu/patches/Attic/patch-tools_genrb_derb.c
$NetBSD: patch-tools_genrb_derb.c,v 1.1 2012/11/07 20:59:51 adam Exp $

Changes "truncate" variable to "trunc" to avoid compilation error.

--- tools/genrb/derb.c.orig	2012-11-07 20:07:56.000000000 +0000
+++ tools/genrb/derb.c
@@ -54,7 +54,7 @@ static UConverter *defaultConverter = 0;
 
 static const int32_t indentsize = 4;
 static int32_t truncsize = DERB_DEFAULT_TRUNC;
-static UBool truncate = FALSE;
+static UBool trunc = FALSE;
 
 static const char *getEncodingName(const char *encoding);
 static void reportError(const char *pname, UErrorCode *status, const char *when);
@@ -152,14 +152,14 @@ main(int argc, char* argv[]) {
     }
 
     if(options[4].doesOccur) {
-        truncate = TRUE;
+        trunc = TRUE;
         if(options[4].value != NULL) {
             truncsize = atoi(options[4].value); /* user defined printable size */
         } else {
             truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
         }
     } else {
-        truncate = FALSE;
+        trunc = FALSE;
     }
 
     if(options[5].doesOccur) {
@@ -473,7 +473,7 @@ static void printOutAlias(FILE *out,  UC
     int32_t len = 0;
     const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
     UChar *string = quotedString(thestr);
-    if(truncate && len > truncsize) {
+    if(trunc && len > truncsize) {
         char msg[128];
         printIndent(out, converter, indent);
         sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -517,7 +517,7 @@ static void printOutBundle(FILE *out, UC
             UChar *string = quotedString(thestr);
 
             /* TODO: String truncation */
-            if(truncate && len > truncsize) {
+            if(trunc && len > truncsize) {
                 char msg[128];
                 printIndent(out, converter, indent);
                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
@@ -576,7 +576,7 @@ static void printOutBundle(FILE *out, UC
         {
             int32_t len = 0;
             const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
-            if(truncate && len > truncsize) {
+            if(trunc && len > truncsize) {
                 char msg[128];
                 printIndent(out, converter, indent);
                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",