PERFORCE change 167479 for review

[Gabor Kovesdan]

http://perforce.freebsd.org/chv.cgi?CH=167479

Change 167479 by gabor at gabor_aspire on 2009/08/18 16:01:25

	MFHg:
		- Link iconv, mkcsmapper, mkesdb to libiconv instead of
		  static binaries
		- Reduce size of generated data used by regression test
		- Add reference data for regression test, generated with
		  GNU libc-iconv

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/TESTING-HOWTO#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#4 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/Makefile#2 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/tablegen.c#2 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#6 edit

Differences ...

==== //depot/projects/soc2009/gabor_iconv/extracted/TESTING-HOWTO#6 (text+ko) ====

@@ -3,26 +3,34 @@
 
 You have to accomplish the following steps:
 
-1, Install library modules.
+1, Install includes.
+
+   cd include
+   make install
+
+2, Install the library.
+
+   cd lib/libiconv
+   make all
+   make install LIBDIR=/usr/lib
+
+2, Install library modules.
 
    cd lib/libiconv_modules
    make all
    mkdir /usr/lib/i18n
    make install
 
-3, Install the utilities
+3, Install the utilities.
 
    cd usr.bin
    make all
-   make install
+   make install BINDIR=/usr/bin
 
-2, Install conversion tables
+2, Install conversion tables.
 
    cd share/i18n
    make all install
 
-You can now use /usr/bin/iconv to convert files.  With these instructions, you
-don't get the library, just the on-demand loaded modules, which implement
-conversion of different encodings or groups of encodings.  If you want to
-install the library, you can run "make all install" in lib/libiconv but note
-that the library can interfere with GNU iconv, which is required by many ports.
+Now, you have the iconv utility installed in /usr/bin, and the library
+in /usr/lib.

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#4 (text+ko) ====

@@ -28,23 +28,23 @@
 ENCODING+=	ISO8859-16
 
 ENCODING+=	ARMSCII-8
-ENCODING+=	BIG5
-ENCODING+=	BIG5HKSCS
+#ENCODING+=	BIG5
+#ENCODING+=	BIG5HKSCS
 #ENCODING+=	CP1131
 ENCODING+=	CP1251
 ENCODING+=	CP866
-ENCODING+=	CP949
-ENCODING+=	GB18030
+#ENCODING+=	CP949
+#ENCODING+=	GB18030
 ENCODING+=	GB2312
-ENCODING+=	GBK
+#ENCODING+=	GBK
 ENCODING+=	VISCII
-ENCODING+=	KOI8-R
-ENCODING+=	KOI8-U
+#ENCODING+=	KOI8-R
+#ENCODING+=	KOI8-U
 ENCODING+=	PT154
 ENCODING+=	SHIFT_JIS
 ENCODING+=	EUC-CN
-ENCODING+=	EUC-JP
-ENCODING+=	EUC-KR
+#ENCODING+=	EUC-JP
+#ENCODING+=	EUC-KR
 
 GEN_FWD?=	${.CURDIR}/tablegen/tablegen
 GEN_REV?=	${.CURDIR}/tablegen/tablegen -r

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/Makefile#2 (text+ko) ====

@@ -3,11 +3,8 @@
 PROG=		tablegen
 NO_MAN=		yes
 
-CFLAGS+=	-I/usr/local/include -g
-LDFLAGS+=	-L/usr/local/lib
-
 LDADD=	-liconv
-DPADD=  /usr/local/lib/libiconv.a
+DPADD=  /usr/lib/libiconv.a
 
 WARNS?=		6
 

==== //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/tablegen.c#2 (text+ko) ====

@@ -160,7 +160,7 @@
 	char		*outbuf_;
 	const char	*inbuf_;
 
-	for (inbuf = 0; inbuf < 0x110000; inbuf += 1) {
+	for (inbuf = 0; inbuf < 0x10000; inbuf += 1) {
 		inbytesleft = outbytesleft = 4;
 		CONVERT;
 	}

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#6 (text+ko) ====

@@ -2,29 +2,13 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../lib/libiconv
-
 PROG=		iconv
-SRCS=		iconv.c \
-		_iconv.c \
-		citrus_db.c \
-		citrus_esdb.c \
-		citrus_lookup.c \
-		citrus_mmap.c \
-		citrus_memstream.c \
-		citrus_iconv.c \
-		citrus_mapper.c \
-		citrus_hash.c \
-		citrus_module.c \
-		citrus_bcs.c \
-		citrus_bcs_strtol.c \
-		citrus_db_hash.c
-CFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv
+SRCS=		iconv.c
 MAN=		iconv.1
 
 WARNS?=		6
 
-LDADD+= -lcrypt
-DPADD+= ${LIBCRYPT}
+LDADD+= -lcrypt -liconv
+DPADD+= ${LIBCRYPT} /usr/lib/libiconv.a
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#6 (text+ko) ====

@@ -1,13 +1,12 @@
 #	$NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $
 
-.PATH: ${.CURDIR}/../../lib/libiconv ${.CURDIR}/../../lib/libiconv_modules/mapper_std
-
 PROG=		mkcsmapper
-SRCS=		yacc.y lex.l \
-		citrus_db_factory.c citrus_bcs.c citrus_db_hash.c \
-		citrus_lookup_factory.c citrus_pivot_factory.c
+SRCS=		yacc.y lex.l
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../lib/libiconv -I${.CURDIR}/../../lib/libiconv_modules/mapper_std
 NO_MAN=		yes
 WARNS?=		6
 
+LDADD+=		-liconv
+DPADD+=		/usr/lib/libiconv.a
+
 .include <bsd.prog.mk>

==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#6 (text+ko) ====

@@ -1,13 +1,12 @@
 #	$NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $
 
-.PATH: ${.CURDIR}/../../lib/libiconv
-
 PROG=		mkesdb
-SRCS=		yacc.y lex.l \
-		citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
-		citrus_lookup_factory.c
+SRCS=		yacc.y lex.l
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../lib/libiconv
 NO_MAN=		yes
 WARNS?=		6
 
+LDADD+=		-liconv
+DPADD+=		/usr/lib/libiconv.a
+
 .include <bsd.prog.mk>