From owner-p4-projects@FreeBSD.ORG Mon Jul 27 08:47:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9186C106566C; Mon, 27 Jul 2009 08:47:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38663106566B for ; Mon, 27 Jul 2009 08:47:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 257DB8FC20 for ; Mon, 27 Jul 2009 08:47:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6R8lFxr047891 for ; Mon, 27 Jul 2009 08:47:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6R8lFht047889 for perforce@freebsd.org; Mon, 27 Jul 2009 08:47:15 GMT (envelope-from gabor@freebsd.org) Date: Mon, 27 Jul 2009 08:47:15 GMT Message-Id: <200907270847.n6R8lFht047889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 166604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2009 08:47:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=166604 Change 166604 by gabor@gabor_aspire on 2009/07/27 08:47:09 MFHg Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/gnu/share/iconv/regression-test/Makefile#9 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/Makefile#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/charset.pivot.GB.src#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/mapper.dir.GB.src#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/JIS/charset.pivot.JIS.src#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/JIS/mapper.dir.JIS.src#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/EUC/EUC-JP.src#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#2 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/gnu/share/iconv/regression-test/Makefile#9 (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#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= BIG5 -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 +SRCS+= citrus_big5.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.c#7 (text+ko) ==== @@ -251,6 +251,7 @@ { int err; const char *s; + void *ctx = (void *)&ei; memset((void *)ei, 0, sizeof(*ei)); TAILQ_INIT(&ei->excludes); @@ -270,9 +271,9 @@ } /* fallback Big5-1984, for backward compatibility. */ - _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); + _citrus_BIG5_fill_rowcol(&ctx, "row", 0xA1, 0xFE); + _citrus_BIG5_fill_rowcol(&ctx, "col", 0x40, 0x7E); + _citrus_BIG5_fill_rowcol(&ctx, "col", 0xA1, 0xFE); return 0; } ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= DECHanyu -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 +SRCS+= citrus_dechanyu.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= EUC -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 +SRCS+= citrus_euc.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.c#7 (text+ko) ==== @@ -292,8 +292,10 @@ _citrus_EUC_wcrtomb_priv(_EUCEncodingInfo *ei, char *s, size_t n, wchar_t wc, _EUCState *psenc, size_t *nresult) { - wchar_t m, nm; - int cs, i, ret; + wchar_t m, nm; + int ret; + short i; + unsigned int cs; m = wc & ei->mask; nm = wc & ~m; @@ -309,7 +311,7 @@ cs = 1; i = ei->count[cs]; - if (n < i) { + if (n < (unsigned)i) { ret = E2BIG; goto err; } ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= EUCTW -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 +SRCS+= citrus_euctw.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= GBK2K -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 +SRCS+= citrus_gbk2k.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= HZ -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 +SRCS+= citrus_hz.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= ISO2022 -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 +SRCS+= citrus_iso2022.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= JOHAB -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 +SRCS+= citrus_johab.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= MSKanji -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 +SRCS+= citrus_mskanji.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= UES -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 +SRCS+= citrus_ues.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF1632/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= UTF1632 -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 +SRCS+= citrus_utf1632.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= UTF7 -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 +SRCS+= citrus_utf7.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= UTF8 -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 +SRCS+= citrus_utf8.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= VIQR -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 +SRCS+= citrus_viqr.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= ZW -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 +SRCS+= citrus_zw.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= iconv_none -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 +SRCS+= citrus_iconv_none.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= iconv_std -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 +SRCS+= citrus_iconv_std.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= mapper_646 -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 +SRCS= citrus_mapper_646.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= mapper_none -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 +SRCS+= citrus_mapper_none.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_parallel/Makefile#5 (text+ko) ==== @@ -3,31 +3,6 @@ .PATH: ../../libiconv ../mapper_serial LIB= mapper_parallel -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 +SRCS+= citrus_mapper_serial.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= mapper_serial -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 +SRCS+= citrus_mapper_serial.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= mapper_std -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 +SRCS+= citrus_mapper_std.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/Makefile#7 (text+ko) ==== @@ -1,33 +1,6 @@ # $FreeBSD$ -.PATH: ../../libiconv - LIB= mapper_zone -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 +SRCS+= citrus_mapper_zone.c .include ==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/GB/Makefile#7 (text+ko) ==== @@ -4,6 +4,7 @@ MAPS= GB12345%UCS.mps \ GB18030%UCS@BMP.mps \ GB2312%UCS.mps \ + GB2312GBK%UCS.mps \ GB2312EXT%UCS.mps \ GB2312UDA1%UCS.mps \ >>> TRUNCATED FOR MAIL (1000 lines) <<<