9 files changed, 522 insertions, 160 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index 71b9b6fde920..6df5794ddf37 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -1,34 +1,36 @@
 # New ports collection makefile for:	zh-CJK
 # Version required:	4.3.0
 # Date created:		5 Sep 1999
-# Whom:			J.T. Jang (jtjang@gcn.net.tw)
+# Whom:			Keith Jang (keith@freebsd.sinica.edu.tw)
 #
 # $FreeBSD$
 #
 
 DISTNAME=	zh-CJK-4.3.0
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://ftp.ffii.org/pub/cjk/devel/
+MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/
 DISTFILES=	cjk-current.tar.gz
 
-MAINTAINER=	jtjang@gcn.net.tw
+MAINTAINER=	keith@freebsd.sinica.edu.tw
 
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
-		${X11BASE}/lib/X11/fonts/TrueType/moe_lishu.ttf:${PORTSDIR}/chinese/moettf \
+		${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
 		ttf2pk:${PORTSDIR}/print/freetype:build
 LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
-NO_PACKAGE=	Interactive
+NO_PACKAGE=	"Needs ttf2pk source from FreeType"
 
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/cjk-current
 
 post-install:
 .if !defined(NOPORTDOCS)
+	${RM} -fr ${PREFIX}/share/doc/CJK
 	${CP} -R ${WRKSRC}/doc ${PREFIX}/share/doc/CJK
-	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
 .endif
+	${RM} -fr ${PREFIX}/share/examples/CJK
+	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
 
 MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
 		hbf2gf.1 sjisconv.1 thaiconv.1 ttf2pk.1 ttf2tfm.1
diff --git a/chinese/CJK/distinfo b/chinese/CJK/distinfo
index 511dcc0bf7d2..c6db4a3bd71a 100644
--- a/chinese/CJK/distinfo
+++ b/chinese/CJK/distinfo
@@ -1 +1 @@
-MD5 (cjk-current.tar.gz) = b606e42a80a8bba733705e53c6102363
+MD5 (cjk-current.tar.gz) = b2a7cd7189b47b6fd4ce830f255f143c
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
diff --git a/chinese/CJK/pkg-descr b/chinese/CJK/pkg-descr
index 41de8c309aea..8c0046311278 100644
--- a/chinese/CJK/pkg-descr
+++ b/chinese/CJK/pkg-descr
@@ -3,8 +3,8 @@ enables the use of CJK scripts (Chinese/Japanese/Korean) in various
 encodings.
 
 =====
-This port installs full Chinese BIG5 support, including TTF fonts. For
+This port installs full Chinese BIG5/GB support, including TTF fonts. For
 other Asian languages, you have to supply those TTF fonts, then manually
 modify relative settings.
 
-J.T. Jang <jtjang@gcn.net.tw>
+Keith Jang <keith@freebsd.sinica.edu.tw>
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index 60934fbe5251..71ea40293514 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -10,6 +10,7 @@ bin/cefslatex
 bin/extconv
 bin/gbklatex
 bin/hbf2gf
+bin/pinyin
 bin/sjisconv
 bin/sjislatex
 bin/thaiconv
@@ -41,12 +42,13 @@ share/doc/CJK/japanese/jp-tex.doc
 share/doc/CJK/japanese/preview.doc
 share/doc/CJK/japanese/shibuaki.doc
 share/doc/CJK/pinyin.doc
+share/doc/CJK/pyhyphen.doc
 share/doc/CJK/ruby.doc
 share/doc/CJK/vertical.doc
 share/emacs/site-lisp/CJK/cjkspace.el
 share/emacs/site-lisp/CJK/cjktilde.el
-share/emacs/site-lisp/CJK/emacs-20.3/cjk-enc.el
 share/emacs/site-lisp/CJK/emacs-20/cjk-enc.el
+share/emacs/site-lisp/CJK/emacs-20.3/cjk-enc.el
 share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
 share/examples/CJK/Big5.tex
 share/examples/CJK/Big5vert.tex
@@ -60,9 +62,180 @@ share/examples/CJK/UTF8.tex
 share/examples/CJK/muletest.tex
 share/examples/CJK/py_test.tex
 share/examples/CJK/rubytest.tex
-share/texmf/fonts/truetype/moe/moe_kai.ttf
-share/texmf/fonts/truetype/moe/moe_sung.ttf
-share/texmf/fonts/truetype/moe/moe_lishu.ttf
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai01.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai02.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai03.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai04.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai05.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai06.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai07.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai08.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai09.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai10.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai11.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai12.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai13.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai14.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai15.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai16.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai17.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai18.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai19.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai20.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai21.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai22.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai23.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai25.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai26.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai27.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai28.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai29.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai30.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai31.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai32.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai33.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai34.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai35.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai36.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai37.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai38.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai39.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai40.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai41.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai42.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai43.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai44.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai45.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai46.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai47.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai48.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai49.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai50.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai51.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai52.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai53.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai54.tfm
+share/texmf/fonts/tfm/arphic/arb5kai/arb5kai55.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung01.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung02.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung03.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung04.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung05.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung06.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung07.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung08.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung09.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung10.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung11.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung12.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung13.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung14.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung15.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung16.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung17.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung18.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung19.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung20.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung21.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung22.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung23.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung25.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung26.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung27.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung28.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung29.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung30.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung31.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung32.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung33.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung34.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung35.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung36.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung37.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung38.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung39.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung40.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung41.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung42.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung43.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung44.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung45.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung46.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung47.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung48.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung49.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung50.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung51.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung52.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung53.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung54.tfm
+share/texmf/fonts/tfm/arphic/arb5sung/arb5sung55.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai01.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai02.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai03.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai04.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai06.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai07.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai08.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai09.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai10.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai11.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai12.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai13.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai14.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai15.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai16.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai17.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai18.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai19.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai20.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai21.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai22.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai23.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai24.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai25.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai26.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai27.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai28.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai29.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai30.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai31.tfm
+share/texmf/fonts/tfm/arphic/argbkai/argbkai32.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung01.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung02.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung03.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung04.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung06.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung07.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung08.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung09.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung10.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung11.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung12.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung13.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung14.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung15.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung16.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung17.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung18.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung19.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung20.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung21.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung22.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung23.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung24.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung25.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung26.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung27.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung28.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung29.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung30.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung31.tfm
+share/texmf/fonts/tfm/arphic/argbsung/argbsung32.tfm
+share/texmf/fonts/truetype/arphic/arb5_kai.ttf
+share/texmf/fonts/truetype/arphic/arb5_sung.ttf
+share/texmf/fonts/truetype/arphic/argb_kai.ttf
+share/texmf/fonts/truetype/arphic/argb_sung.ttf
 share/texmf/hbf2gf/README
 share/texmf/hbf2gf/b5ka12.cfg
 share/texmf/hbf2gf/b5kr12.cfg
@@ -79,6 +252,8 @@ share/texmf/hbf2gf/gsfs14.cfg
 share/texmf/hbf2gf/j2so12.cfg
 share/texmf/hbf2gf/jsso12.cfg
 share/texmf/hbf2gf/ksso17.cfg
+share/texmf/tex/generic/babel/pinyin.ldf
+share/texmf/tex/generic/hyphen/pyhyph.tex
 share/texmf/tex/latex/CJK/Bg5/Bg5.cap
 share/texmf/tex/latex/CJK/Bg5/Bg5.chr
 share/texmf/tex/latex/CJK/Bg5/Bg5.cpx
@@ -86,11 +261,8 @@ share/texmf/tex/latex/CJK/Bg5/Bg5.enc
 share/texmf/tex/latex/CJK/Bg5/c00cns.fd
 share/texmf/tex/latex/CJK/Bg5/c00fs.fd
 share/texmf/tex/latex/CJK/Bg5/c00kai.fd
-share/texmf/tex/latex/CJK/Bg5/c00kai.fd.orig
 share/texmf/tex/latex/CJK/Bg5/c00kair.fd
-share/texmf/tex/latex/CJK/Bg5/c00lishu.fd
 share/texmf/tex/latex/CJK/Bg5/c00song.fd
-share/texmf/tex/latex/CJK/Bg5/c00song.fd.orig
 share/texmf/tex/latex/CJK/Bg5/c01song.fd
 share/texmf/tex/latex/CJK/Bg5/c09song.fd
 share/texmf/tex/latex/CJK/CEF/c80song.fd
@@ -112,6 +284,7 @@ share/texmf/tex/latex/CJK/CNS/c37song.fd
 share/texmf/tex/latex/CJK/GB/GB.cap
 share/texmf/tex/latex/CJK/GB/GB.cpx
 share/texmf/tex/latex/CJK/GB/c10fs.fd
+share/texmf/tex/latex/CJK/GB/c10kai.fd
 share/texmf/tex/latex/CJK/GB/c10song.fd
 share/texmf/tex/latex/CJK/GB/c11song.fd
 share/texmf/tex/latex/CJK/GB/c19song.fd
@@ -282,6 +455,12 @@ share/texmf/ttf2pk/ET5.enc
 share/texmf/ttf2pk/EUC.sfd
 share/texmf/ttf2pk/SJIS.sfd
 share/texmf/ttf2pk/T1-WGL4.enc
+share/texmf/ttf2pk/UBg5plus.sfd
+share/texmf/ttf2pk/UBig5.sfd
+share/texmf/ttf2pk/UGB.sfd
+share/texmf/ttf2pk/UGBK.sfd
+share/texmf/ttf2pk/UJIS.sfd
+share/texmf/ttf2pk/UKS.sfd
 share/texmf/ttf2pk/Unicode.sfd
 share/texmf/ttf2pk/VPS.rpl
 share/texmf/ttf2pk/ttfonts.map
@@ -289,8 +468,13 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/doc/CJK/japanese
 @dirrm share/doc/CJK
 @dirrm share/examples/CJK
-@dirrm share/texmf/fonts/truetype/moe
-@dirrm share/texmf/fonts/truetype
+@dirrm share/texmf/fonts/tfm/arphic/arb5kai
+@dirrm share/texmf/fonts/tfm/arphic/arb5sung
+@dirrm share/texmf/fonts/tfm/arphic/argbkai
+@dirrm share/texmf/fonts/tfm/arphic/argbsung
+@dirrm share/texmf/fonts/tfm/arphic
+@dirrm share/texmf/fonts/truetype/arphic
+@unexec rmdir %D/share/texmf/fonts/truetype 2>/dev/null || true
 @dirrm share/texmf/hbf2gf
 @dirrm share/texmf/tex/latex/CJK/Bg5
 @dirrm share/texmf/tex/latex/CJK/CEF
diff --git a/chinese/CJK/scripts/post-install b/chinese/CJK/scripts/post-install
index 00544833c309..720d44639094 100644
--- a/chinese/CJK/scripts/post-install
+++ b/chinese/CJK/scripts/post-install
@@ -1,166 +1,134 @@
 #!/bin/sh
 PATH=/bin:/usr/bin:/usr/local/bin
 
+TEXMFMAIN=`kpsexpand '$TEXMFMAIN'`
+
 # Some mktexpk incorrectly calls ttf2pk with -p option, delete it.
-cp ${PREFIX}/bin/mktexpk ${PREFIX}/bin/mktexpk.CJK
-sed -e "s/ttf2pk -p/ttf2pk/" ${PREFIX}/bin/mktexpk.CJK > ${PREFIX}/bin/mktexpk
-rm ${PREFIX}/bin/mktexpk.CJK
+if [ ! -z "`grep "ttf2pk -p" ${PREFIX}/bin/mktexpk`" ]
+then
+  cp ${PREFIX}/bin/mktexpk ${PREFIX}/bin/mktexpk.CJK
+  sed -e "s/ttf2pk -p/ttf2pk/" ${PREFIX}/bin/mktexpk.CJK > ${PREFIX}/bin/mktexpk
+  rm ${PREFIX}/bin/mktexpk.CJK
+fi
 
-# Install ttf2pk binary in ${PORTSDIR}/print/freetype, data in ${TEXMF}/ttf2pk
-(cd ${PORTSDIR}/print/freetype/work/freetype-1.2/contrib/ttf2pk;
+# Install ttf2pk binary in ${PORTSDIR}/print/freetype, data in ${TEXMF}/ttf2pk,
+# and link ${TEXMF}/ttf2tfm to ${TEXMF}/ttf2pk.
+(cd ${PORTSDIR}/print/freetype/work/freetype-1.3/contrib/ttf2pk;
  ./configure --prefix=${PREFIX} --with-kpathsea-dir=${PREFIX};
  make depend all install;
- cp -R data ${PREFIX}/share/texmf/ttf2pk;
- cd ${PREFIX}/share/texmf; ln -s ttf2pk ttf2tfm; )
-
-# We have no way telling where generated fonts are, but ask the user.
-echo
-echo "Please input where generated fonts are placed."
-echo "It's specified as VARTEXFONTS in your texmf.cnf."
-echo "->(Default: /var/tmp/texfonts)"
-read VARTEXFONTS
-if [ -z ${VARTEXFONTS} ]
-then
-  VARTEXFONTS=/var/tmp/texfonts
-fi
+ rm -fr ${TEXMFMAIN}/ttf2pk ${TEXMFMAIN}/ttf2tfm;
+ cp -R data ${TEXMFMAIN}/ttf2pk;
+ cd ${TEXMFMAIN}; ln -s ttf2pk ttf2tfm; )
 
-# teTeX no longer makes VARTEXFONTS.
-mkdir -p ${VARTEXFONTS}/pk
-mkdir -p ${VARTEXFONTS}/tfm
+# Install Arphic TTF fonts
+mkdir -p ${TEXMFMAIN}/fonts/truetype/arphic
+ln -s ${X11BASE}/lib/X11/fonts/TrueType/bkai00mp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/arb5_kai.ttf
+ln -s ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/arb5_sung.ttf
+ln -s ${X11BASE}/lib/X11/fonts/TrueType/gbsn00lp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/argb_sung.ttf
+ln -s ${X11BASE}/lib/X11/fonts/TrueType/gkai00mp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/argb_kai.ttf
 
-# Chmod 1777 ${VARTEXFONTS}.
-if [ -z "${NOCHMOD}" ]
+# fontname/special.map: add arb5kai/arb5sung/argbkai/argbsung entries.
+if [ -n "`grep arb5kai ${TEXMFMAIN}/fontname/special.map`" ]
 then
-  chmod -R 1777 ${VARTEXFONTS}
+  echo Seems arb5kai already in special.map, file untouched.
+else
+  echo "@c Arphic BIG5 Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map
+  echo "arb5kai		big5		arb5kai" >> ${TEXMFMAIN}/fontname/special.map
 fi
-
-# Install moe_* TTF fonts
-echo ===
-echo If you want to install other TTF fonts, you have to manually edit:
-echo ${PREFIX}/share/texmf/fontname/special.map
-echo ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
-echo ${PREFIX}/share/texmf/web2c/texmf.cnf
-echo ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00kai.fd, for Kai family fonts.
-echo ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00song.fd, for Song family fonts.
-echo ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00lishu.fd, for LiShu family fonts.
-echo ===
-mkdir -p ${PREFIX}/share/texmf/fonts/truetype/moe
-ln -s ${X11BASE}/lib/X11/fonts/TrueType/moe_*.ttf ${PREFIX}/share/texmf/fonts/truetype/moe
-
-# fontname/special.map
-if [ -n "`grep moekai ${PREFIX}/share/texmf/fontname/special.map`" ]
+if [ -n "`grep arb5sung ${TEXMFMAIN}/fontname/special.map`" ]
 then
-  echo Seems moekai already in special.map, file untouched.
+  echo Seems arb5sung already in special.map, file untouched.
 else
-  echo "@c BIG5 MOE TTF fonts" >> ${PREFIX}/share/texmf/fontname/special.map
-  echo "moekai		big5		moekai" >> ${PREFIX}/share/texmf/fontname/special.map
+  echo "@c Arphic BIG5 Mingti TTF" >> ${TEXMFMAIN}/fontname/special.map
+  echo "arb5sung		big5		arb5sung" >> ${TEXMFMAIN}/fontname/special.map
 fi
-if [ -n "`grep moesung ${PREFIX}/share/texmf/fontname/special.map`" ]
+if [ -n "`grep argbkai ${TEXMFMAIN}/fontname/special.map`" ]
 then
-  echo Seems moesung already in special.map, file untouched.
+  echo Seems argbkai already in special.map, file untouched.
 else
-  echo "@c BIG5 MOE TTF fonts" >> ${PREFIX}/share/texmf/fontname/special.map
-  echo "moesung		big5		moesung" >> ${PREFIX}/share/texmf/fontname/special.map
+  echo "@c Arphic GB Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map
+  echo "argbkai		gb		argbkai" >> ${TEXMFMAIN}/fontname/special.map
 fi
-if [ -n "`grep moelishu ${PREFIX}/share/texmf/fontname/special.map`" ]
+if [ -n "`grep argbsung ${TEXMFMAIN}/fontname/special.map`" ]
 then
-  echo Seems moelishu already in special.map, file untouched.
+  echo Seems argbsung already in special.map, file untouched.
 else
-  echo "@c BIG5 MOE TTF fonts" >> ${PREFIX}/share/texmf/fontname/special.map
-  echo "moelishu	big5		moelishu" >> ${PREFIX}/share/texmf/fontname/special.map
+  echo "@c Arphic GB Sungti TTF" >> ${TEXMFMAIN}/fontname/special.map
+  echo "argbsung		gb		argbsung" >> ${TEXMFMAIN}/fontname/special.map
 fi
 
-# ttf2pk/ttfonts.map
-if [ -n "`grep moekai ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+# ttf2pk/ttfonts.map: add arb5kai/arb5sung/argbkai/argbsung entries.
+if [ -n "`grep arb5kai ${TEXMFMAIN}/ttf2pk/ttfonts.map`" ]
 then
-  echo Seems moekai already in ttfonts.map, file untouched.
+  echo Seems arb5kai already in ttfonts.map, file untouched.
 else
-  echo "moekai@Big5.sfd@   moe_kai Pid=3 Eid=4" >> ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
+  echo "arb5kai@UBig5@   arb5_kai Pid=3 Eid=1" >> ${TEXMFMAIN}/ttf2pk/ttfonts.map
 fi
-if [ -n "`grep moesung ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+if [ -n "`grep arb5sung ${TEXMFMAIN}/ttf2pk/ttfonts.map`" ]
 then
-  echo Seems moesung already in ttfonts.map, file untouched.
+  echo Seems arb5sung already in ttfonts.map, file untouched.
 else
-  echo "moesung@Big5.sfd@   moe_sung Pid=3 Eid=4" >> ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
+  echo "arb5sung@UBig5@   arb5_sung Pid=3 Eid=1" >> ${TEXMFMAIN}/ttf2pk/ttfonts.map
 fi
-if [ -n "`grep moelishu ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+if [ -n "`grep argbkai ${TEXMFMAIN}/ttf2pk/ttfonts.map`" ]
 then
-  echo Seems moelishu already in ttfonts.map, file untouched.
+  echo Seems argbkai already in ttfonts.map, file untouched.
 else
-  echo "moelishu@Big5.sfd@   moe_lishu Pid=3 Eid=4" >> ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
+  echo "argbkai@UGB@   argb_kai Pid=3 Eid=1" >> ${TEXMFMAIN}/ttf2pk/ttfonts.map
 fi
-
-# web2c/texmf.cnf
-if [ -n "`grep TTF2PKINPUTS ${PREFIX}/share/texmf/web2c/texmf.cnf`" ]
+if [ -n "`grep argbsung ${TEXMFMAIN}/ttf2pk/ttfonts.map`" ]
 then
-  echo Seems TTF2PKINPUTS already set in texmf.cnf, file untouched.
+  echo Seems argbsung already in ttfonts.map, file untouched.
 else
-  echo "% ttf2pk data directory" >> ${PREFIX}/share/texmf/web2c/texmf.cnf
-  echo "TTF2PKINPUTS = \$TEXMF/ttf2pk//" >> ${PREFIX}/share/texmf/web2c/texmf.cnf
-fi
-if [ -n "`grep TTF2TFMINPUTS ${PREFIX}/share/texmf/web2c/texmf.cnf`" ]
-then
-  echo Seems TTF2TFMINPUTS already set in texmf.cnf, file untouched.
-else
-  echo "% ttf2tfm data directory" >> ${PREFIX}/share/texmf/web2c/texmf.cnf
-  echo "TTF2TFMINPUTS = \$TEXMF/ttf2tfm//" >> ${PREFIX}/share/texmf/web2c/texmf.cnf
+  echo "argbsung@UGB@   argb_sung Pid=3 Eid=1" >> ${TEXMFMAIN}/ttf2pk/ttfonts.map
 fi
 
-# tex/latex/CJK/Bg5/c00kai.fd
-if [ -n "`grep moekai ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00kai.fd`" ]
+# web2c/texmf.cnf
+if [ -n "`grep TTF2PKINPUTS ${TEXMFMAIN}/web2c/texmf.cnf`" ]
 then
-  echo Seems moekai already in c00kai.fd, file untouched.
+  echo Seems TTF2PKINPUTS already set in texmf.cnf, file untouched.
 else
-  (cd ${PREFIX}/share/texmf/tex/latex/CJK/Bg5;
-   cp c00kai.fd c00kai.fd.orig;
-   sed -e "s/b5ka12/moekai/" c00kai.fd.orig > c00kai.fd;
-  )
+  echo "% ttf2pk data directory" >> ${TEXMFMAIN}/web2c/texmf.cnf
+  echo "TTF2PKINPUTS = \$TEXMF/ttf2pk//" >> ${TEXMFMAIN}/web2c/texmf.cnf
 fi
-
-# tex/latex/CJK/Bg5/c00song.fd
-if [ -n "`grep moesung ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00song.fd`" ]
+if [ -n "`grep TTF2TFMINPUTS ${TEXMFMAIN}/web2c/texmf.cnf`" ]
 then
-  echo Seems moesung already in c00song.fd, file untouched.
+  echo Seems TTF2TFMINPUTS already set in texmf.cnf, file untouched.
 else
-  (cd ${PREFIX}/share/texmf/tex/latex/CJK/Bg5;
-   cp c00song.fd c00song.fd.orig;
-   sed -e "s/CJKsub \* kai\/m\/n/CJK \* moesung/" c00song.fd.orig > c00song.fd;
-   mv c00song.fd c00song.fd.tmp;
-   sed -e "s/CJKsub \* kai\/bx\/n/CJKb \* moesung/" c00song.fd.tmp > c00song.fd;
-   rm c00song.fd.tmp;
-  )
+  echo "% ttf2tfm data directory" >> ${TEXMFMAIN}/web2c/texmf.cnf
+  echo "TTF2TFMINPUTS = \$TEXMF/ttf2tfm//" >> ${TEXMFMAIN}/web2c/texmf.cnf
 fi
 
-rm ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00lishu.fd.orig
+# Clean redundant files created during patch phase.
+rm -f ${TEXMFMAIN}/tex/latex/CJK/Bg5/c00kai.fd.orig
+rm -f ${TEXMFMAIN}/tex/latex/CJK/Bg5/c00song.fd.orig
+rm -f ${TEXMFMAIN}/tex/latex/CJK/GB/c10kai.fd.orig
+rm -f ${TEXMFMAIN}/tex/latex/CJK/GB/c10song.fd.orig
 
-# Generate tfm fonts for moekai/moesung/moelishu.
-texconfig rehash  # Update ls-R
-mkdir -p ${VARTEXFONTS}/tfm/moe/moekai ${VARTEXFONTS}/tfm/moe/moesung ${VARTEXFONTS}/tfm/moe/moelishu
-(cd ${VARTEXFONTS}/tfm/moe/moekai; ttf2tfm moe_kai -P 3 -E 4 moekai@Big5@)
-(cd ${VARTEXFONTS}/tfm/moe/moesung; ttf2tfm moe_sung -P 3 -E 4 moesung@Big5@)
-(cd ${VARTEXFONTS}/tfm/moe/moelishu; ttf2tfm moe_lishu -P 3 -E 4 moelishu@Big5@)
+# Generate tfm fonts for Arphic TTFs.
+mkdir -p ${TEXMFMAIN}/fonts/tfm/arphic/arb5kai ${TEXMFMAIN}/fonts/tfm/arphic/arb5sung ${TEXMFMAIN}/fonts/tfm/arphic/argbkai ${TEXMFMAIN}/fonts/tfm/arphic/argbsung
+(cd ${TEXMFMAIN}/fonts/tfm/arphic/arb5kai; ttf2tfm ${TEXMFMAIN}/fonts/truetype/arphic/arb5_kai -P 3 -E 1 arb5kai@${TEXMFMAIN}/ttf2pk/UBig5@)
+(cd ${TEXMFMAIN}/fonts/tfm/arphic/arb5sung; ttf2tfm ${TEXMFMAIN}/fonts/truetype/arphic/arb5_sung -P 3 -E 1 arb5sung@${TEXMFMAIN}/ttf2pk/UBig5@)
+(cd ${TEXMFMAIN}/fonts/tfm/arphic/argbkai; ttf2tfm ${TEXMFMAIN}/fonts/truetype/arphic/argb_kai -P 3 -E 1 argbkai@${TEXMFMAIN}/ttf2pk/UGB@)
+(cd ${TEXMFMAIN}/fonts/tfm/arphic/argbsung; ttf2tfm ${TEXMFMAIN}/fonts/truetype/arphic/argb_sung -P 3 -E 1 argbsung@${TEXMFMAIN}/ttf2pk/UGB@)
 
-# Update ${TEXMF} tree
+# Update ls-R
 texconfig rehash
 
 # Messages to the user
-echo "----------------------------------------------------------------------"
-echo "CJK is now installed. Here are final notes for BIG5 users:"
-echo
-echo "Use 'bg5latex' instead of 'latex'. You may run 'bg5latex Big5.tex'"
-echo "to check its output. CJK.doc & commands.doc are good starting"
-echo "points."
-echo
-echo "FYI, moe_kai.ttf has some characters lost. These includes:"
-echo "   0xb9a6 0xbcb5 0xd974 0xdb57 0xdd7c 0xe0b5 0xe2e9 0xe351"
-echo "   0xe3c4 0xe5bf 0xe5c1 0xe7ec 0xec52 0xf374 0xf6dd"
+echo "-------------------------------------------------------------------------"
+echo "CJK is now installed. You may use bg5latex or gbklatex wrt"
+echo "BIG5 or GB encodings."
 echo
-echo "Numerous characters are not available in moe_lishu.ttf. It's"
-echo "included only for reference."
-echo
-echo "But moe_sung.ttf has these all. :)"
-echo
-echo "Thanks to Clem Chuang <b5506056@csie.ntu.edu.tw> for this info."
+echo If you want to install other TTF fonts, you have to manually edit:
+echo  ${TEXMFMAIN}/fontname/special.map
+echo  ${TEXMFMAIN}/ttf2pk/ttfonts.map
+echo  ${TEXMFMAIN}/web2c/texmf.cnf
+echo  ${TEXMFMAIN}/tex/latex/CJK/Bg5/c00kai.fd and
+echo   ${TEXMFMAIN}/tex/latex/CJK/GB/c10kai.fd, for Kai family fonts.
+echo  ${TEXMFMAIN}/tex/latex/CJK/Bg5/c00song.fd and
+echo   ${TEXMFMAIN}/tex/latex/CJK/GB/c10song.fd, for Sung family fonts.
+echo Then use ttf2tfm to generate corresponding tfm fonts.
 echo
 echo "Happy CJKing!"
-echo "----------------------------------------------------------------------"
+echo "-------------------------------------------------------------------------"
diff --git a/chinese/CJK/scripts/pre-build b/chinese/CJK/scripts/pre-build
index 65fe313c8035..332e03c0b34f 100644
--- a/chinese/CJK/scripts/pre-build
+++ b/chinese/CJK/scripts/pre-build
@@ -1,15 +1,19 @@
 #!/bin/sh
 PATH=/bin:/usr/bin; export PATH
-#
-# Check to see if we have teTeX-0.9 installed, just grep ttf2pk
-# in mktexpk. Not a preferred method, but it seems there is no
+
+# Check if teTeX is installed.
+if [ ! -f ${PREFIX}/share/texmf/doc/tetex/README ]; then
+  echo "-----------------------------------------"
+  echo "teTeX is not installed!"
+  echo "It's recommended to use CJK upon teTeX!"
+  echo "-----------------------------------------"
+  exit 1
+# Juse grep for 1.0 is not a preferred method, but it seems there is no
 # other way solving this.
-#
-if [ -z "`head -1 ${PREFIX}/share/texmf/doc/tetex/README |grep 1\.0`" ]
-then
-	echo "-------------------------------------------" 
-	echo " You do not have teTeX-1.0 installed!"
-	echo " CJK 4.3.0 needs that to function properly."
-	echo "-------------------------------------------"
-	exit 1
+elif [ -z "`head -1 ${PREFIX}/share/texmf/doc/tetex/README |grep 1\.0`" ]; then
+  echo "-------------------------------------------" 
+  echo " You do not have teTeX-1.0 installed!"
+  echo " CJK 4.3.0 needs it to function properly."
+  echo "-------------------------------------------"
+  exit 1
 fi