10 files changed, 624 insertions, 311 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index 92bfe5504c57..c4bb9b99507c 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -1,54 +1,50 @@
 # New ports collection makefile for:	zh-CJK
-# Version required:	4.1.3
-# Date created:		17 June 1998
-# Whom:			J.T. Jang (keith@email.gcn.net.tw)
+# Version required:	4.2.0
+# Date created:		1 March 1999
+# Whom:			J.T. Jang (jtjang@gcn.net.tw)
 #
-# $Id: Makefile,v 1.3 1998/10/15 21:25:10 jseger Exp $
+# $Id$
 #
 
-DISTNAME=	CJK-4.1.3.src
-PKGNAME=	zh-CJK-4.1.3
+DISTNAME=	zh-CJK-4.2.0
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://ftp.edu.tw/Chinese/ifcss/software/tex/ \
-		ftp://ntcuccca.edu.tw/Chinese/ifcss/software/tex/ \
-		ftp://ftp.ifcss.org/pub/software/tex/
+# Only the first three sites in MASTER_SITE_TEX_CTAN support compressing
+# on-the-fly. Then try my homepage. Go to CTAN if all fails.
+MASTER_SITES=	ftp://ftp.funet.fi/pub/TeX/CTAN/language/chinese/ \
+		ftp://ftp.tex.ac.uk/tex-archive/language/chinese/ \
+		ftp://ftp.dante.de/tex-archive/language/chinese/ \
+		http://member.gcn.net.tw/jtjang/ \
+		ftp://ftp.ctan.org/tex-archive/language/chinese/
+MASTER_SITE_SUBDIR=	language/chinese
+DISTFILES=	CJK.tar.gz
 
-MAINTAINER=	keith@email.gcn.net.tw
+MAINTAINER=	jtjang@gcn.net.tw
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-beta
+LIB_DEPENDS=	ttf.3:${PORTSDIR}/print/freetype
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-beta
+
+IGNOREFILES=	CJK.tar.gz
+NO_PACKAGE=	Interactive
 
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/CJK
-
-.if defined $(USE_NTUTTF)
-MASTER_SITES+=	ftp://ftp.edu.tw/Chinese/ifcss/software/fonts/big5/ms-win/ \
-		ftp://ntcuccca.edu.tw/Chinese/ifcss/software/fonts/big5/ms-win/ \
-		ftp://ftp.ifcss.org/pub/software/software/fonts/big5/ms-win/
-DISTFILES+=	ntu_kai.a01 ntu_kai.a02 ntu_kai.a03 ntu_kai.arj
-BUILD_DEPENDS+=	unarj:${PORTSDIR}/archivers/unarj
-EXTRACT_ONLY=	CJK-4.1.3.src.tar.gz
+WRKSRC=		${WRKDIR}/CJK/4_2.0
+
+.if !defined $(NOTTF)
+MASTER_SITES+=	ftp://linux.cis.nctu.edu.tw/packages/chinese/fonts/twmoefont/ttf/ \
+		ftp://axp350.ncu.edu.tw/OS/Linux/Chinese/fonts/twmoefont/ttf/ \
+		ftp://ftp.nsysu.edu.tw/Linux/packages/chinese/fonts/twmoefont/ttf/
+DISTFILES+=	moe_kai.ttf moe_sung.ttf
+EXTRACT_ONLY=	CJK.tar.gz
 .endif
 
-pre-fetch:
-	@echo
-	@echo You can use \"$(MAKE) USE_NTUTTF=YES\" to install
-	@echo NTU truetype fonts, aka. ntu_kai.ttf as default.
-	@echo
-
-pre-install:
-	@echo
-	@echo You can use \"$(MAKE) test-teTeX-patch\" to test whether
-	@echo this patch actually applies cleanly on your teTeX system.
-	@echo "(It doesn't modify any existing files.)"
-	@echo
-
 post-install:
-	@${SETENV} PREFIX=${PREFIX} ${SH} ${FILESDIR}/install-note
-
-test-teTeX-patch: patch
-	(cd $(WRKSRC); $(GMAKE) test-teTeX-patch)
+.if !defined(NOPORTDOCS)
+	${CP} -R ${WRKSRC}/doc ${PREFIX}/share/doc/CJK
+	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
+.endif
 
-MAN1=		hbf2gf.1 bg5conv.1 ttf2pk.1
+MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 hbf2gf.1 \
+		sjisconv.1 thaiconv.1 ttf2pk.1 ttf2tfm.1
 
 .include <bsd.port.mk>
