9 files changed, 245 insertions, 128 deletions

diff --git a/converters/cn2jp/files/patch-aa b/converters/cn2jp/files/patch-aa
index 44573c9eebc6..362a90c8ef8b 100644
--- a/converters/cn2jp/files/patch-aa
+++ b/converters/cn2jp/files/patch-aa
@@ -1,6 +1,17 @@
---- big2gb/Makefile.orig	Sun Dec 10 10:40:10 2000
-+++ big2gb/Makefile	Sun Dec 10 10:40:19 2000
-@@ -13,8 +13,8 @@
+--- big2gb/Makefile.orig	Tue Feb 27 09:44:00 1996
++++ big2gb/Makefile	Sun Oct 19 01:39:28 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = b2g.c b2g_table.c b2g-util.c
+ OBJS = b2g.o b2g_table.o b2g-util.o
+@@ -13,8 +14,8 @@
  	$(CC) $(CFLAGS) -o b2g $(OBJS) -llang
  
  b2g_table.c: big2gb.tbl
@@ -11,128 +22,3 @@
  
  tar:
  	echo "Produce b2g`date '+%m%d'`.tar..."
---- big2jis/Makefile.orig	Wed Feb 28 01:44:04 1996
-+++ big2jis/Makefile	Sun Dec 10 10:39:12 2000
-@@ -13,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o b2j $(OBJS) -llang
- 
- b2j_table.c: big2jis.tbl
--	mktable big2jis.tbl
--	mktbl2c big2jis.t b2j > b2j_table.c
-+	../table/mktable big2jis.tbl
-+	../table/mktbl2c big2jis.t b2j > b2j_table.c
- 
- tar:
- 	echo "Produce b2j`date '+%m%d'`.tar..."
---- gb2big/Makefile.orig	Sun Dec 10 10:41:06 2000
-+++ gb2big/Makefile	Sun Dec 10 10:41:16 2000
-@@ -13,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o g2b $(OBJS) -llang
- 
- g2b_table.c: gb2big.tbl
--	mktable gb2big.tbl
--	mktbl2c gb2big.t g2b > g2b_table.c
-+	../table/mktable gb2big.tbl
-+	../table/mktbl2c gb2big.t g2b > g2b_table.c
- 
- tar:
- 	echo "Produce g2b`date '+%m%d'`.tar..."
---- gb2jis/Makefile.orig	Sun Dec 10 10:41:29 2000
-+++ gb2jis/Makefile	Sun Dec 10 10:41:39 2000
-@@ -13,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o g2j $(OBJS) -llang
- 
- g2j_table.c: gb2jis.tbl
--	mktable gb2jis.tbl
--	mktbl2c gb2jis.t g2j > g2j_table.c
-+	../table/mktable gb2jis.tbl
-+	../table/mktbl2c gb2jis.t g2j > g2j_table.c
- 
- tar:
- 	echo "Produce g2j`date '+%m%d'`.tar..."
---- jis2big/Makefile.orig	Sun Dec 10 10:39:44 2000
-+++ jis2big/Makefile	Sun Dec 10 10:39:52 2000
-@@ -13,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o j2b $(OBJS) -llang
- 
- j2b_table.c: jis2big.tbl
--	mktable jis2big.tbl
--	mktbl2c jis2big.t j2b > j2b_table.c
-+	../table/mktable jis2big.tbl
-+	../table/mktbl2c jis2big.t j2b > j2b_table.c
- 
- tar:
- 	echo "Produce j2b`date '+%m%d'`.tar..."
---- jis2gb/Makefile.orig	Sun Dec 10 10:40:37 2000
-+++ jis2gb/Makefile	Sun Dec 10 10:40:47 2000
-@@ -13,8 +13,8 @@
- 	$(CC) $(CFLAGS) -o j2g $(OBJS) -llang
- 
- j2g_table.c: jis2gb.tbl
--	mktable jis2gb.tbl
--	mktbl2c jis2gb.t j2g > j2g_table.c
-+	../table/mktable jis2gb.tbl
-+	../table/mktbl2c jis2gb.t j2g > j2g_table.c
- 
- tar:
- 	echo "Produce j2g`date '+%m%d'`.tar..."
---- table/Makefile.orig	Wed Feb 28 01:43:44 1996
-+++ table/Makefile	Sun Dec 10 10:39:12 2000
-@@ -11,25 +11,21 @@
- 
- mktable: mktable.o
- 	$(CC) $(CFLAGS) -o mktable mktable.o
--	rm -f /home/sagittar/seke/bin/mktable
--	ln mktable /home/sagittar/seke/bin/mktable
- 
- mktbl2c: mktbl2c.o
- 	$(CC) $(CFLAGS) -o mktbl2c mktbl2c.o
--	rm -f /home/sagittar/seke/bin/mktbl2c
--	ln mktbl2c /home/sagittar/seke/bin/mktbl2c
- 
- big5.tbl: big5.o
- 	$(CC) $(CFLAGS) -o big5 big5.o
--	big5 > big5.tbl
-+	./big5 > big5.tbl
- 
- gb.tbl: gb.o
- 	$(CC) $(CFLAGS) -o gb gb.o
--	gb > gb.tbl
-+	./gb > gb.tbl
- 
- jis.tbl: jis.o
- 	$(CC) $(CFLAGS) -o jis jis.o
--	jis > jis.tbl
-+	./jis > jis.tbl
- 
- tar:
- 	echo "Produce table`date '+%m%d'`.tar..."
---- Makefile.orig	Tue Feb 27 22:35:44 1996
-+++ Makefile	Mon Jan  8 09:59:11 2001
-@@ -14,10 +14,11 @@
- 	lib/py-tbl.o lib/uzpj-tbl.o lib/uzpj-util.o \
- 	hz2gb.o gb2hz.o SINO.o jp-util2.o
- 
--all: makeall libcn2jp.a
-+all: makeall libcn2jp.a libcn2jp.so
- 
- 
- makeall:
-+	cd table; make; cd ..
- 	cd lib; make; cd ..
- 	cd big2jis; make; cd ..
- 	cd jis2big; make; cd ..
-@@ -28,9 +29,11 @@
- 
- libcn2jp.a:  $(OBJS)
- 	rm -f libcn2jp.a
--	ar r libcn2jp.a $(OBJS)
-+	ar cru libcn2jp.a $(OBJS)
- 	ranlib libcn2jp.a
--	cp libcn2jp.a ../../../lib/libcn2jp.a
-+
-+libcn2jp.so: $(OBJS)
-+	ld -o libcn2jp.so $(OBJS) -shared -soname libcn2jp.so
- 
- gb2hz.o: lib/gb2hz.c
- 	$(CC) -c lib/gb2hz.c
diff --git a/converters/cn2jp/files/patch-ab b/converters/cn2jp/files/patch-ab
new file mode 100644
index 000000000000..f14a2eaf2631
--- /dev/null
+++ b/converters/cn2jp/files/patch-ab
@@ -0,0 +1,24 @@
+--- big2jis/Makefile.orig	Tue Feb 27 09:44:04 1996
++++ big2jis/Makefile	Sun Oct 19 01:39:35 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = b2j.c b2j_table.c b2j-util.c
+ OBJS = b2j.o b2j_table.o b2j-util.o
+@@ -13,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o b2j $(OBJS) -llang
+ 
+ b2j_table.c: big2jis.tbl
+-	mktable big2jis.tbl
+-	mktbl2c big2jis.t b2j > b2j_table.c
++	../table/mktable big2jis.tbl
++	../table/mktbl2c big2jis.t b2j > b2j_table.c
+ 
+ tar:
+ 	echo "Produce b2j`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ac b/converters/cn2jp/files/patch-ac
new file mode 100644
index 000000000000..09ed362038bb
--- /dev/null
+++ b/converters/cn2jp/files/patch-ac
@@ -0,0 +1,24 @@
+--- gb2big/Makefile.orig	Tue Feb 27 09:44:31 1996
++++ gb2big/Makefile	Sun Oct 19 01:39:41 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = g2b.c g2b_table.c g2b-util.c
+ OBJS = g2b.o g2b_table.o g2b-util.o
+@@ -13,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o g2b $(OBJS) -llang
+ 
+ g2b_table.c: gb2big.tbl
+-	mktable gb2big.tbl
+-	mktbl2c gb2big.t g2b > g2b_table.c
++	../table/mktable gb2big.tbl
++	../table/mktbl2c gb2big.t g2b > g2b_table.c
+ 
+ tar:
+ 	echo "Produce g2b`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ad b/converters/cn2jp/files/patch-ad
new file mode 100644
index 000000000000..fe39db41dec4
--- /dev/null
+++ b/converters/cn2jp/files/patch-ad
@@ -0,0 +1,24 @@
+--- gb2jis/Makefile.orig	Tue Feb 27 09:44:34 1996
++++ gb2jis/Makefile	Sun Oct 19 01:39:44 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = g2j.c g2j_table.c g2j-util.c
+ OBJS = g2j.o g2j_table.o g2j-util.o
+@@ -13,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o g2j $(OBJS) -llang
+ 
+ g2j_table.c: gb2jis.tbl
+-	mktable gb2jis.tbl
+-	mktbl2c gb2jis.t g2j > g2j_table.c
++	../table/mktable gb2jis.tbl
++	../table/mktbl2c gb2jis.t g2j > g2j_table.c
+ 
+ tar:
+ 	echo "Produce g2j`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ae b/converters/cn2jp/files/patch-ae
new file mode 100644
index 000000000000..82b8bc3893c5
--- /dev/null
+++ b/converters/cn2jp/files/patch-ae
@@ -0,0 +1,24 @@
+--- jis2big/Makefile.orig	Tue Feb 27 09:44:46 1996
++++ jis2big/Makefile	Sun Oct 19 01:39:48 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = j2b.c j2b_table.c j2b-util.c
+ OBJS = j2b.o j2b_table.o j2b-util.o
+@@ -13,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o j2b $(OBJS) -llang
+ 
+ j2b_table.c: jis2big.tbl
+-	mktable jis2big.tbl
+-	mktbl2c jis2big.t j2b > j2b_table.c
++	../table/mktable jis2big.tbl
++	../table/mktbl2c jis2big.t j2b > j2b_table.c
+ 
+ tar:
+ 	echo "Produce j2b`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-af b/converters/cn2jp/files/patch-af
new file mode 100644
index 000000000000..0d10c1d54a32
--- /dev/null
+++ b/converters/cn2jp/files/patch-af
@@ -0,0 +1,24 @@
+--- jis2gb/Makefile.orig	Tue Feb 27 09:44:50 1996
++++ jis2gb/Makefile	Sun Oct 19 01:39:54 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = j2g.c j2g_table.c j2g-util.c
+ OBJS = j2g.o j2g_table.o j2g-util.o
+@@ -13,8 +14,8 @@
+ 	$(CC) $(CFLAGS) -o j2g $(OBJS) -llang
+ 
+ j2g_table.c: jis2gb.tbl
+-	mktable jis2gb.tbl
+-	mktbl2c jis2gb.t j2g > j2g_table.c
++	../table/mktable jis2gb.tbl
++	../table/mktbl2c jis2gb.t j2g > j2g_table.c
+ 
+ tar:
+ 	echo "Produce j2g`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ag b/converters/cn2jp/files/patch-ag
new file mode 100644
index 000000000000..c7c186a2a157
--- /dev/null
+++ b/converters/cn2jp/files/patch-ag
@@ -0,0 +1,42 @@
+--- table/Makefile.orig	Tue Feb 27 09:43:44 1996
++++ table/Makefile	Sun Oct 19 01:40:02 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../include -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = big5.c gb.c jis.c mktable.c mktbl2c.c
+ OBJS = 
+@@ -11,25 +12,21 @@
+ 
+ mktable: mktable.o
+ 	$(CC) $(CFLAGS) -o mktable mktable.o
+-	rm -f /home/sagittar/seke/bin/mktable
+-	ln mktable /home/sagittar/seke/bin/mktable
+ 
+ mktbl2c: mktbl2c.o
+ 	$(CC) $(CFLAGS) -o mktbl2c mktbl2c.o
+-	rm -f /home/sagittar/seke/bin/mktbl2c
+-	ln mktbl2c /home/sagittar/seke/bin/mktbl2c
+ 
+ big5.tbl: big5.o
+ 	$(CC) $(CFLAGS) -o big5 big5.o
+-	big5 > big5.tbl
++	./big5 > big5.tbl
+ 
+ gb.tbl: gb.o
+ 	$(CC) $(CFLAGS) -o gb gb.o
+-	gb > gb.tbl
++	./gb > gb.tbl
+ 
+ jis.tbl: jis.o
+ 	$(CC) $(CFLAGS) -o jis jis.o
+-	jis > jis.tbl
++	./jis > jis.tbl
+ 
+ tar:
+ 	echo "Produce table`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ah b/converters/cn2jp/files/patch-ah
new file mode 100644
index 000000000000..e991c9fa9df0
--- /dev/null
+++ b/converters/cn2jp/files/patch-ah
@@ -0,0 +1,56 @@
+--- Makefile.orig	Tue Feb 27 06:35:44 1996
++++ Makefile	Sun Oct 19 01:43:20 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../lib -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = README Makefile */*.c */*.h */*.tbl */Makefile */README
+ OBJS = big2jis/b2j-util.o big2jis/b2j_table.o \
+@@ -14,10 +15,11 @@
+ 	lib/py-tbl.o lib/uzpj-tbl.o lib/uzpj-util.o \
+ 	hz2gb.o gb2hz.o SINO.o jp-util2.o
+ 
+-all: makeall libcn2jp.a
++all: makeall libcn2jp.a libcn2jp.so
+ 
+ 
+ makeall:
++	cd table; make; cd ..
+ 	cd lib; make; cd ..
+ 	cd big2jis; make; cd ..
+ 	cd jis2big; make; cd ..
+@@ -28,21 +30,23 @@
+ 
+ libcn2jp.a:  $(OBJS)
+ 	rm -f libcn2jp.a
+-	ar r libcn2jp.a $(OBJS)
++	ar cru libcn2jp.a $(OBJS)
+ 	ranlib libcn2jp.a
+-	cp libcn2jp.a ../../../lib/libcn2jp.a
++
++libcn2jp.so: $(OBJS)
++	ld -o libcn2jp.so $(OBJS) -shared -soname libcn2jp.so
+ 
+ gb2hz.o: lib/gb2hz.c
+-	$(CC) -c lib/gb2hz.c
++	$(CC) $(CFLAGS) -c lib/gb2hz.c
+ 
+ hz2gb.o: lib/hz2gb.c
+-	$(CC) -c lib/hz2gb.c
++	$(CC) $(CFLAGS) -c lib/hz2gb.c
+ 
+ SINO.o: lib/SINO.c
+-	$(CC) -c lib/SINO.c
++	$(CC) $(CFLAGS) -c lib/SINO.c
+ 
+ jp-util2.o: lib/jp-util2.c
+-	$(CC) -c lib/jp-util2.c
++	$(CC) $(CFLAGS) -c lib/jp-util2.c
+ 
+ tar:
+ 	echo "Produce cn2jp`date '+%m%d'`.tar..."
diff --git a/converters/cn2jp/files/patch-ai b/converters/cn2jp/files/patch-ai
new file mode 100644
index 000000000000..fda93f763d74
--- /dev/null
+++ b/converters/cn2jp/files/patch-ai
@@ -0,0 +1,13 @@
+--- lib/Makefile.orig	Tue Feb 27 09:43:29 1996
++++ lib/Makefile	Sun Oct 19 01:40:47 2003
+@@ -1,7 +1,8 @@
+ INCLUDE=
+ 
+-CC=cc
+-CFLAGS= -g -I../include -I. -L../lib -L.
++CC?=cc
++CFLAGS?=-O -pipe
++CFLAGS+= -g -I../lib -I. -L../lib -L.
+ 
+ SRC = lang-util.h lang-util.c py-tbl.c uzpj-tbl.c uzpj-util.c jp-util.h jp-util.c cn-util.c hz2gb.c gb2hz.c
+ OBJS = lang-util.o py-tbl.o uzpj-tbl.o uzpj-util.o jp-util.o cn-util.o hz2gb.o gb2hz.o