PERFORCE change 166603 for review
Gabor Kovesdan
gabor at FreeBSD.org
Mon Jul 27 08:28:56 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166603
Change 166603 by gabor at gabor_aspire on 2009/07/27 08:28:03
MFHg
Affected files ...
.. //depot/projects/soc2009/gabor_iconv/extracted/gnu/share/iconv/regression-test/Makefile#8 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.c#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/citrus_mapper_serial.c#4 delete
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/citrus_mapper_serial.h#4 delete
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/charset.pivot.GB.src#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/mapper.dir.GB.src#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/JIS/charset.pivot.JIS.src#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/JIS/mapper.dir.JIS.src#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/EUC/EUC-JP.src#6 edit
Differences ...
==== //depot/projects/soc2009/gabor_iconv/extracted/gnu/share/iconv/regression-test/Makefile#8 (text+ko) ====
@@ -116,13 +116,13 @@
-$(srcdir)/check-stateless $(srcdir) ISO-IR-165
# -$(srcdir)/check-stateless $(srcdir) KSC_5601 # redundant, see EUC-KR
# /* CJK encodings */
-# -$(srcdir)/check-stateless $(srcdir) EUC-JP
+ -$(srcdir)/check-stateless $(srcdir) EUC-JP
-$(srcdir)/check-stateless $(srcdir) SHIFT_JIS
-$(srcdir)/check-stateless $(srcdir) CP932
-$(srcdir)/check-stateful $(srcdir) ISO-2022-JP
-$(srcdir)/check-stateful $(srcdir) ISO-2022-JP-2
-$(srcdir)/check-stateful $(srcdir) ISO-2022-JP-1
-# -$(srcdir)/check-stateless $(srcdir) EUC-CN
+ -$(srcdir)/check-stateless $(srcdir) EUC-CN
-$(srcdir)/check-stateless $(srcdir) GBK
-$(srcdir)/check-stateless $(srcdir) CP936
-$(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/gengb18030z.c ../../../../lib/libiconv/*.o -o gengb18030z && \
@@ -141,7 +141,7 @@
-$(srcdir)/check-stateful $(srcdir) BIG5-HKSCS:2001
-$(srcdir)/check-stateless $(srcdir) BIG5-HKSCS:2004
-$(srcdir)/check-stateful $(srcdir) BIG5-HKSCS:2004
-# -$(srcdir)/check-stateless $(srcdir) EUC-KR
+ -$(srcdir)/check-stateless $(srcdir) EUC-KR
-$(srcdir)/check-stateless $(srcdir) CP949
-$(srcdir)/check-stateless $(srcdir) JOHAB
# -$(srcdir)/check-stateful $(srcdir) ISO-2022-KR
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= BIG5
-SRCS+= citrus_big5.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_big5.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.c#6 (text+ko) ====
@@ -251,7 +251,6 @@
{
int err;
const char *s;
- void *ctx = (void *)&ei;
memset((void *)ei, 0, sizeof(*ei));
TAILQ_INIT(&ei->excludes);
@@ -271,9 +270,9 @@
}
/* fallback Big5-1984, for backward compatibility. */
- _citrus_BIG5_fill_rowcol(&ctx, "row", 0xA1, 0xFE);
- _citrus_BIG5_fill_rowcol(&ctx, "col", 0x40, 0x7E);
- _citrus_BIG5_fill_rowcol(&ctx, "col", 0xA1, 0xFE);
+ _citrus_BIG5_fill_rowcol((void **)&ei, "row", 0xA1, 0xFE);
+ _citrus_BIG5_fill_rowcol((void **)&ei, "col", 0x40, 0x7E);
+ _citrus_BIG5_fill_rowcol((void **)&ei, "col", 0xA1, 0xFE);
return 0;
}
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= DECHanyu
-SRCS+= citrus_dechanyu.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_dechanyu.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= EUC
-SRCS+= citrus_euc.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_euc.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.c#6 (text+ko) ====
@@ -292,10 +292,8 @@
_citrus_EUC_wcrtomb_priv(_EUCEncodingInfo *ei, char *s, size_t n, wchar_t wc,
_EUCState *psenc, size_t *nresult)
{
- wchar_t m, nm;
- int ret;
- short i;
- unsigned int cs;
+ wchar_t m, nm;
+ int cs, i, ret;
m = wc & ei->mask;
nm = wc & ~m;
@@ -311,7 +309,7 @@
cs = 1;
i = ei->count[cs];
- if (n < (unsigned)i) {
+ if (n < i) {
ret = E2BIG;
goto err;
}
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= EUCTW
-SRCS+= citrus_euctw.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_euctw.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= GBK2K
-SRCS+= citrus_gbk2k.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_gbk2k.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= HZ
-SRCS+= citrus_hz.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_hz.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= ISO2022
-SRCS+= citrus_iso2022.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_iso2022.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= JOHAB
-SRCS+= citrus_johab.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_johab.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= MSKanji
-SRCS+= citrus_mskanji.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mskanji.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= UES
-SRCS+= citrus_ues.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_ues.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= UTF1632
-SRCS+= citrus_utf1632.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_utf1632.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= UTF7
-SRCS+= citrus_utf7.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_utf7.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= UTF8
-SRCS+= citrus_utf8.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_utf8.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= VIQR
-SRCS+= citrus_viqr.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_viqr.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= ZW
-SRCS+= citrus_zw.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_zw.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= iconv_none
-SRCS+= citrus_iconv_none.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_iconv_none.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= iconv_std
-SRCS+= citrus_iconv_std.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_iconv_std.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= mapper_646
-SRCS= citrus_mapper_646.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mapper_646.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= mapper_none
-SRCS+= citrus_mapper_none.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mapper_none.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= mapper_serial
-SRCS+= citrus_mapper_serial.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mapper_serial.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= mapper_std
-SRCS+= citrus_mapper_std.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mapper_std.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#6 (text+ko) ====
@@ -1,6 +1,33 @@
# $FreeBSD$
+.PATH: ../../libiconv
+
LIB= mapper_zone
-SRCS+= citrus_mapper_zone.c
+SHLIB_MAJOR= 4
+CFLAGS+= -I../../libiconv
+LIBDIR= /usr/lib/i18n
+SRCS= _iconv.c \
+ citrus_bcs.c \
+ citrus_bcs_strtol.c \
+ citrus_bcs_strtoul.c \
+ citrus_csmapper.c \
+ citrus_ctype.c \
+ citrus_ctype_fallback.c \
+ citrus_db.c \
+ citrus_db_hash.c \
+ citrus_esdb.c \
+ citrus_hash.c \
+ citrus_iconv.c \
+ citrus_lookup.c \
+ citrus_mapper.c \
+ citrus_memstream.c \
+ citrus_mmap.c \
+ citrus_module.c \
+ citrus_none.c \
+ citrus_prop.c \
+ citrus_stdenc.c \
+ citrus_mapper_zone.c
+
+WARNS?= 3
.include <bsd.lib.mk>
==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/Makefile#6 (text+ko) ====
@@ -4,7 +4,6 @@
MAPS= GB12345%UCS.mps \
GB18030%UCS at BMP.mps \
GB2312%UCS.mps \
- GB2312GBK%UCS.mps \
GB2312EXT%UCS.mps \
GB2312UDA1%UCS.mps \
GB2312UDA2%UCS.mps \
==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/charset.pivot.GB.src#6 (text+ko) ====
@@ -2,7 +2,6 @@
GB12345 UCS 1
GB2312 UCS 1
-GB2312GBK UCS 1
GB2312:GBK UCS 1
GB2312:GB18030 UCS 1
GBK UCS 1
@@ -11,7 +10,6 @@
ISO-IR-165 UCS 1
UCS GB12345 1
UCS GB2312 1
-UCS GB2312GBK 1
UCS GB2312:GBK 1
UCS GB2312:GB18030 1
UCS GBK 1
==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/mapper.dir.GB.src#6 (text+ko) ====
@@ -2,7 +2,6 @@
GB12345/UCS mapper_std GB/GB12345%UCS.mps
GB2312/UCS mapper_std GB/GB2312%UCS.mps
-GB2312GBK/UCS mapper_std GB/GB2312GBK%UCS.mps
GB2312EXT/UCS mapper_std GB/GB2312EXT%UCS.mps
GB2312UDA1/UCS mapper_std GB/GB2312UDA1%UCS.mps
GB2312UDA2/UCS mapper_std GB/GB2312UDA2%UCS.mps
@@ -10,7 +9,7 @@
GBKUDA/UCS mapper_std GB/GBKUDA%UCS.mps
GB18030/UCS:BMP mapper_std GB/GB18030%UCS at BMP.mps
ISO-IR-165EXT/UCS mapper_std GB/ISO-IR-165EXT%UCS.mps
-GB2312:CP936/UCS mapper_parallel GB2312EXT/UCS,GB2312GBK/UCS
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list