diff --git a/chinese/CJK/distinfo b/chinese/CJK/distinfo
index d9a14623130d..13c89f40273a 100644
--- a/chinese/CJK/distinfo
+++ b/chinese/CJK/distinfo
@@ -1,5 +1,3 @@
-MD5 (CJK-4.1.3.src.tar.gz) = 871a0d607695861a4084a5d8a5cfc6df
-MD5 (ntu_kai.a01) = b0ece97e82328676a4475c8a55594274
-MD5 (ntu_kai.a02) = c9291b4059acc8f7f1576713986b6e93
-MD5 (ntu_kai.a03) = e08f8f0280297076e7a709c9deb4e474
-MD5 (ntu_kai.arj) = 51ca9f0a4e7a650f207cefa029497b13
+MD5 (CJK.tar.gz) = IGNORE
+MD5 (moe_kai.ttf) = bcbd6cf83b87153f9a725243afe210c7
+MD5 (moe_sung.ttf) = 6bf81e29d64db09d94bb1f03c041d9b2
diff --git a/chinese/CJK/files/patch-aa b/chinese/CJK/files/patch-aa
index 15c9c627b56b..b30624ddd5f4 100644
--- a/chinese/CJK/files/patch-aa
+++ b/chinese/CJK/files/patch-aa
@@ -1,21 +1,26 @@
---- Makefile.orig	Fri Oct  2 17:33:23 1998
-+++ Makefile	Fri Oct  2 17:33:23 1998
-@@ -0,0 +1,18 @@
+--- Makefile.orig	Thu Jan  1 08:00:00 1970
++++ Makefile	Sat Feb 20 08:10:54 1999
+@@ -0,0 +1,23 @@
 +#
 +# Makefile for CJK to apply on Unix systems more smoothly.
 +#
-+# keith@email.gcn.net.tw
-+#
++
++CP = /bin/cp
++CHOWN = /usr/sbin/chown
++
++LATEX_DIR = $(PREFIX)/share/texmf/tex/latex
++CJK_DIR = $(LATEX_DIR)/CJK
 +
 +all:
-+	$(MAKE) -C 4_1.3 $@
++	$(MAKE) -C utils $@
 +
-+install: all
-+	$(MAKE) -C 4_1.3 $@
++install: install-texinput
++	$(MAKE) -C utils $@
 +
