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 APIsdiff -r1.76 -r1.77 pkgsrc/textproc/icu/Makefile
(adam)
@@ -1,70 +1,69 @@ | @@ -1,70 +1,69 @@ | |||
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 | |||
3 | DISTNAME= icu4c-49_1_2-src | 3 | DISTNAME= icu4c-50_1-src | |
4 | PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} | 4 | PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= textproc | 5 | CATEGORIES= textproc | |
7 | MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ | |
8 | EXTRACT_SUFX= .tgz | 7 | EXTRACT_SUFX= .tgz | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.icu-project.org/ | 10 | HOMEPAGE= http://www.icu-project.org/ | |
12 | COMMENT= Robust and full-featured Unicode services | 11 | COMMENT= Robust and full-featured Unicode services | |
13 | LICENSE= mit | 12 | LICENSE= mit | |
14 | 13 | |||
15 | WRKSRC= ${WRKDIR}/icu/source | 14 | WRKSRC= ${WRKDIR}/icu/source | |
16 | USE_TOOLS+= gmake | 15 | USE_TOOLS+= gmake | |
17 | USE_LANGUAGES= c c++ | 16 | USE_LANGUAGES= c c++ | |
18 | TEST_TARGET= check | 17 | TEST_TARGET= check | |
19 | UNLIMIT_RESOURCES+= datasize | 18 | UNLIMIT_RESOURCES+= datasize | |
20 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
21 | CONFIGURE_ARGS+= --enable-static | 20 | CONFIGURE_ARGS+= --enable-static | |
22 | CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE} | 21 | CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE} | |
23 | 22 | |||
24 | .include "../../mk/pthread.buildlink3.mk" | 23 | .include "../../mk/pthread.buildlink3.mk" | |
25 | 24 | |||
26 | .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" | 25 | .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" | |
27 | CONFIGURE_ARGS+= --disable-threads | 26 | CONFIGURE_ARGS+= --disable-threads | |
28 | .endif | 27 | .endif | |
29 | 28 | |||
30 | .include "../../mk/compiler.mk" | 29 | .include "../../mk/compiler.mk" | |
31 | 30 | |||
32 | .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "MirBSD" | 31 | .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "MirBSD" | |
33 | PLIST_SUBST+= MH_NAME=mh-bsd-gcc | 32 | PLIST_SUBST+= MH_NAME=mh-bsd-gcc | |
34 | .elif ${OPSYS} == "Linux" | 33 | .elif ${OPSYS} == "Linux" | |
35 | PLIST_SUBST+= MH_NAME=mh-linux | 34 | PLIST_SUBST+= MH_NAME=mh-linux | |
36 | .elif ${OPSYS} == "SunOS" | 35 | .elif ${OPSYS} == "SunOS" | |
37 | . if !empty(CC_VERSION:Mgcc*) | 36 | . if !empty(CC_VERSION:Mgcc*) | |
38 | PLIST_SUBST+= MH_NAME=mh-solaris-gcc | 37 | PLIST_SUBST+= MH_NAME=mh-solaris-gcc | |
39 | . else | 38 | . else | |
40 | PLIST_SUBST+= MH_NAME=mh-solaris | 39 | PLIST_SUBST+= MH_NAME=mh-solaris | |
41 | . endif | 40 | . endif | |
42 | . if !empty(CC_VERSION:Mgcc-4.[6-9].*) | 41 | . if !empty(CC_VERSION:Mgcc-4.[6-9].*) | |
43 | BUILDLINK_TRANSFORM+= rm:-D__STDC__=0 | 42 | BUILDLINK_TRANSFORM+= rm:-D__STDC__=0 | |
44 | . endif | 43 | . endif | |
45 | BUILDLINK_TRANSFORM+= rm:-ansi | 44 | BUILDLINK_TRANSFORM+= rm:-ansi | |
46 | CFLAGS.SunOS+= -std=c99 | 45 | CFLAGS.SunOS+= -std=c99 | |
47 | .elif ${OPSYS} == "IRIX" | 46 | .elif ${OPSYS} == "IRIX" | |
48 | PLIST_SUBST+= MH_NAME=mh-irix | 47 | PLIST_SUBST+= MH_NAME=mh-irix | |
49 | .elif ${OPSYS} == "Darwin" | 48 | .elif ${OPSYS} == "Darwin" | |
50 | PLIST_SUBST+= MH_NAME=mh-darwin | 49 | PLIST_SUBST+= MH_NAME=mh-darwin | |
51 | .else | 50 | .else | |
52 | # For unknown systems, set the filename to mh-unknown so that the user | 51 | # For unknown systems, set the filename to mh-unknown so that the user | |
53 | # gets a warning about missing files. | 52 | # gets a warning about missing files. | |
54 | PLIST_SUBST+= MH_NAME=mh-unknown | 53 | PLIST_SUBST+= MH_NAME=mh-unknown | |
55 | .endif | 54 | .endif | |
56 | 55 | |||
57 | .if ${OPSYS} == "Darwin" | 56 | .if ${OPSYS} == "Darwin" | |
58 | INSTALL_UNSTRIPPED= yes | 57 | INSTALL_UNSTRIPPED= yes | |
59 | .endif | 58 | .endif | |
60 | 59 | |||
61 | # expect builtin gcc atomic functions for gcc>=4.1 | 60 | # expect builtin gcc atomic functions for gcc>=4.1 | |
62 | # (source/common/putilimp.h) | 61 | # (source/common/putilimp.h) | |
63 | .if !empty(CC_VERSION:Mgcc-*) && \ | 62 | .if !empty(CC_VERSION:Mgcc-*) && \ | |
64 | (empty(CC_VERSION:Mgcc-4.0*) && empty(CC_VERSION:Mgcc-[0-3].*)) | 63 | (empty(CC_VERSION:Mgcc-4.0*) && empty(CC_VERSION:Mgcc-[0-3].*)) | |
65 | . if ${MACHINE_ARCH} == "i386" | 64 | . if ${MACHINE_ARCH} == "i386" | |
66 | CFLAGS+= -march=i486 | 65 | CFLAGS+= -march=i486 | |
67 | . endif | 66 | . endif | |
68 | .endif | 67 | .endif | |
69 | 68 | |||
70 | .include "../../mk/bsd.pkg.mk" | 69 | .include "../../mk/bsd.pkg.mk" |
@@ -1,247 +1,252 @@ | @@ -1,247 +1,252 @@ | |||
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 $ | |
2 | bin/derb | 2 | bin/derb | |
3 | bin/genbrk | 3 | bin/genbrk | |
4 | bin/gencfu | 4 | bin/gencfu | |
5 | bin/gencnval | 5 | bin/gencnval | |
6 | bin/genctd | 6 | bin/gendict | |
7 | bin/genrb | 7 | bin/genrb | |
8 | bin/icu-config | 8 | bin/icu-config | |
9 | bin/icuinfo | 9 | bin/icuinfo | |
10 | bin/makeconv | 10 | bin/makeconv | |
11 | bin/pkgdata | 11 | bin/pkgdata | |
12 | bin/uconv | 12 | bin/uconv | |
13 | include/layout/LEFontInstance.h | 13 | include/layout/LEFontInstance.h | |
14 | include/layout/LEGlyphFilter.h | 14 | include/layout/LEGlyphFilter.h | |
15 | include/layout/LEGlyphStorage.h | 15 | include/layout/LEGlyphStorage.h | |
16 | include/layout/LEInsertionList.h | 16 | include/layout/LEInsertionList.h | |
17 | include/layout/LELanguages.h | 17 | include/layout/LELanguages.h | |
18 | include/layout/LEScripts.h | 18 | include/layout/LEScripts.h | |
19 | include/layout/LESwaps.h | 19 | include/layout/LESwaps.h | |
20 | include/layout/LETypes.h | 20 | include/layout/LETypes.h | |
21 | include/layout/LayoutEngine.h | 21 | include/layout/LayoutEngine.h | |
22 | include/layout/ParagraphLayout.h | 22 | include/layout/ParagraphLayout.h | |
23 | include/layout/RunArrays.h | 23 | include/layout/RunArrays.h | |
24 | include/layout/loengine.h | 24 | include/layout/loengine.h | |
25 | include/layout/playout.h | 25 | include/layout/playout.h | |
26 | include/layout/plruns.h | 26 | include/layout/plruns.h | |
27 | include/unicode/alphaindex.h | 27 | include/unicode/alphaindex.h | |
28 | include/unicode/appendable.h | 28 | include/unicode/appendable.h | |
29 | include/unicode/basictz.h | 29 | include/unicode/basictz.h | |
30 | include/unicode/bms.h | 30 | include/unicode/bms.h | |
31 | include/unicode/bmsearch.h | 31 | include/unicode/bmsearch.h | |
32 | include/unicode/brkiter.h | 32 | include/unicode/brkiter.h | |
33 | include/unicode/bytestream.h | 33 | include/unicode/bytestream.h | |
34 | include/unicode/bytestrie.h | 34 | include/unicode/bytestrie.h | |
35 | include/unicode/bytestriebuilder.h | 35 | include/unicode/bytestriebuilder.h | |
36 | include/unicode/calendar.h | 36 | include/unicode/calendar.h | |
37 | include/unicode/caniter.h | 37 | include/unicode/caniter.h | |
38 | include/unicode/chariter.h | 38 | include/unicode/chariter.h | |
39 | include/unicode/choicfmt.h | 39 | include/unicode/choicfmt.h | |
40 | include/unicode/coleitr.h | 40 | include/unicode/coleitr.h | |
41 | include/unicode/coll.h | 41 | include/unicode/coll.h | |
42 | include/unicode/colldata.h | 42 | include/unicode/colldata.h | |
43 | include/unicode/curramt.h | 43 | include/unicode/curramt.h | |
44 | include/unicode/currpinf.h | 44 | include/unicode/currpinf.h | |
45 | include/unicode/currunit.h | 45 | include/unicode/currunit.h | |
46 | include/unicode/datefmt.h | 46 | include/unicode/datefmt.h | |
47 | include/unicode/dbbi.h | 47 | include/unicode/dbbi.h | |
48 | include/unicode/dcfmtsym.h | 48 | include/unicode/dcfmtsym.h | |
49 | include/unicode/decimfmt.h | 49 | include/unicode/decimfmt.h | |
50 | include/unicode/docmain.h | 50 | include/unicode/docmain.h | |
51 | include/unicode/dtfmtsym.h | 51 | include/unicode/dtfmtsym.h | |
52 | include/unicode/dtintrv.h | 52 | include/unicode/dtintrv.h | |
53 | include/unicode/dtitvfmt.h | 53 | include/unicode/dtitvfmt.h | |
54 | include/unicode/dtitvinf.h | 54 | include/unicode/dtitvinf.h | |
55 | include/unicode/dtptngen.h | 55 | include/unicode/dtptngen.h | |
56 | include/unicode/dtrule.h | 56 | include/unicode/dtrule.h | |
57 | include/unicode/errorcode.h | 57 | include/unicode/errorcode.h | |
58 | include/unicode/fieldpos.h | 58 | include/unicode/fieldpos.h | |
59 | include/unicode/fmtable.h | 59 | include/unicode/fmtable.h | |
60 | include/unicode/format.h | 60 | include/unicode/format.h | |
61 | include/unicode/fpositer.h | 61 | include/unicode/fpositer.h | |
62 | include/unicode/gender.h | |||
62 | include/unicode/gregocal.h | 63 | include/unicode/gregocal.h | |
63 | include/unicode/icudataver.h | 64 | include/unicode/icudataver.h | |
64 | include/unicode/icuplug.h | 65 | include/unicode/icuplug.h | |
65 | include/unicode/idna.h | 66 | include/unicode/idna.h | |
67 | include/unicode/listformatter.h | |||
66 | include/unicode/localpointer.h | 68 | include/unicode/localpointer.h | |
67 | include/unicode/locdspnm.h | 69 | include/unicode/locdspnm.h | |
68 | include/unicode/locid.h | 70 | include/unicode/locid.h | |
69 | include/unicode/measfmt.h | 71 | include/unicode/measfmt.h | |
70 | include/unicode/measunit.h | 72 | include/unicode/measunit.h | |
71 | include/unicode/measure.h | 73 | include/unicode/measure.h | |
72 | include/unicode/messagepattern.h | 74 | include/unicode/messagepattern.h | |
73 | include/unicode/msgfmt.h | 75 | include/unicode/msgfmt.h | |
74 | include/unicode/normalizer2.h | 76 | include/unicode/normalizer2.h | |
75 | include/unicode/normlzr.h | 77 | include/unicode/normlzr.h | |
76 | include/unicode/numfmt.h | 78 | include/unicode/numfmt.h | |
77 | include/unicode/numsys.h | 79 | include/unicode/numsys.h | |
78 | include/unicode/parseerr.h | 80 | include/unicode/parseerr.h | |
79 | include/unicode/parsepos.h | 81 | include/unicode/parsepos.h | |
80 | include/unicode/platform.h | 82 | include/unicode/platform.h | |
81 | include/unicode/plurfmt.h | 83 | include/unicode/plurfmt.h | |
82 | include/unicode/plurrule.h | 84 | include/unicode/plurrule.h | |
83 | include/unicode/ptypes.h | 85 | include/unicode/ptypes.h | |
84 | include/unicode/putil.h | 86 | include/unicode/putil.h | |
85 | include/unicode/rbbi.h | 87 | include/unicode/rbbi.h | |
86 | include/unicode/rbnf.h | 88 | include/unicode/rbnf.h | |
87 | include/unicode/rbtz.h | 89 | include/unicode/rbtz.h | |
88 | include/unicode/regex.h | 90 | include/unicode/regex.h | |
89 | include/unicode/rep.h | 91 | include/unicode/rep.h | |
90 | include/unicode/resbund.h | 92 | include/unicode/resbund.h | |
91 | include/unicode/schriter.h | 93 | include/unicode/schriter.h | |
92 | include/unicode/search.h | 94 | include/unicode/search.h | |
93 | include/unicode/selfmt.h | 95 | include/unicode/selfmt.h | |
94 | include/unicode/simpletz.h | 96 | include/unicode/simpletz.h | |
95 | include/unicode/smpdtfmt.h | 97 | include/unicode/smpdtfmt.h | |
96 | include/unicode/sortkey.h | 98 | include/unicode/sortkey.h | |
97 | include/unicode/std_string.h | 99 | include/unicode/std_string.h | |
98 | include/unicode/strenum.h | 100 | include/unicode/strenum.h | |
99 | include/unicode/stringpiece.h | 101 | include/unicode/stringpiece.h | |
100 | include/unicode/stringtriebuilder.h | 102 | include/unicode/stringtriebuilder.h | |
101 | include/unicode/stsearch.h | 103 | include/unicode/stsearch.h | |
102 | include/unicode/symtable.h | 104 | include/unicode/symtable.h | |
103 | include/unicode/tblcoll.h | 105 | include/unicode/tblcoll.h | |
104 | include/unicode/timezone.h | 106 | include/unicode/timezone.h | |
105 | include/unicode/tmunit.h | 107 | include/unicode/tmunit.h | |
106 | include/unicode/tmutamt.h | 108 | include/unicode/tmutamt.h | |
107 | include/unicode/tmutfmt.h | 109 | include/unicode/tmutfmt.h | |
108 | include/unicode/translit.h | 110 | include/unicode/translit.h | |
109 | include/unicode/tzfmt.h | 111 | include/unicode/tzfmt.h | |
110 | include/unicode/tznames.h | 112 | include/unicode/tznames.h | |
111 | include/unicode/tzrule.h | 113 | include/unicode/tzrule.h | |
112 | include/unicode/tztrans.h | 114 | include/unicode/tztrans.h | |
113 | include/unicode/ubidi.h | 115 | include/unicode/ubidi.h | |
114 | include/unicode/ubrk.h | 116 | include/unicode/ubrk.h | |
115 | include/unicode/ucal.h | 117 | include/unicode/ucal.h | |
116 | include/unicode/ucasemap.h | 118 | include/unicode/ucasemap.h | |
117 | include/unicode/ucat.h | 119 | include/unicode/ucat.h | |
118 | include/unicode/uchar.h | 120 | include/unicode/uchar.h | |
119 | include/unicode/ucharstrie.h | 121 | include/unicode/ucharstrie.h | |
120 | include/unicode/ucharstriebuilder.h | 122 | include/unicode/ucharstriebuilder.h | |
121 | include/unicode/uchriter.h | 123 | include/unicode/uchriter.h | |
122 | include/unicode/uclean.h | 124 | include/unicode/uclean.h | |
123 | include/unicode/ucnv.h | 125 | include/unicode/ucnv.h | |
124 | include/unicode/ucnv_cb.h | 126 | include/unicode/ucnv_cb.h | |
125 | include/unicode/ucnv_err.h | 127 | include/unicode/ucnv_err.h | |
126 | include/unicode/ucnvsel.h | 128 | include/unicode/ucnvsel.h | |
127 | include/unicode/ucol.h | 129 | include/unicode/ucol.h | |
128 | include/unicode/ucoleitr.h | 130 | include/unicode/ucoleitr.h | |
129 | include/unicode/uconfig.h | 131 | include/unicode/uconfig.h | |
130 | include/unicode/ucsdet.h | 132 | include/unicode/ucsdet.h | |
131 | include/unicode/ucurr.h | 133 | include/unicode/ucurr.h | |
132 | include/unicode/udat.h | 134 | include/unicode/udat.h | |
133 | include/unicode/udata.h | 135 | include/unicode/udata.h | |
134 | include/unicode/udateintervalformat.h | 136 | include/unicode/udateintervalformat.h | |
135 | include/unicode/udatpg.h | 137 | include/unicode/udatpg.h | |
138 | include/unicode/udisplaycontext.h | |||
136 | include/unicode/uenum.h | 139 | include/unicode/uenum.h | |
140 | include/unicode/ugender.h | |||
137 | include/unicode/uidna.h | 141 | include/unicode/uidna.h | |
138 | include/unicode/uiter.h | 142 | include/unicode/uiter.h | |
139 | include/unicode/uldnames.h | 143 | include/unicode/uldnames.h | |
140 | include/unicode/uloc.h | 144 | include/unicode/uloc.h | |
141 | include/unicode/ulocdata.h | 145 | include/unicode/ulocdata.h | |
142 | include/unicode/umachine.h | 146 | include/unicode/umachine.h | |
143 | include/unicode/umisc.h | 147 | include/unicode/umisc.h | |
144 | include/unicode/umsg.h | 148 | include/unicode/umsg.h | |
145 | include/unicode/unifilt.h | 149 | include/unicode/unifilt.h | |
146 | include/unicode/unifunct.h | 150 | include/unicode/unifunct.h | |
147 | include/unicode/unimatch.h | 151 | include/unicode/unimatch.h | |
148 | include/unicode/unirepl.h | 152 | include/unicode/unirepl.h | |
149 | include/unicode/uniset.h | 153 | include/unicode/uniset.h | |
150 | include/unicode/unistr.h | 154 | include/unicode/unistr.h | |
151 | include/unicode/unorm.h | 155 | include/unicode/unorm.h | |
152 | include/unicode/unorm2.h | 156 | include/unicode/unorm2.h | |
153 | include/unicode/unum.h | 157 | include/unicode/unum.h | |
154 | include/unicode/uobject.h | 158 | include/unicode/uobject.h | |
155 | include/unicode/upluralrules.h | 159 | include/unicode/upluralrules.h | |
156 | include/unicode/uregex.h | 160 | include/unicode/uregex.h | |
157 | include/unicode/urename.h | 161 | include/unicode/urename.h | |
158 | include/unicode/urep.h | 162 | include/unicode/urep.h | |
159 | include/unicode/ures.h | 163 | include/unicode/ures.h | |
160 | include/unicode/uscript.h | 164 | include/unicode/uscript.h | |
161 | include/unicode/usearch.h | 165 | include/unicode/usearch.h | |
162 | include/unicode/uset.h | 166 | include/unicode/uset.h | |
163 | include/unicode/usetiter.h | 167 | include/unicode/usetiter.h | |
164 | include/unicode/ushape.h | 168 | include/unicode/ushape.h | |
165 | include/unicode/uspoof.h | 169 | include/unicode/uspoof.h | |
166 | include/unicode/usprep.h | 170 | include/unicode/usprep.h | |
167 | include/unicode/ustdio.h | 171 | include/unicode/ustdio.h | |
168 | include/unicode/ustream.h | 172 | include/unicode/ustream.h | |
169 | include/unicode/ustring.h | 173 | include/unicode/ustring.h | |
170 | include/unicode/ustringtrie.h | 174 | include/unicode/ustringtrie.h | |
171 | include/unicode/utext.h | 175 | include/unicode/utext.h | |
172 | include/unicode/utf.h | 176 | include/unicode/utf.h | |
173 | include/unicode/utf16.h | 177 | include/unicode/utf16.h | |
174 | include/unicode/utf32.h | 178 | include/unicode/utf32.h | |
175 | include/unicode/utf8.h | 179 | include/unicode/utf8.h | |
176 | include/unicode/utf_old.h | 180 | include/unicode/utf_old.h | |
177 | include/unicode/utmscale.h | 181 | include/unicode/utmscale.h | |
178 | include/unicode/utrace.h | 182 | include/unicode/utrace.h | |
179 | include/unicode/utrans.h | 183 | include/unicode/utrans.h | |
180 | include/unicode/utypes.h | 184 | include/unicode/utypes.h | |
181 | include/unicode/uvernum.h | 185 | include/unicode/uvernum.h | |
182 | include/unicode/uversion.h | 186 | include/unicode/uversion.h | |
183 | include/unicode/vtzone.h | 187 | include/unicode/vtzone.h | |
184 | lib/icu/${PKGVERSION}/Makefile.inc | 188 | lib/icu/${PKGVERSION}/Makefile.inc | |
185 | lib/icu/${PKGVERSION}/pkgdata.inc | 189 | lib/icu/${PKGVERSION}/pkgdata.inc | |
186 | lib/icu/Makefile.inc | 190 | lib/icu/Makefile.inc | |
187 | lib/icu/current | 191 | lib/icu/current | |
188 | lib/icu/pkgdata.inc | 192 | lib/icu/pkgdata.inc | |
189 | lib/libicudata.a | 193 | lib/libicudata.a | |
190 | lib/libicudata.so | 194 | lib/libicudata.so | |
191 | lib/libicudata.so.49 | 195 | lib/libicudata.so.50 | |
192 | lib/libicudata.so.${PKGVERSION} | 196 | lib/libicudata.so.${PKGVERSION} | |
193 | lib/libicui18n.a | 197 | lib/libicui18n.a | |
194 | lib/libicui18n.so | 198 | lib/libicui18n.so | |
195 | lib/libicui18n.so.49 | 199 | lib/libicui18n.so.50 | |
196 | lib/libicui18n.so.${PKGVERSION} | 200 | lib/libicui18n.so.${PKGVERSION} | |
197 | lib/libicuio.a | 201 | lib/libicuio.a | |
198 | lib/libicuio.so | 202 | lib/libicuio.so | |
199 | lib/libicuio.so.49 | 203 | lib/libicuio.so.50 | |
200 | lib/libicuio.so.${PKGVERSION} | 204 | lib/libicuio.so.${PKGVERSION} | |
201 | lib/libicule.a | 205 | lib/libicule.a | |
202 | lib/libicule.so | 206 | lib/libicule.so | |
203 | lib/libicule.so.49 | 207 | lib/libicule.so.50 | |
204 | lib/libicule.so.${PKGVERSION} | 208 | lib/libicule.so.${PKGVERSION} | |
205 | lib/libiculx.a | 209 | lib/libiculx.a | |
206 | lib/libiculx.so | 210 | lib/libiculx.so | |
207 | lib/libiculx.so.49 | 211 | lib/libiculx.so.50 | |
208 | lib/libiculx.so.${PKGVERSION} | 212 | lib/libiculx.so.${PKGVERSION} | |
209 | lib/libicutest.a | 213 | lib/libicutest.a | |
210 | lib/libicutest.so | 214 | lib/libicutest.so | |
211 | lib/libicutest.so.49 | 215 | lib/libicutest.so.50 | |
212 | lib/libicutest.so.${PKGVERSION} | 216 | lib/libicutest.so.${PKGVERSION} | |
213 | lib/libicutu.a | 217 | lib/libicutu.a | |
214 | lib/libicutu.so | 218 | lib/libicutu.so | |
215 | lib/libicutu.so.49 | 219 | lib/libicutu.so.50 | |
216 | lib/libicutu.so.${PKGVERSION} | 220 | lib/libicutu.so.${PKGVERSION} | |
217 | lib/libicuuc.a | 221 | lib/libicuuc.a | |
218 | lib/libicuuc.so | 222 | lib/libicuuc.so | |
219 | lib/libicuuc.so.49 | 223 | lib/libicuuc.so.50 | |
220 | lib/libicuuc.so.${PKGVERSION} | 224 | lib/libicuuc.so.${PKGVERSION} | |
221 | lib/pkgconfig/icu-i18n.pc | 225 | lib/pkgconfig/icu-i18n.pc | |
222 | lib/pkgconfig/icu-io.pc | 226 | lib/pkgconfig/icu-io.pc | |
223 | lib/pkgconfig/icu-le.pc | 227 | lib/pkgconfig/icu-le.pc | |
224 | lib/pkgconfig/icu-lx.pc | 228 | lib/pkgconfig/icu-lx.pc | |
225 | lib/pkgconfig/icu-uc.pc | 229 | lib/pkgconfig/icu-uc.pc | |
226 | man/man1/derb.1 | 230 | man/man1/derb.1 | |
227 | man/man1/genbrk.1 | 231 | man/man1/genbrk.1 | |
232 | man/man1/gencfu.1 | |||
228 | man/man1/gencnval.1 | 233 | man/man1/gencnval.1 | |
229 | man/man1/genctd.1 | 234 | man/man1/gendict.1 | |
230 | man/man1/genrb.1 | 235 | man/man1/genrb.1 | |
231 | man/man1/icu-config.1 | 236 | man/man1/icu-config.1 | |
232 | man/man1/makeconv.1 | 237 | man/man1/makeconv.1 | |
233 | man/man1/pkgdata.1 | 238 | man/man1/pkgdata.1 | |
234 | man/man1/uconv.1 | 239 | man/man1/uconv.1 | |
235 | man/man8/genccode.8 | 240 | man/man8/genccode.8 | |
236 | man/man8/gencmn.8 | 241 | man/man8/gencmn.8 | |
237 | man/man8/gensprep.8 | 242 | man/man8/gensprep.8 | |
238 | man/man8/icupkg.8 | 243 | man/man8/icupkg.8 | |
239 | sbin/genccode | 244 | sbin/genccode | |
240 | sbin/gencmn | 245 | sbin/gencmn | |
241 | sbin/gennorm2 | 246 | sbin/gennorm2 | |
242 | sbin/gensprep | 247 | sbin/gensprep | |
243 | sbin/icupkg | 248 | sbin/icupkg | |
244 | share/icu/${PKGVERSION}/config/${MH_NAME} | 249 | share/icu/${PKGVERSION}/config/${MH_NAME} | |
245 | share/icu/${PKGVERSION}/install-sh | 250 | share/icu/${PKGVERSION}/install-sh | |
246 | share/icu/${PKGVERSION}/license.html | 251 | share/icu/${PKGVERSION}/license.html | |
247 | share/icu/${PKGVERSION}/mkinstalldirs | 252 | share/icu/${PKGVERSION}/mkinstalldirs |
@@ -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 | |||
3 | SHA1 (icu4c-49_1_2-src.tgz) = d8cee6d2b2a91a0da7464acd97a5b7b462d93225 | 3 | SHA1 (icu4c-50_1-src.tgz) = 9a3369c00a8be8eff935d2893849ad2eb246c0ef | |
4 | RMD160 (icu4c-49_1_2-src.tgz) = e34aa54f4387ae4c195c72427a2bd25933456e94 | 4 | RMD160 (icu4c-50_1-src.tgz) = 454afee3631da53520d2b66126a8b5f528685b7d | |
5 | Size (icu4c-49_1_2-src.tgz) = 19010646 bytes | 5 | Size (icu4c-50_1-src.tgz) = 21181132 bytes | |
6 | SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6 | 6 | SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230 | |
7 | SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4 | 7 | SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 | |
8 | SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 | 8 | SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 | |
9 | SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb | 9 | SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e | |
10 | SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2 | 10 | SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842 | |
11 | SHA1 (patch-common_putilimp.h) = 45aa7bf3fcf1da1bf8705aa64a135f8a1caeba7e | 11 | SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810 | |
12 | SHA1 (patch-common_unicode_platform.h) = b95b826d8b1d9104fca71db85b8eaaa6b0c19843 | 12 | SHA1 (patch-common_unicode_platform.h) = 36cb68164fcf9b2858acabe95f0206e8088bfbaa | |
13 | SHA1 (patch-common_unicode_uset_h) = 4a429952f1ff3ca787217e65eb62198f3d3f967e | |||
14 | SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 | 13 | SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 | |
15 | SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a | 14 | SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a | |
15 | SHA1 (patch-tools_genrb_derb.c) = 2c652a66f842236721f03e159efc14b0313e4a8f |
@@ -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 | |||
3 | Add linker flags for finding the libraries to pkg-config files. | 3 | Add linker flags for finding the libraries to pkg-config files. | |
4 | Avoid using programs which need elevated privileges during the build. | 4 | Avoid 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 >> $@ |
@@ -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= |
@@ -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 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
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) | |
19 | A = a | 19 | A = a | |
20 | SOBJ = $(SO) | 20 | SOBJ = $(SO) |
@@ -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 |
@@ -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 |
$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",