Update to CJK v4.3.0.

Submitted by:maintainer.

6 files changed, 174 insertions, 279 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index 5280d0bd3e7c..eb720b370640 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -1,42 +1,28 @@
 # New ports collection makefile for:	zh-CJK
-# Version required:	4.2.0
-# Date created:		1 March 1999
+# Version required:	4.3.0
+# Date created:		5 Sep 1999
 # Whom:			J.T. Jang (jtjang@gcn.net.tw)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	zh-CJK-4.2.0
+DISTNAME=	zh-CJK-4.3.0
 CATEGORIES=	chinese
-# 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/web/jtjang/ \
-		ftp://ftp.ctan.org/tex-archive/language/chinese/
-MASTER_SITE_SUBDIR=	language/chinese
-DISTFILES=	CJK.tar.gz
+MASTER_SITES=	ftp://ftp.ffii.org/pub/cjk/devel/
+DISTFILES=	cjk-current.tar.gz
 
 MAINTAINER=	jtjang@gcn.net.tw
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
+		${X11BASE}/lib/X11/fonts/TrueType/moe_lishu.ttf:${PORTSDIR}/chinese/moettf \
+		ttf2pk:${PORTSDIR}/print/freetype:build
 LIB_DEPENDS=	ttf.3:${PORTSDIR}/print/freetype
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
-IGNOREFILES=	CJK.tar.gz
 NO_PACKAGE=	Interactive
 
 USE_GMAKE=	yes
-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
+WRKSRC=		${WRKDIR}/cjk-current
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -44,7 +30,7 @@ post-install:
 	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
 .endif
 
-MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 hbf2gf.1 \
-		sjisconv.1 thaiconv.1 ttf2pk.1 ttf2tfm.1
+MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.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 13c89f40273a..511dcc0bf7d2 100644
--- a/chinese/CJK/distinfo
+++ b/chinese/CJK/distinfo
@@ -1,3 +1 @@
-MD5 (CJK.tar.gz) = IGNORE
-MD5 (moe_kai.ttf) = bcbd6cf83b87153f9a725243afe210c7
-MD5 (moe_sung.ttf) = 6bf81e29d64db09d94bb1f03c041d9b2
+MD5 (cjk-current.tar.gz) = b606e42a80a8bba733705e53c6102363
diff --git a/chinese/CJK/pkg-descr b/chinese/CJK/pkg-descr
index ceeee3fdcea9..41de8c309aea 100644
--- a/chinese/CJK/pkg-descr
+++ b/chinese/CJK/pkg-descr
@@ -1,5 +1,5 @@
-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
+Welcome to CJK version 4.3.0 (20-Jun-1999), a LaTeX2e macro package which
+enables the use of CJK scripts (Chinese/Japanese/Korean) in various
 encodings.
 
 =====
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index 0176989b47fa..60934fbe5251 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -1,4 +1,5 @@
 bin/bg5conv
+bin/bg5+latex
 bin/bg5latex
 bin/cef5conv
 bin/cef5latex
@@ -6,6 +7,8 @@ bin/cefconv
 bin/ceflatex
 bin/cefsconv
 bin/cefslatex
+bin/extconv
+bin/gbklatex
 bin/hbf2gf
 bin/sjisconv
 bin/sjislatex
@@ -48,6 +51,7 @@ 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/CJKbabel.tex
 share/examples/CJK/GB.tex
 share/examples/CJK/JIS.tex
 share/examples/CJK/KS.tex
@@ -56,138 +60,25 @@ share/examples/CJK/UTF8.tex
 share/examples/CJK/muletest.tex
 share/examples/CJK/py_test.tex
 share/examples/CJK/rubytest.tex
-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/fonts/truetype/moe/moe_lishu.ttf
+share/texmf/hbf2gf/README
+share/texmf/hbf2gf/b5ka12.cfg
+share/texmf/hbf2gf/b5kr12.cfg
+share/texmf/hbf2gf/b5so12.cfg
+share/texmf/hbf2gf/c1so12.cfg
+share/texmf/hbf2gf/c2so12.cfg
+share/texmf/hbf2gf/c3so12.cfg
+share/texmf/hbf2gf/c4so12.cfg
+share/texmf/hbf2gf/c5so12.cfg
+share/texmf/hbf2gf/c6so12.cfg
+share/texmf/hbf2gf/c7so12.cfg
+share/texmf/hbf2gf/csso12.cfg
+share/texmf/hbf2gf/gsfs14.cfg
+share/texmf/hbf2gf/j2so12.cfg
+share/texmf/hbf2gf/jsso12.cfg
+share/texmf/hbf2gf/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
@@ -197,29 +88,38 @@ 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/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/Bg5/c09song.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/CNS/EUC-TW.bdg
+share/texmf/tex/latex/CJK/CNS/EUC-TW.chr
+share/texmf/tex/latex/CJK/CNS/EUC-TW.enc
+share/texmf/tex/latex/CJK/CNS/c31song.fd
+share/texmf/tex/latex/CJK/CNS/c32song.fd
+share/texmf/tex/latex/CJK/CNS/c33song.fd
+share/texmf/tex/latex/CJK/CNS/c34song.fd
+share/texmf/tex/latex/CJK/CNS/c35song.fd
+share/texmf/tex/latex/CJK/CNS/c36song.fd
+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/c10song.fd
 share/texmf/tex/latex/CJK/GB/c11song.fd