-+test-teTeX-patch:
-+	$(MAKE) -C 4_1.3 test-teTeX-patch
++install-texinput:
++	(mkdir -p $(CJK_DIR)); && \
++	($(CP) -R texinput/* $(CJK_DIR)); && \
++	($(CHOWN) -R $(SHAREOWN).$(SHAREGRP) $(CJK_DIR))
 +
 +clean:
-+	$(MAKE) -C 4_1.3 $@
-+
++	$(MAKE) -C utils $@
diff --git a/chinese/CJK/files/patch-ab b/chinese/CJK/files/patch-ab
index 2ce7e350a391..5c54fe292f79 100644
--- a/chinese/CJK/files/patch-ab
+++ b/chinese/CJK/files/patch-ab
@@ -1,43 +1,17 @@
---- 4_1.3/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,40 @@
-+#
-+# Makefile for CJK to apply on Unix systems more smoothly.
-+#
-+# keith@email.gcn.net.tw
-+#
+--- 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
 +
-+CP = /bin/cp
-+CHOWN = /usr/sbin/chown
++build: bg5conv
 +
-+LATEX_DIR = $(PREFIX)/share/texmf/tex/latex
-+CJK_DIR = $(LATEX_DIR)/CJK
++all: build
 +
-+all:
-+	$(MAKE) -C contrib $@
-+	$(MAKE) -C utils $@
-+
-+install: install-texinput install-teTeX-patch
-+	$(MAKE) -C contrib $@
-+	$(MAKE) -C doc $@
-+	$(MAKE) -C examples $@
-+	$(MAKE) -C utils $@
-+
-+install-texinput:
-+	(mkdir -p $(CJK_DIR)); && \
-+	($(CP) -R texinput/* $(CJK_DIR)); && \
-+	($(CHOWN) -R $(SHAREOWN).$(SHAREGRP) $(CJK_DIR));
-+
-+install-teTeX-patch:
-+	$(MAKE) -C doc/teTeX patch
-+
-+test-teTeX-patch:
-+	$(MAKE) -C doc/teTeX test-patch
-+
-+uninstall-teTeX-patch:
-+	$(MAKE) -C doc/teTeX uninstall-patch
++install: all
++	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
++	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
 +
 +clean:
-+	$(MAKE) -C contrib $@
-+	$(MAKE) -C utils $@
-+
++	$(RM) bg5conv
diff --git a/chinese/CJK/files/patch-ac b/chinese/CJK/files/patch-ac
index 6055bfbd5b63..c8d471a2b061 100644
--- a/chinese/CJK/files/patch-ac
+++ b/chinese/CJK/files/patch-ac
@@ -1,12 +1,23 @@
---- 4_1.3/contrib/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/contrib/Makefile	Fri Oct  2 18:25:46 1998
-@@ -0,0 +1,9 @@
-+#
-+# This directory contains some DOS and NTU fonts specific utils, so
-+# I don't plan to compilethem, for now.
-+#
-+
-+all:
-+install:
-+clean:
+--- 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 @@
++cef5conv:
++	$(CC) $(CFLAGS) -o $@ cef5conv.c
++
++cefconv:
++	$(CC) $(CFLAGS) -o $@ cefconv.c
++
++cefsconv:
++	$(CC) $(CFLAGS) -o $@ cefsconv.c
++
++build: cef5conv cefconv cefsconv
 +
++all: build
++
++install: all
++	$(INSTALL_PROGRAM) *conv $(PREFIX)/bin
++	$(INSTALL_SCRIPT) *latex $(PREFIX)/bin
++	$(INSTALL_MAN) *.1 $(PREFIX)/man/man1
++
++clean:
++	$(RM) *conv
diff --git a/chinese/CJK/pkg-comment b/chinese/CJK/pkg-comment
index 8aa60b19dd6c..47c2decf8c6b 100644
--- a/chinese/CJK/pkg-comment
+++ b/chinese/CJK/pkg-comment
@@ -1 +1 @@
-A Chinese support package to LaTeX2e/teTeX.
+A LaTeX2e macro package which enables the use of CJK scripts.
diff --git a/chinese/CJK/pkg-descr b/chinese/CJK/pkg-descr
index 69a60c37837e..ceeee3fdcea9 100644
--- a/chinese/CJK/pkg-descr
+++ b/chinese/CJK/pkg-descr
@@ -1,9 +1,10 @@
-Welcome to the CJK version 4.1.3 (20-Jun-1997), a LaTeX2e macro package
+Welcome to the CJK version 4.2.0 (13-Dec-1998), a LaTeX2e macro package
 which enables the use of CJK scripts (Chinese/Japanese/Korean) in various
 encodings.
 
 =====
-This port only adds Chinese support. To support other Asian languages, see
-CJK documents for details.
+This port installs full Chinese BIG5 support, including TTF fonts. For
+other Asian languages, you have to supply those TTF fonts, then manually
+modify relative settings.
 
-J.T. Jang <keith@email.gcn.net.tw>
+J.T. Jang <jtjang@gcn.net.tw>
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index 0d36ef30f8e6..0176989b47fa 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -1,56 +1,334 @@
-@cwd /usr/local
-@exec echo "Backup %D/bin/MakeXXX and config files to *.orig."
-@exec cp -i %D/bin/MakeTeXPK %D/bin/MakeTeXPK.orig
-@exec cp -i %D/bin/MakeTeXTFM %D/bin/MakeTeXTFM.orig
-@exec cp -i %D/bin/MakeTeXnames %D/bin/MakeTeXnames.orig
-@exec cp -i %D/share/texmf/fontname/special.map %D/share/texmf/fontname/special.map.orig
-@exec cp -i %D/share/texmf/web2c/texmf.cnf %D/share/texmf/web2c/texmf.cnf.orig
-bin/MakeTeXPK
-bin/MakeTeXTFM
-bin/MakeTTFPK
-bin/MakeTeXnames
 bin/bg5conv
 bin/bg5latex
+bin/cef5conv
+bin/cef5latex
+bin/cefconv
+bin/ceflatex
+bin/cefsconv
+bin/cefslatex
 bin/hbf2gf
+bin/sjisconv
+bin/sjislatex
+bin/thaiconv
 bin/ttf2pk
-share/examples/CJK/00Contents
+bin/ttf2tfm
+share/doc/CJK/CEF.doc
+share/doc/CJK/CJK.doc
+share/doc/CJK/COPYING
+share/doc/CJK/INSTALL
+share/doc/CJK/TDS.doc
+share/doc/CJK/chinese/README
+share/doc/CJK/chinese/READMEb5.tex
+share/doc/CJK/chinese/READMEgb.tex
+share/doc/CJK/chinese/emTeXb5.doc
+share/doc/CJK/chinese/teTeXb5.doc
+share/doc/CJK/cjk-enc.doc
+share/doc/CJK/commands.doc
+share/doc/CJK/dvidrv.doc
+share/doc/CJK/fonts.doc
+share/doc/CJK/hbf2gf.doc
+share/doc/CJK/history.2_5
+share/doc/CJK/history.txt
+share/doc/CJK/japanese/README
+share/doc/CJK/japanese/ascii.doc
+share/doc/CJK/japanese/japanese.doc
+share/doc/CJK/japanese/japanese.jis
+share/doc/CJK/japanese/jp-fonts.doc
+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/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/mule-2.3/cjk-enc.el
 share/examples/CJK/Big5.tex
 share/examples/CJK/Big5vert.tex
 share/examples/CJK/CEF_test.tex
 share/examples/CJK/GB.tex
 share/examples/CJK/JIS.tex
 share/examples/CJK/KS.tex
-share/examples/CJK/Makefile
-share/examples/CJK/Makefile.orig
+share/examples/CJK/SJIS.tex
 share/examples/CJK/UTF8.tex
 share/examples/CJK/muletest.tex
 share/examples/CJK/py_test.tex
 share/examples/CJK/rubytest.tex
-share/doc/CJK/chinese/00Contents
-share/doc/CJK/chinese/NTeXb5.doc
-share/texmf/fontname/special.map
-share/texmf/web2c/texmf.cnf
-share/texmf/tex/latex/CJK/thai/c90cmr.fd
-share/texmf/tex/latex/CJK/thai/thai.sty
-share/texmf/tex/latex/CJK/thai/00Contents
-share/texmf/tex/latex/CJK/SJIS/SJIS.bdg
-share/texmf/tex/latex/CJK/SJIS/SJIS.cap
-share/texmf/tex/latex/CJK/SJIS/SJIS.chr
-share/texmf/tex/latex/CJK/SJIS/SJIS.enc
-share/texmf/tex/latex/CJK/SJIS/c49song.fd
-share/texmf/tex/latex/CJK/SJIS/00Contents
-share/texmf/tex/latex/CJK/UTF8/UTF8.bdg
-share/texmf/tex/latex/CJK/UTF8/UTF8.chr
-share/texmf/tex/latex/CJK/UTF8/UTF8.enc
-share/texmf/tex/latex/CJK/UTF8/c70song.fd
-share/texmf/tex/latex/CJK/UTF8/00Contents
-share/texmf/tex/latex/CJK/mule/MULEenc.sty
-share/texmf/tex/latex/CJK/mule/00Contents
-share/texmf/tex/latex/CJK/KS/00Contents
-share/texmf/tex/latex/CJK/KS/HLaTeX.chr
+share/texmf/fonts/tfm/moe/moekai/moekai01.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai02.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai03.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai04.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai05.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai06.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai07.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai08.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai09.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai10.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai11.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai12.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai13.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai14.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai15.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai16.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai17.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai18.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai19.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai20.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai21.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai22.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai23.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai25.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai26.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai27.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai28.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai29.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai30.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai31.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai32.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai33.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai34.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai35.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai36.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai37.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai38.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai39.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai40.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai41.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai42.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai43.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai44.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai45.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai46.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai47.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai48.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai49.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai50.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai51.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai52.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai53.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai54.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai55.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai56.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai57.tfm
+share/texmf/fonts/tfm/moe/moekai/moekai58.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung01.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung02.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung03.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung04.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung05.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung06.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung07.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung08.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung09.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung10.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung11.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung12.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung13.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung14.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung15.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung16.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung17.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung18.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung19.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung20.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung21.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung22.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung23.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung25.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung26.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung27.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung28.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung29.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung30.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung31.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung32.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung33.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung34.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung35.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung36.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung37.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung38.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung39.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung40.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung41.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung42.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung43.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung44.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung45.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung46.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung47.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung48.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung49.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung50.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung51.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung52.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung53.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung54.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung55.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung56.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung57.tfm
+share/texmf/fonts/tfm/moe/moesung/moesung58.tfm
+share/texmf/fonts/truetype/moe/moe_kai.ttf
+share/texmf/fonts/truetype/moe/moe_sung.ttf
+share/texmf/hbf2gf/cfg/README
+share/texmf/hbf2gf/cfg/b5ka12.cfg
+share/texmf/hbf2gf/cfg/b5kr12.cfg
+share/texmf/hbf2gf/cfg/b5so12.cfg
+share/texmf/hbf2gf/cfg/c1so12.cfg
+share/texmf/hbf2gf/cfg/c2so12.cfg
+share/texmf/hbf2gf/cfg/c3so12.cfg
+share/texmf/hbf2gf/cfg/c4so12.cfg
+share/texmf/hbf2gf/cfg/c5so12.cfg
+share/texmf/hbf2gf/cfg/c6so12.cfg
+share/texmf/hbf2gf/cfg/c7so12.cfg
+share/texmf/hbf2gf/cfg/csso12.cfg
+share/texmf/hbf2gf/cfg/gsfs14.cfg
+share/texmf/hbf2gf/cfg/j2so12.cfg
+share/texmf/hbf2gf/cfg/jsso12.cfg
+share/texmf/hbf2gf/cfg/ksso17.cfg
+share/texmf/tex/latex/CJK/Bg5/Bg5.cap
+share/texmf/tex/latex/CJK/Bg5/Bg5.chr
+share/texmf/tex/latex/CJK/Bg5/Bg5.cpx
+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/c00song.fd
+share/texmf/tex/latex/CJK/Bg5/c00song.fd.orig
+share/texmf/tex/latex/CJK/Bg5/c01song.fd
+share/texmf/tex/latex/CJK/CEF/c31song.fd
+share/texmf/tex/latex/CJK/CEF/c32song.fd
+share/texmf/tex/latex/CJK/CEF/c33song.fd
+share/texmf/tex/latex/CJK/CEF/c34song.fd
+share/texmf/tex/latex/CJK/CEF/c35song.fd
+share/texmf/tex/latex/CJK/CEF/c36song.fd
+share/texmf/tex/latex/CJK/CEF/c37song.fd
+share/texmf/tex/latex/CJK/CEF/c80song.fd
+share/texmf/tex/latex/CJK/CEF/c81song.fd
+share/texmf/tex/latex/CJK/CJK.enc
+share/texmf/tex/latex/CJK/CJK.sty
+share/texmf/tex/latex/CJK/CJKnumb.sty
+share/texmf/tex/latex/CJK/CJKvert.sty
+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/c10song.fd
+share/texmf/tex/latex/CJK/GB/c11song.fd
+share/texmf/tex/latex/CJK/GB/c20song.fd
+share/texmf/tex/latex/CJK/GB/c21song.fd
+share/texmf/tex/latex/CJK/JIS/JIS.cap
+share/texmf/tex/latex/CJK/JIS/JIS.cpx
+share/texmf/tex/latex/CJK/JIS/JISdnp.enc
+share/texmf/tex/latex/CJK/JIS/c40song.fd
+share/texmf/tex/latex/CJK/JIS/c41song.fd
+share/texmf/tex/latex/CJK/JIS/c42song.fd
+share/texmf/tex/latex/CJK/JIS/c43song.fd
+share/texmf/tex/latex/CJK/JIS/c50song.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/HLaTeX.chr
+share/texmf/tex/latex/CJK/KS/HLaTeX/KSHL.enc
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63bm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63gr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63gs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63gt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63mg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63mgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63mj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63mmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63mnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63msr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pbm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pgr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pgs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pmsr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ppg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ppn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63psm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ptt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63pyt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63sm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63tt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63yt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64bm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64gr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64gs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64gt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64mg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64mgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64mj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64mmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64mnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64msr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pbm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pgr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pgs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pmsr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ppg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ppn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64psm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ptt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64pyt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64sm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64tt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64yt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65bm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65gr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65gs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65gt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65mg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65mgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65mj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65mmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65mnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65msr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pbm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pgr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pgs.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pmsr.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pol.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ppg.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ppn.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65psm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ptt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65pyt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65sm.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65tt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65yt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/pshan.sty
 share/texmf/tex/latex/CJK/KS/KS.chr
 share/texmf/tex/latex/CJK/KS/KS.enc
-share/texmf/tex/latex/CJK/KS/KSHL.enc
 share/texmf/tex/latex/CJK/KS/c60dr.fd
 share/texmf/tex/latex/CJK/KS/c60gr.fd
 share/texmf/tex/latex/CJK/KS/c60gs.fd
@@ -70,160 +348,62 @@ share/texmf/tex/latex/CJK/KS/c61hol.fd
 share/texmf/tex/latex/CJK/KS/c61hpg.fd
 share/texmf/tex/latex/CJK/KS/c61mj.fd
 share/texmf/tex/latex/CJK/KS/c62song.fd
-share/texmf/tex/latex/CJK/KS/c63gr.fd
-share/texmf/tex/latex/CJK/KS/c63gs.fd
-share/texmf/tex/latex/CJK/KS/c63gt.fd
-share/texmf/tex/latex/CJK/KS/c63mg.fd
-share/texmf/tex/latex/CJK/KS/c63mj.fd
-share/texmf/tex/latex/CJK/KS/c63ol.fd
-share/texmf/tex/latex/CJK/KS/c63pgr.fd
-share/texmf/tex/latex/CJK/KS/c63pgs.fd
-share/texmf/tex/latex/CJK/KS/c63pgt.fd
-share/texmf/tex/latex/CJK/KS/c63pmg.fd
-share/texmf/tex/latex/CJK/KS/c63pmj.fd
-share/texmf/tex/latex/CJK/KS/c63pol.fd
-share/texmf/tex/latex/CJK/KS/c63pyt.fd
-share/texmf/tex/latex/CJK/KS/c63yt.fd
-share/texmf/tex/latex/CJK/KS/c64gr.fd
-share/texmf/tex/latex/CJK/KS/c64gs.fd
-share/texmf/tex/latex/CJK/KS/c64gt.fd
-share/texmf/tex/latex/CJK/KS/c64mg.fd
-share/texmf/tex/latex/CJK/KS/c64mj.fd
-share/texmf/tex/latex/CJK/KS/c64ol.fd
-share/texmf/tex/latex/CJK/KS/c64pgr.fd
-share/texmf/tex/latex/CJK/KS/c64pgs.fd
-share/texmf/tex/latex/CJK/KS/c64pgt.fd
-share/texmf/tex/latex/CJK/KS/c64pmg.fd
-share/texmf/tex/latex/CJK/KS/c64pmj.fd
-share/texmf/tex/latex/CJK/KS/c64pol.fd
-share/texmf/tex/latex/CJK/KS/c64pyt.fd
-share/texmf/tex/latex/CJK/KS/c64yt.fd
-share/texmf/tex/latex/CJK/KS/c65gr.fd
-share/texmf/tex/latex/CJK/KS/c65gs.fd
-share/texmf/tex/latex/CJK/KS/c65gt.fd
-share/texmf/tex/latex/CJK/KS/c65mg.fd
-share/texmf/tex/latex/CJK/KS/c65mj.fd
-share/texmf/tex/latex/CJK/KS/c65ol.fd
-share/texmf/tex/latex/CJK/KS/c65pgr.fd
-share/texmf/tex/latex/CJK/KS/c65pgs.fd
-share/texmf/tex/latex/CJK/KS/c65pgt.fd
-share/texmf/tex/latex/CJK/KS/c65pmg.fd
-share/texmf/tex/latex/CJK/KS/c65pmj.fd
-share/texmf/tex/latex/CJK/KS/c65pol.fd
-share/texmf/tex/latex/CJK/KS/c65pyt.fd
-share/texmf/tex/latex/CJK/KS/c65yt.fd
-share/texmf/tex/latex/CJK/KS/c66gr.fd
-share/texmf/tex/latex/CJK/KS/c66gs.fd
-share/texmf/tex/latex/CJK/KS/c66gt.fd
-share/texmf/tex/latex/CJK/KS/c66mg.fd
-share/texmf/tex/latex/CJK/KS/c66mj.fd
-share/texmf/tex/latex/CJK/KS/c66ol.fd
-share/texmf/tex/latex/CJK/KS/c66pgr.fd
-share/texmf/tex/latex/CJK/KS/c66pgs.fd
-share/texmf/tex/latex/CJK/KS/c66pgt.fd
-share/texmf/tex/latex/CJK/KS/c66pmg.fd
-share/texmf/tex/latex/CJK/KS/c66pmj.fd
-share/texmf/tex/latex/CJK/KS/c66pol.fd
-share/texmf/tex/latex/CJK/KS/c66pyt.fd
-share/texmf/tex/latex/CJK/KS/c66yt.fd
 share/texmf/tex/latex/CJK/KS/hangul.cap
-share/texmf/tex/latex/CJK/KS/hanja.cap
-share/texmf/tex/latex/CJK/KS/pshan.sty
+share/texmf/tex/latex/CJK/KS/hangul.cpx
 share/texmf/tex/latex/CJK/KS/hangul2.cap
-share/texmf/tex/latex/CJK/CEF/00Contents
-share/texmf/tex/latex/CJK/CEF/c32song.fd
-share/texmf/tex/latex/CJK/CEF/c33song.fd
-share/texmf/tex/latex/CJK/CEF/c34song.fd
-share/texmf/tex/latex/CJK/CEF/c35song.fd
-share/texmf/tex/latex/CJK/CEF/c36song.fd
-share/texmf/tex/latex/CJK/CEF/c37song.fd
-share/texmf/tex/latex/CJK/CEF/c80song.fd
-share/texmf/tex/latex/CJK/CEF/c81song.fd
-share/texmf/tex/latex/CJK/CEF/c31song.fd
-share/texmf/tex/latex/CJK/GB/c11song.fd
-share/texmf/tex/latex/CJK/GB/GB.cap
-share/texmf/tex/latex/CJK/GB/c10song.fd
-share/texmf/tex/latex/CJK/GB/c10fs.fd
-share/texmf/tex/latex/CJK/GB/c20song.fd
-share/texmf/tex/latex/CJK/GB/c21song.fd
-share/texmf/tex/latex/CJK/GB/00Contents
-share/texmf/tex/latex/CJK/JIS/00Contents
-share/texmf/tex/latex/CJK/JIS/JISdnp.enc
-share/texmf/tex/latex/CJK/JIS/c40song.fd
-share/texmf/tex/latex/CJK/JIS/c41song.fd
-share/texmf/tex/latex/CJK/JIS/c42song.fd
-share/texmf/tex/latex/CJK/JIS/c43song.fd
-share/texmf/tex/latex/CJK/JIS/c50song.fd
-share/texmf/tex/latex/CJK/JIS/JIS.cap
-share/texmf/tex/latex/CJK/Bg5/c00kair.fd.orig
-share/texmf/tex/latex/CJK/Bg5/Bg5.chr
-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/c00kair.fd
-share/texmf/tex/latex/CJK/Bg5/c00song.fd
-share/texmf/tex/latex/CJK/Bg5/c01song.fd
-share/texmf/tex/latex/CJK/Bg5/00Contents
-share/texmf/tex/latex/CJK/Bg5/c00kai.fd.orig
-share/texmf/tex/latex/CJK/Bg5/Bg5.cap
-share/texmf/tex/latex/CJK/ruby.sty
-share/texmf/tex/latex/CJK/00Contents
-share/texmf/tex/latex/CJK/standard.chr
-share/texmf/tex/latex/CJK/standard.enc
-share/texmf/tex/latex/CJK/CJKvert.sty
-share/texmf/tex/latex/CJK/CJK.enc
-share/texmf/tex/latex/CJK/CJK.sty
-share/texmf/tex/latex/CJK/pmCsmall.enc
+share/texmf/tex/latex/CJK/KS/hangul2.cpx
+share/texmf/tex/latex/CJK/KS/hanja.cap
+share/texmf/tex/latex/CJK/KS/hanja.cpx
+share/texmf/tex/latex/CJK/SJIS/SJIS.bdg
+share/texmf/tex/latex/CJK/SJIS/SJIS.cap
+share/texmf/tex/latex/CJK/SJIS/SJIS.chr
+share/texmf/tex/latex/CJK/SJIS/SJIS.cpx
+share/texmf/tex/latex/CJK/SJIS/SJIS.enc
+share/texmf/tex/latex/CJK/SJIS/c49song.fd
+share/texmf/tex/latex/CJK/UTF8/UTF8.bdg
+share/texmf/tex/latex/CJK/UTF8/UTF8.chr
+share/texmf/tex/latex/CJK/UTF8/UTF8.enc
+share/texmf/tex/latex/CJK/UTF8/c70song.fd
+share/texmf/tex/latex/CJK/mule/MULEenc.sty
 share/texmf/tex/latex/CJK/pinyin.sty
 share/texmf/tex/latex/CJK/pmC.chr
 share/texmf/tex/latex/CJK/pmCbig.enc
+share/texmf/tex/latex/CJK/pmCsmall.enc
+share/texmf/tex/latex/CJK/ruby.sty
 share/texmf/tex/latex/CJK/standard.bdg
-share/texmf/ttf2pk/ttf2pk.cfg
-share/texmf/hbf2gf/b5ka12.cfg
-share/doc/CJK/chinese/README
-share/doc/CJK/chinese/READMEb5.tex
-share/doc/CJK/chinese/READMEgb.tex
-share/doc/CJK/chinese/emTeXb5.doc
-share/doc/CJK/cjk-enc.doc
-share/doc/CJK/CEF.doc
-share/doc/CJK/CJK.doc
-share/doc/CJK/COPYING
-share/doc/CJK/INSTALL
-share/doc/CJK/TDS.doc
-share/doc/CJK/commands.doc
-share/doc/CJK/compile.doc
-share/doc/CJK/fonts.doc
-share/doc/CJK/hbf2gf.doc
-share/doc/CJK/history.2_5
-share/doc/CJK/history.txt
-share/doc/CJK/pinyin.doc
-share/doc/CJK/ruby.doc
-share/doc/CJK/ttf2pk.doc
-share/doc/CJK/vertical.doc
-share/doc/CJK/00Contents
-share/doc/CJK/Makefile
-share/doc/CJK/Makefile.orig
-@dirrm share/texmf/tex/latex/CJK/thai
-@dirrm share/texmf/tex/latex/CJK/SJIS
-@dirrm share/texmf/tex/latex/CJK/UTF8
-@dirrm share/texmf/tex/latex/CJK/mule
-@dirrm share/texmf/tex/latex/CJK/KS
+share/texmf/tex/latex/CJK/standard.chr
+share/texmf/tex/latex/CJK/standard.enc
+share/texmf/tex/latex/CJK/thai/c90cmr.fd
+share/texmf/tex/latex/CJK/thai/thai.sty
+share/texmf/ttf2pk/Big5.sfd
+share/texmf/ttf2pk/ET5.enc
+share/texmf/ttf2pk/EUC.sfd
+share/texmf/ttf2pk/SJIS.sfd
+share/texmf/ttf2pk/T1-WGL4.enc
+share/texmf/ttf2pk/Unicode.sfd
+share/texmf/ttf2pk/VPS.rpl
+share/texmf/ttf2pk/ttfonts.map
+@dirrm share/doc/CJK/chinese
+@dirrm share/doc/CJK/japanese
+@dirrm share/doc/CJK
+@dirrm share/examples/CJK
+@dirrm share/texmf/fonts/tfm/moe/moekai
+@dirrm share/texmf/fonts/tfm/moe/moesung
+@dirrm share/texmf/fonts/tfm/moe
+@dirrm share/texmf/fonts/truetype/moe
+@dirrm share/texmf/fonts/truetype
+@dirrm share/texmf/hbf2gf/cfg
+@dirrm share/texmf/hbf2gf
+@dirrm share/texmf/tex/latex/CJK/Bg5
 @dirrm share/texmf/tex/latex/CJK/CEF
 @dirrm share/texmf/tex/latex/CJK/GB
 @dirrm share/texmf/tex/latex/CJK/JIS
-@dirrm share/texmf/tex/latex/CJK/Bg5
+@dirrm share/texmf/tex/latex/CJK/KS/HLaTeX
+@dirrm share/texmf/tex/latex/CJK/KS
+@dirrm share/texmf/tex/latex/CJK/SJIS
+@dirrm share/texmf/tex/latex/CJK/UTF8
+@dirrm share/texmf/tex/latex/CJK/mule
+@dirrm share/texmf/tex/latex/CJK/thai
 @dirrm share/texmf/tex/latex/CJK
-@dirrm share/texmf/hbf2gf
 @dirrm share/texmf/ttf2pk
-@dirrm share/examples/CJK
-@dirrm share/doc/CJK/chinese
-@dirrm share/doc/CJK
-@unexec echo "Restore %D/bin/MakeXXX & config files"
-@unexec mv %D/bin/MakeTeXPK.orig %D/bin/MakeTeXPK
-@unexec mv %D/bin/MakeTeXTFM.orig %D/bin/MakeTeXTFM
-@unexec mv %D/bin/MakeTeXnames.orig %D/bin/MakeTeXnames
-@unexec mv %D/share/texmf/fontname/special.map.orig %D/share/texmf/fontname/special.map
-@unexec mv %D/share/texmf/web2c/texmf.cnf.orig %D/share/texmf/web2c/texmf.cnf
-@unexec %D/bin/texconfig rehash
-@unexec %D/bin/texconfig hyphen
+@unexec rm -f %D/share/texmf/ttf2tfm
diff --git a/chinese/CJK/scripts/post-install b/chinese/CJK/scripts/post-install
index bbd2fc7fa498..c748a7ec2903 100644
--- a/chinese/CJK/scripts/post-install
+++ b/chinese/CJK/scripts/post-install
@@ -1,21 +1,149 @@
 #!/bin/sh
-PATH=/bin:/usr/bin
-
-TeX_FONT_PATH=${PREFIX}/share/texmf/fonts
-export TeX_FONT_PATH
-
-#
-# Creating Chinese TTF & HBF font directories
-#
-if [ ! -d ${TeX_FONT_PATH}/truetype/chinese ];
-then mkdir -p ${TeX_FONT_PATH}/truetype/chinese; fi
-if [ ! -d ${TeX_FONT_PATH}/hbf/chinese ];
-then mkdir -p ${TeX_FONT_PATH}/hbf/chinese; fi
-
-#
-# Install ntu_kai.ttf if USE_NTUTTF is defined.
-#
-if [ ${USE_NTUTTF} ]
+PATH=/bin:/usr/bin:/usr/local/bin
+
+# 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
+
+# Install ttf2pk binary in ${PORTSDIR}/print/freetype, data in ${TEXMF}/ttf2pk
+(cd ${PORTSDIR}/print/freetype/work/freetype-1.2/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 "->(Default: ${PREFIX}/share/texmf/fonts)"
+read VARTEXFONTS
+if [ -z ${VARTEXFONTS} ]
+then
+  VARTEXFONTS=${PREFIX}/share/texmf/fonts
+fi
+
+# Chmod 1777 pk/tfm font directory.
+if [ -z "${NOCHMOD}" ]
+then
+  chmod -R 1777 ${VARTEXFONTS}/tfm ${VARTEXFONTS}/pk
+fi
+
+# Install moe_* TTF fonts
+if [ ${NOTTF} ]
+then
+  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 ===
+else
+  mkdir -p ${PREFIX}/share/texmf/fonts/truetype/moe
+  install -c -o root -g wheel -m 644 ${DISTDIR}/moe_kai.ttf ${PREFIX}/share/texmf/fonts/truetype/moe
+  # moe_sung.ttf -> moe_song.ttf
+  install -c -o root -g wheel -m 644 ${DISTDIR}/moe_sung.ttf ${PREFIX}/share/texmf/fonts/truetype/moe/moe_sung.ttf
+
+  # fontname/special.map
+  if [ -n "`grep moekai ${PREFIX}/share/texmf/fontname/special.map`" ]
+  then
+    echo Seems moekai already in spcial.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
+  fi
+  if [ -n "`grep moesung ${PREFIX}/share/texmf/fontname/special.map`" ]
+  then
+    echo Seems moesung already in spcial.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
+  fi
+
+  # ttf2pk/ttfonts.map
+  if [ -n "`grep moekai ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+  then
+    echo Seems moekai already in ttfonts.map, file untouched.
+  else
+    echo "moekai@Big5.sfd@   moe_kai Pid=3 Eid=4" >> ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
+  fi
+  if [ -n "`grep moesung ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+  then
+    echo Seems moesung already in ttfonts.map, file untouched.
+  else
+    echo "moesung@Big5.sfd@   moe_sung Pid=3 Eid=4" >> ${PREFIX}/share/texmf/ttf2pk/ttfonts.map
+  fi
+
+  # web2c/texmf.cnf
+  if [ -n "`grep TTF2PKINPUTS ${PREFIX}/share/texmf/web2c/texmf.cnf`" ]
+  then
+    echo Seems TTF2PKINPUTS already set in texmf.cnf, 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/ttf2pk//" >> ${PREFIX}/share/texmf/web2c/texmf.cnf
+  fi
+
+  # tex/latex/CJK/Bg5/c00kai.fd
+  if [ -n "`grep moekai ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00kai.fd`" ]
+  then
+    echo Seems moekai already in c00kai.fd, 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;
+    )
+  fi
+
+  # tex/latex/CJK/Bg5/c00song.fd
+  if [ -n "`grep moesung ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00song.fd`" ]
+  then
+    echo Seems moesung already in c00song.fd, 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;
+    )
+  fi
+
+  # Generate tfm fonts for moekai/moesung.
+  texconfig rehash  # Update ls-R
+  mkdir -p ${VARTEXFONTS}/tfm/moe/moekai ${VARTEXFONTS}/tfm/moe/moesung
+  (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@)
+
+fi
+
+# Update ${TEXMF} tree
+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."
+if [ -z "${NOTTF}" ]
 then
-    install -o root -g wheel -m 644 ${WRKDIR}/ntu_kai.ttf ${TeX_FONT_PATH}/truetype/chinese
+echo
+echo "FYI, moe_kai.ttf has some characters loss. These includes:"
+echo "   0xb9a6 0xbcb5 0xd974 0xdb57 0xdd7c 0xe0b5 0xe2e9 0xe351"
+echo "   0xe3c4 0xe5bf 0xe5c1 0xe7ec 0xec52 0xf374 0xf6dd"
+echo "But moe_sung.ttf has these all."
+echo "Thanks to Clem Chuang <b5506056@csie.ntu.edu.tw> for this info."
 fi
+echo
+echo "Happy CJKing!"
+echo "----------------------------------------------------------------------"
diff --git a/chinese/CJK/scripts/pre-build b/chinese/CJK/scripts/pre-build
new file mode 100644
index 000000000000..583b5244c826
--- /dev/null
+++ b/chinese/CJK/scripts/pre-build
@@ -0,0 +1,20 @@
+#!/bin/sh
+echo "---------------------------------------------------------"
+echo "Define NOTTF if you do not want to install BIG5 MOE TTF,"
+echo "and NOCHMOD to disable chmod 1777 pk/tfm fonts directory."
+echo "---------------------------------------------------------"
+
+#
+# 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
+# other way solving this.
+#
+if [ -z "`grep ttf2pk ${PREFIX}/bin/mktexpk`" ]
+then
+	echo "------------------------------------" 
+	echo "You do not have teTeX-0.9 installed!"
+	echo "CJK needs that to function correctly."
+	echo "Press Ctrl-C to exit."
+	echo "------------------------------------"
+	read key
+fi