Fromm maintainer:

1. Change freetype-1.2 to freetype-1.3 in post-install, so
   it can find freetype sources to build ttf2pk & ttf2tfm.
2. It no longer uses moettf, but Arphic ttf instead, which
   has no character loss and IMHO much more beautiful. :)
3. Generates GB tfms from Arphic fonts.
4. Update maintainer's address.

PR:		16042
Submitted by:	maintainer

3 files changed, 218 insertions, 14 deletions

diff --git a/chinese/CJK/files/patch-aa b/chinese/CJK/files/patch-aa
index b30624ddd5f4..61c487fa3d61 100644
--- a/chinese/CJK/files/patch-aa
+++ b/chinese/CJK/files/patch-aa
@@ -1,6 +1,6 @@
 --- Makefile.orig	Thu Jan  1 08:00:00 1970
 +++ Makefile	Sat Feb 20 08:10:54 1999
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,24 @@
 +#
 +# Makefile for CJK to apply on Unix systems more smoothly.
 +#
@@ -18,6 +18,7 @@
 +	$(MAKE) -C utils $@
 +
 +install-texinput:
++	(rm -fr $(CJK_DIR)); && \
 +	(mkdir -p $(CJK_DIR)); && \
 +	($(CP) -R texinput/* $(CJK_DIR)); && \
 +	($(CHOWN) -R $(SHAREOWN).$(SHAREGRP) $(CJK_DIR))
diff --git a/chinese/CJK/files/patch-ab b/chinese/CJK/files/patch-ab
index 5c54fe292f79..3e765f0c61b6 100644
--- a/chinese/CJK/files/patch-ab
+++ b/chinese/CJK/files/patch-ab
@@ -1,17 +1,62 @@
---- utils/Bg5conv/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/Bg5conv/Makefile	Sat Feb 20 07:17:29 1999
-@@ -0,0 +1,14 @@
-+bg5conv:
-+	$(CC) $(CFLAGS) -o $@ bg5conv.c
+--- texinput/Bg5/c00kai.fd.orig	Mon Jun  7 06:47:47 1999
++++ texinput/Bg5/c00kai.fd	Thu Jan  6 22:15:54 2000
+@@ -19,7 +19,7 @@
+ 
+ \DeclareFontFamily{C00}{kai}{}
+ 
+-\DeclareFontShape{C00}{kai}{m}{n}{<-> CJK * b5ka12}{}
+-\DeclareFontShape{C00}{kai}{bx}{n}{<-> CJKb * b5ka12}{\CJKbold}
++\DeclareFontShape{C00}{kai}{m}{n}{<-> CJK * arb5kai}{}
++\DeclareFontShape{C00}{kai}{bx}{n}{<-> CJKb * arb5kai}{\CJKbold}
+ 
+ \endinput
+--- texinput/Bg5/c00song.fd.orig	Mon Jun  7 06:47:47 1999
++++ texinput/Bg5/c00song.fd	Thu Jan  6 22:16:09 2000
+@@ -19,7 +19,7 @@
+ 
+ \DeclareFontFamily{C00}{song}{}
+ 
+-\DeclareFontShape{C00}{song}{m}{n}{<-> CJKsub * kai/m/n}{}
+-\DeclareFontShape{C00}{song}{bx}{n}{<-> CJKsub * kai/bx/n}{}
++\DeclareFontShape{C00}{song}{m}{n}{<-> CJK * arb5sung}{}
++\DeclareFontShape{C00}{song}{bx}{n}{<-> CJKb * arb5sung}{\CJKbold}
+ 
+ \endinput
+--- texinput/GB/c10kai.fd.orig	Fri Jan  7 16:43:14 2000
++++ texinput/GB/c10kai.fd	Fri Jan  7 16:42:57 2000
+@@ -0,0 +1,23 @@
++% This is the file c10kai.fd of the CJK package
++%   for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
++%
++% created by Werner Lemberg <wl@gnu.org>
++%
++% Version 4.3.0 (20-Jun-1999)
 +
-+build: bg5conv
++\def\fileversion{4.3.0}
++\def\filedate{1999/06/20}
++\ProvidesFile{c10kai.fd}[\filedate\space\fileversion]
 +
-+all: build
 +
-+install: all
-+	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
-+	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
-+	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
++% simplified Chinese characters
++%
++% character set: GB 2312-80
++% font encoding: CJK (standard)
 +
-+clean:
-+	$(RM) bg5conv
++\DeclareFontFamily{C10}{kai}{}
++
++\DeclareFontShape{C10}{kai}{m}{n}{<-> CJK * argbkai}{}
++\DeclareFontShape{C10}{kai}{bx}{n}{<-> CJKb * argbkai}{\CJKbold}
++
++\endinput
+--- texinput/GB/c10song.fd.orig	Mon Jun  7 06:47:48 1999
++++ texinput/GB/c10song.fd	Fri Jan  7 16:43:02 2000
+@@ -17,7 +17,7 @@
+ 
+ \DeclareFontFamily{C10}{song}{}
+ 
+-\DeclareFontShape{C10}{song}{m}{n}{<-> CJKsub * fs/m/n}{}
+-\DeclareFontShape{C10}{song}{bx}{n}{<-> CJKsub * fs/bx/n}{}
++\DeclareFontShape{C10}{song}{m}{n}{<-> CJK * argbsung}{}
++\DeclareFontShape{C10}{song}{bx}{n}{<-> CJKb * argbsung}{\CJKbold}
+ 
+ \endinput
diff --git a/chinese/CJK/files/patch-ac b/chinese/CJK/files/patch-ac
index c8d471a2b061..b6c47766373a 100644
--- a/chinese/CJK/files/patch-ac
+++ b/chinese/CJK/files/patch-ac
@@ -1,3 +1,75 @@
+--- utils/Makefile.orig	Thu Jan  6 20:50:10 2000
++++ utils/Makefile	Thu Jan  6 20:52:17 2000
+@@ -0,0 +1,52 @@
++CC = /usr/bin/cc
++CFLAGS = -Wall -O
++
++TEXMF_DIR = $(PREFIX)/share/texmf
++LATEX_DIR = $(TEXMF_DIR)/tex/latex
++CJK_DIR = $(LATEX_DIR)/CJK
++
++export CP := /bin/cp
++export CHMOD := /bin/chmod
++export RM := /bin/rm
++
++export INSTALL := /usr/bin/install
++export INSTALL_DATA := $(INSTALL) -c -o root -g wheel -m 644
++export INSTALL_MAN := ${INSTALL_DATA}
++export INSTALL_PROGRAM := $(INSTALL) -c -s -o bin -g bin -m 755
++export INSTALL_SCRIPT := $(INSTALL) -c -o bin -g bin -m 755
++
++hbf2gf_build:
++	$(CHMOD) +x hbf2gf/config.guess hbf2gf/config.sub hbf2gf/configure
++	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-dir=$(PREFIX); $(MAKE) all)
++
++all: hbf2gf_build
++	$(MAKE) -C Bg5conv $@
++	$(MAKE) -C CEFconv $@
++	$(MAKE) -C SJISconv $@
++	$(MAKE) -C extconv $@
++	$(MAKE) -C pyhyphen $@
++	$(MAKE) -C thaiconv $@
++
++hbf2gf_install:
++	$(CHMOD) +x hbf2gf/mkinstalldirs
++	$(MAKE) -C hbf2gf install
++	$(RM) -fr $(TEXMF_DIR)/hbf2gf
++	$(CP) -R hbf2gf/cfg $(TEXMF_DIR)/hbf2gf
++
++install: hbf2gf_install
++	$(MAKE) -C Bg5conv $@
++	$(MAKE) -C CEFconv $@
++	$(MAKE) -C SJISconv $@
++	$(MAKE) -C extconv $@
++	$(MAKE) -C lisp $@
++	$(MAKE) -C pyhyphen $@
++	$(MAKE) -C thaiconv $@
++
++clean:
++	$(MAKE) -C Bg5conv $@
++	$(MAKE) -C CEFconv $@
++	$(MAKE) -C SJISconv $@
++	$(MAKE) -C extconv $@
++	$(MAKE) -C hbf2gf distclean
++	$(MAKE) -C pyhyphen $@
++	$(MAKE) -C thaiconv $@
+--- utils/Bg5conv/Makefile.orig	Thu Jan  1 08:00:00 1970
++++ utils/Bg5conv/Makefile	Sat Feb 20 07:17:29 1999
+@@ -0,0 +1,14 @@
++bg5conv:
++	$(CC) $(CFLAGS) -o $@ bg5conv.c
++
++build: bg5conv
++
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
++	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
++
++clean:
++	$(RM) bg5conv
 --- utils/CEFconv/Makefile.orig	Thu Jan  1 08:00:00 1970
 +++ utils/CEFconv/Makefile	Sat Feb 20 07:26:46 1999
 @@ -0,0 +1,20 @@
@@ -21,3 +93,89 @@
 +
 +clean:
 +	$(RM) *conv
+--- utils/SJISconv/Makefile.orig	Thu Jan  1 08:00:00 1970
++++ utils/SJISconv/Makefile	Sat Feb 20 07:29:10 1999
+@@ -0,0 +1,14 @@
++sjisconv:
++	$(CC) $(CFLAGS) -o $@ sjisconv.c
++
++build: sjisconv
++
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) sjisconv $(PREFIX)/bin
++	$(INSTALL_SCRIPT) sjislatex $(PREFIX)/bin
++	$(INSTALL_MAN) sjisconv.1 $(PREFIX)/man/man1
++
++clean:
++	$(RM) sjisconv
+--- utils/extconv/Makefile.orig	Wed Sep  8 00:22:41 1999
++++ utils/extconv/Makefile	Mon Sep  6 15:12:14 1999
+@@ -0,0 +1,15 @@
++extconv:
++	$(CC) $(CFLAGS) -o $@ extconv.c
++
++build: extconv
++
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) extconv $(PREFIX)/bin
++	$(INSTALL_MAN) extconv.1 $(PREFIX)/man/man1
++	$(INSTALL_SCRIPT) bg5+latex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) gbklatex $(PREFIX)/bin
++
++clean:
++	$(RM) extconv
+--- utils/hbf2gf/Makefile.in.orig	Sun Mar  7 16:10:45 1999
++++ utils/hbf2gf/Makefile.in	Sun Mar  7 16:11:00 1999
+@@ -65,7 +65,7 @@
+ 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man1
+ 	for P in $(PROGRAMS) ; do \
+           $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
+-          $(INSTALL_DATA) $(srcdir)/$$P.1 $(mandir)/man1 ; \
++          $(INSTALL_DATA) -c $(srcdir)/$$P.1 $(mandir)/man1 ; \
+         done
+ 
+ uninstall:
+--- utils/lisp/Makefile.orig	Thu Jan  1 08:00:00 1970
++++ utils/lisp/Makefile	Sat Feb 27 17:52:17 1999
+@@ -0,0 +1,3 @@
++install:
++	(mkdir -p ${PREFIX}/share/emacs/site-lisp/CJK); && \
++	($(CP) -R [a-z]* ${PREFIX}/share/emacs/site-lisp/CJK)
+--- utils/pyhyphen/Makefile.orig	Mon Jan 10 15:07:11 2000
++++ utils/pyhyphen/Makefile	Mon Jan 10 15:15:06 2000
+@@ -0,0 +1,14 @@
++pinyin:
++	$(CC) $(CFLAGS) -o $@ pinyin.c
++
++build: pinyin
++
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) pinyin $(PREFIX)/bin
++	$(INSTALL_DATA) pinyin.ldf $(PREFIX)/share/texmf/tex/generic/babel
++	$(INSTALL_DATA) pyhyph.tex $(PREFIX)/share/texmf/tex/generic/hyphen
++
++clean:
++	$(RM) pinyin
+--- utils/thaiconv/Makefile.orig	Sun Dec 13 12:00:00 1998
++++ utils/thaiconv/Makefile	Sat Feb 20 07:39:03 1999
+@@ -14,3 +14,14 @@
+ 	c2cweb -b "The thaiconv program" -l -v thaiconv.c
+ 	$(CWEAVE) +ai thaiconv.cw
+ 	$(TEX) thaiconv
++
++build: thaiconv
++
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) thaiconv $(PREFIX)/bin
++	$(INSTALL_MAN) thaiconv.1 $(PREFIX)/man/man1
++
++clean:
++	$(RM) thaiconv