+share/texmf/tex/latex/CJK/GB/c19song.fd
 share/texmf/tex/latex/CJK/GB/c20song.fd
 share/texmf/tex/latex/CJK/GB/c21song.fd
+share/texmf/tex/latex/CJK/JIS/EUC-JP.bdg
+share/texmf/tex/latex/CJK/JIS/EUC-JP.chr
+share/texmf/tex/latex/CJK/JIS/EUC-JP.enc
 share/texmf/tex/latex/CJK/JIS/JIS.cap
 share/texmf/tex/latex/CJK/JIS/JIS.cpx
 share/texmf/tex/latex/CJK/JIS/JISdnp.enc
@@ -364,6 +264,8 @@ 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/extended.chr
+share/texmf/tex/latex/CJK/extended.enc
 share/texmf/tex/latex/CJK/mule/MULEenc.sty
 share/texmf/tex/latex/CJK/pinyin.sty
 share/texmf/tex/latex/CJK/pmC.chr
@@ -387,15 +289,12 @@ share/texmf/ttf2pk/ttfonts.map
 @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/CNS
 @dirrm share/texmf/tex/latex/CJK/GB
 @dirrm share/texmf/tex/latex/CJK/JIS
 @dirrm share/texmf/tex/latex/CJK/KS/HLaTeX
diff --git a/chinese/CJK/scripts/post-install b/chinese/CJK/scripts/post-install
index c748a7ec2903..00544833c309 100644
--- a/chinese/CJK/scripts/post-install
+++ b/chinese/CJK/scripts/post-install
@@ -15,115 +15,130 @@ rm ${PREFIX}/bin/mktexpk.CJK
 
 # 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)"
+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=${PREFIX}/share/texmf/fonts
+  VARTEXFONTS=/var/tmp/texfonts
 fi
 
-# Chmod 1777 pk/tfm font directory.
+# teTeX no longer makes VARTEXFONTS.
+mkdir -p ${VARTEXFONTS}/pk
+mkdir -p ${VARTEXFONTS}/tfm
+
+# Chmod 1777 ${VARTEXFONTS}.
 if [ -z "${NOCHMOD}" ]
 then
-  chmod -R 1777 ${VARTEXFONTS}/tfm ${VARTEXFONTS}/pk
+  chmod -R 1777 ${VARTEXFONTS}
 fi
 
 # Install moe_* TTF fonts
-if [ ${NOTTF} ]
+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`" ]
 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 ===
+  echo Seems moekai already in special.map, file untouched.
 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
+  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 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
+fi
+if [ -n "`grep moelishu ${PREFIX}/share/texmf/fontname/special.map`" ]
+then
+  echo Seems moelishu 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
+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
+# 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
+if [ -n "`grep moelishu ${PREFIX}/share/texmf/ttf2pk/ttfonts.map`" ]
+then
+  echo Seems moelishu already in ttfonts.map, file untouched.
+else
+  echo "moelishu@Big5.sfd@   moe_lishu 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
+# 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/ttf2tfm//" >> ${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/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
+# 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@)
+rm ${PREFIX}/share/texmf/tex/latex/CJK/Bg5/c00lishu.fd.orig
 
-fi
+# 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@)
 
 # Update ${TEXMF} tree
 texconfig rehash
@@ -135,15 +150,17 @@ 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
 echo
-echo "FYI, moe_kai.ttf has some characters loss. These includes:"
+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 "But moe_sung.ttf has these all."
+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."
-fi
 echo
 echo "Happy CJKing!"
 echo "----------------------------------------------------------------------"
diff --git a/chinese/CJK/scripts/pre-build b/chinese/CJK/scripts/pre-build
index 583b5244c826..65fe313c8035 100644
--- a/chinese/CJK/scripts/pre-build
+++ b/chinese/CJK/scripts/pre-build
@@ -1,20 +1,15 @@
 #!/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 "---------------------------------------------------------"
-
+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
 # other way solving this.
 #
-if [ -z "`grep ttf2pk ${PREFIX}/bin/mktexpk`" ]
+if [ -z "`head -1 ${PREFIX}/share/texmf/doc/tetex/README |grep 1\.0`" ]
 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
+	echo "-------------------------------------------" 
+	echo " You do not have teTeX-1.0 installed!"
+	echo " CJK 4.3.0 needs that to function properly."
+	echo "-------------------------------------------"
+	exit 1
 fi