Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Mar 1999 06:01:09 +0800 (CST)
From:      jtjang@gcn.net.tw
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/10406: Upgrade chinese/CJK to 4.2.0
Message-ID:  <199903052201.GAA00971@phantom>

next in thread | raw e-mail | index | archive | help

>Number:         10406
>Category:       ports
>Synopsis:       Upgrade chinese/CJK to 4.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar  5 14:10:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Keith Jang
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
None
>Environment:

   FreeBSD 4.0-CURRENT #0: Fri Mar  5 00:18:43 CST 1999

>Description:

	Upgrade chinese/CJK to 4.2.0. This time all Chinese/Japanese/Korean
are supported. Because only some sites in MASTER_SITE_TEX_CTAN support
compressing on-the-fly, I explicitly list them in Makefile.

   Another change is ntu fonts are removed because of licensing problems.
Default BIG5 fonts is moe_*.ttf.

>How-To-Repeat:

   Just apply this diff file.

>Fix:
	
diff -urN CJK.orig/Makefile CJK/Makefile
--- CJK.orig/Makefile	Sat Mar  6 05:25:59 1999
+++ CJK/Makefile	Sat Mar  6 05:44:24 1999
@@ -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.4 1998/11/17 17:41:30 vanilla 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=	jtjang@gcn.net.tw
+
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-beta
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-beta \
+		/nonexistent:${PORTSDIR}/print/freetype:build
 
-MAINTAINER=	keith@email.gcn.net.tw
-
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+IGNOREFILES=	CJK.tar.gz
+NO_PACKAGE=	Interactive
 
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/CJK
+WRKSRC=		${WRKDIR}/CJK/4_2.0
 
-.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
+.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 -urN CJK.orig/files/install-note CJK/files/install-note
--- CJK.orig/files/install-note	Sat Mar  6 05:25:59 1999
+++ CJK/files/install-note	Thu Jan  1 08:00:00 1970
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-TeX_FONT_PATH="$PREFIX"/share/texmf/fonts
-export TeX_FONT_PATH
-
-cat <<EOT
--------------------------------------------------------------------------
-CJK has now added Chinese-Big5 capability to LaTeX2e. To add other Asian
-language support, see "$PREFIX/share/doc/CJK" for details.
-
-Something you should do:
-1. Run $PREFIX/bin/texconfig, rehash and hyphen required.
-2. Chmod 1777 $TEXMF/fonts/{pk,tfm}
-   and all subdirectories if you did not configure
-   font generation to use a temporary directory.
-3.If you want to add TTF or HBF fonts, put them in
-  "$TeX_FONT_PATH/truetype/chinese", or
-  "$TeX_FONT_PATH/hbf/chinese",
-  respectively. Then do some modification to the config files.
-
-For quick start, get TTF or HBF font specified in
-"$PREFIX/share/texmf/{hbf2gf,ttf2pk}" from ftp.ifcss.org,
-then check out "$PREFIX/share/doc/CJK/CJK.doc" for the usage.
-
-Happy CJKing!
--------------------------------------------------------------------------
-
-EOT
-
-exit 0
diff -urN CJK.orig/files/md5 CJK/files/md5
--- CJK.orig/files/md5	Sat Mar  6 05:25:59 1999
+++ CJK/files/md5	Sat Mar  6 05:38:21 1999
@@ -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 -urN CJK.orig/patches/patch-aa CJK/patches/patch-aa
--- CJK.orig/patches/patch-aa	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-aa	Sat Mar  6 05:38:21 1999
@@ -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 -urN CJK.orig/patches/patch-ab CJK/patches/patch-ab
--- CJK.orig/patches/patch-ab	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-ab	Sat Mar  6 05:38:21 1999
@@ -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
-+#
-+
-+CP = /bin/cp
-+CHOWN = /usr/sbin/chown
-+
-+LATEX_DIR = $(PREFIX)/share/texmf/tex/latex
-+CJK_DIR = $(LATEX_DIR)/CJK
-+
-+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
+--- 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:
-+	$(MAKE) -C contrib $@
-+	$(MAKE) -C utils $@
-+
++	$(RM) bg5conv
diff -urN CJK.orig/patches/patch-ac CJK/patches/patch-ac
--- CJK.orig/patches/patch-ac	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-ac	Sat Mar  6 05:38:21 1999
@@ -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.
-+#
+--- 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
 +
-+all:
-+install:
-+clean:
++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 -urN CJK.orig/patches/patch-ad CJK/patches/patch-ad
--- CJK.orig/patches/patch-ad	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-ad	Sat Mar  6 05:38:21 1999
@@ -1,666 +1,47 @@
---- 4_1.3/doc/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/doc/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,19 @@
-+INSTALL_DOC = /usr/bin/install -c -o root -g wheel -m 644
-+CJK_DOC_DIR = $(PREFIX)/share/doc/CJK
+--- utils/Makefile.orig	Thu Jan  1 08:00:00 1970
++++ utils/Makefile	Sat Feb 27 20:39:22 1999
+@@ -0,0 +1,44 @@
++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_MAN := $(INSTALL) -c -o root -g wheel -m 644
++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 thaiconv $@
++
++hbf2gf_install:
++	$(CHMOD) +x hbf2gf/mkinstalldirs
++	$(MAKE) -C hbf2gf install
++	$(CP) -R hbf2gf/cfg $(TEXMF_DIR)/hbf2gf
++
++install: hbf2gf_install
++	$(MAKE) -C Bg5conv $@
++	$(MAKE) -C CEFconv $@
++	$(MAKE) -C SJISconv $@
++	$(MAKE) -C lisp $@
++	$(MAKE) -C thaiconv $@
 +
-+#
-+# Nothing to be done for "all" "clean"
-+#
-+all:
 +clean:
-+
-+#
-+# Install the documents.
-+#
-+install: install-chinese-doc
-+	$(INSTALL_DOC) `find . -type f |sed -e "s/.[/]//" |sed -e "/[/]/d"` $(CJK_DOC_DIR)
-+
-+install-chinese-doc:
-+	(mkdir -p $(CJK_DOC_DIR)/chinese) && \
-+	($(INSTALL_DOC) chinese/* $(CJK_DOC_DIR)/chinese)
-+
---- 4_1.3/doc/teTeX/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/doc/teTeX/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,37 @@
-+PREFIX = /usr/local
-+
-+all: patch
-+
-+patch: MakeXXX-patch config-patch
-+
-+MakeXXX-patch:
-+	patch ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
-+	patch ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
-+	patch ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
-+
-+config-patch:
-+	patch ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
-+	patch ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
-+
-+uninstall-patch: uninstall-MakeXXX-patch uninstall-config-patch
-+
-+uninstall-MakeXXX-patch:
-+	patch -R ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
-+	patch -R ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
-+	patch -R ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
-+
-+uninstall-config-patch:
-+	patch -R ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
-+	patch -R ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
-+
-+test-patch: test-MakeXXX-patch test-config-patch
-+
-+test-MakeXXX-patch:
-+	patch -C ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
-+	patch -C ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
-+	patch -C ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
-+
-+test-config-patch:
-+	patch -C ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
-+	patch -C ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
-+
---- 4_1.3/doc/teTeX/MakeTeXPK.diff.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/doc/teTeX/MakeTeXPK.diff	Fri Oct  2 17:33:22 1998
-@@ -1,65 +1,98 @@
----- MakeTeXPK.orig	Fri Aug  2 20:39:02 1996
--+++ MakeTeXPK	Fri Nov 15 01:24:22 1996
--@@ -65,14 +65,44 @@
-- : ${MAKETEXDIR=$TEXMF/maketex}
-- export TEXMF MAKETEXDIR
-- 
--+: ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
--+: ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
--+export TTF2PKDIR HBF2GFDIR
--+
-- # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
-- # We have to figure out the name of the base font -- $NAME is probably
-- # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
-- pattern="^r?$NAME"'(0|8r)?([ 	]|$)' 
-- psline=`egrep "$pattern" $PSMAPFILE`
--+pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
--+ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
--+pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
--+hbfcfgfile=$HBF2GFDIR/$pattern.cfg
--+
-- if test -n "$psline"; then
--   cmd="gsftopk $NAME $DPI"
--   MODE=gsftopk
--+
--+# test for Chinese TTF. We check whether $NAME without the last two digits is
--+# in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
--+# $ttfline) expanded to MakeTTFPK.
--+
--+elif test -n "$ttfline"; then
--+  dottfline="ttfline=\"$ttfline\""
--+  eval "$dottfline"
--+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
--+  cmd="MakeTTFPK dummy $NAME.${DPI}pk $ff \"$ttfline\" $DPI"
--+  MODE=modeless
--+  psline=ttf2pk
--+
--+# test for CJK bitmap fonts. We check whether $NAME without the last two
--+# digits has a config file in $HBF2GFDIR.
--+
--+elif test -r $hbfcfgfile; then
--+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
--+  cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
--+  MODE=modeless
--+
-- else
--   # If an explicit mode is not supplied, try to guess. You can get a
--   # list of extant modes from ftp.cs.umb.edu:pub/tex/modes.mf.
--@@ -92,7 +122,7 @@
-- 
--   # Run Metafont. Always use plain Metafont, since reading cmbase.mf
--   # does not noticeably slow things down.
---  cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
--+  cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
-- fi
-- 
-- donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
--@@ -123,7 +153,7 @@
-- eval "$mdir"
-- 
-- echo "$progname: Running $cmd"
---$cmd </dev/null
--+eval "$cmd </dev/null"
-- ret=$?
-- if test -z "$psline"; then  
--   test -r $GFNAME ||
-+*** MakeTeXPK.teTeX	Fri Aug 22 05:45:35 1997
-+--- MakeTeXPK	Fri Jun 12 03:52:38 1998
-+***************
-+*** 80,93 ****
-+  : ${MAKETEXDIR=$TEXMF/maketex}
-+  export TEXMF MAKETEXDIR
-+  
-+  # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
-+  # We have to figure out the name of the base font -- $NAME is probably
-+  # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
-+! pattern="^r?$NAME"'(0|8r)?([ 	]|$)' 
-+  psline=`egrep "$pattern" $PSMAPFILE`
-+  if test -n "$psline"; then
-+    cmd="gsftopk $NAME $DPI"
-+    MODE=gsftopk
-+    # some installations have set up gs in such a way that creating files
-+    # is only allowed if the parameter -DNOSAFER is used:
-+    GS_OPTIONS=-DNOSAFER; export GS_OPTIONS
-+--- 80,124 ----
-+  : ${MAKETEXDIR=$TEXMF/maketex}
-+  export TEXMF MAKETEXDIR
-+  
-++ : ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
-++ : ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
-++ export TTF2PKDIR HBF2GFDIR
-++ 
-+  # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
-+  # We have to figure out the name of the base font -- $NAME is probably
-+  # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
-+! pattern="^r?$NAME"'(0|8r)?([  ]|$)' 
-+  psline=`egrep "$pattern" $PSMAPFILE`
-++ pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-++ ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
-++ pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-++ hbfcfgfile=$HBF2GFDIR/$pattern.cfg
-++ 
-+  if test -n "$psline"; then
-+    cmd="gsftopk $NAME $DPI"
-+    MODE=gsftopk
-++  
-++ # test for Chinese TTF. We check whether $NAME without the last two digits is
-++ # in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
-++ # $ttfline) expanded to MakeTTFPK.
-++ 
-++ elif test -n "$ttfline"; then
-++   dottfline="ttfline=\"$ttfline\""
-++ eval "$dottfline"
-++   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-++   cmd="MakeTTFPK dummy $NAME.${DPI}pk $ff \"$ttfline\" $DPI"
-++ 
-++   MODE=modeless
-++   psline=ttf2pk
-++ 
-++ # test for CJK bitmap fonts. We check whether $NAME without the last two
-++ # digits has a config file in $HBF2GFDIR.
-++ 
-++ elif test -r $hbfcfgfile; then
-++   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-++   cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
-++   MODE=modeless
-++ 
-+    # some installations have set up gs in such a way that creating files
-+    # is only allowed if the parameter -DNOSAFER is used:
-+    GS_OPTIONS=-DNOSAFER; export GS_OPTIONS
-+***************
-+*** 111,117 ****
-+  
-+    # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-+    # does not noticeably slow things down.
-+!   cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
-+  fi
-+  
-+  donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-+--- 142,148 ----
-+  
-+    # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-+    # does not noticeably slow things down.
-+!   cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
-+  fi
-+  
-+  donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-+***************
-+*** 142,148 ****
-+  eval "$mdir"
-+  
-+  echo "$progname: Running $cmd"
-+! $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
-+  if test -z "$psline"; then  
-+    test -r $GFNAME ||
-+      { test -r $NAME.`expr $DPI + 1`gf && DPI=`expr $DPI + 1` &&
-+--- 173,179 ----
-+  eval "$mdir"
-+  
-+  echo "$progname: Running $cmd"
-+! eval $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
-+  if test -z "$psline"; then  
-+    test -r $GFNAME ||
-+      { test -r $NAME.`expr $DPI + 1`gf && DPI=`expr $DPI + 1` &&
---- 4_1.3/doc/teTeX/MakeTeXTFM.diff.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/doc/teTeX/MakeTeXTFM.diff	Fri Oct  2 17:33:22 1998
-@@ -1,108 +1,137 @@
----- MakeTeXTFM.orig	Fri Aug  2 20:39:17 1996
--+++ MakeTeXTFM	Sun Nov 10 23:05:25 1996
--@@ -41,6 +41,10 @@
-- : ${MAKETEXDIR=$TEXMF/maketex}
-- export TEXMF MAKETEXDIR
-- 
--+: ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
--+: ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
--+export TTF2PKDIR HBF2GFDIR
--+
-- # Possible local customizations?
-- test -r $MAKETEXDIR/maketex.site && . $MAKETEXDIR/maketex.site
-- 
--@@ -48,7 +52,32 @@
-- BDPI=${MT_DEF_BDPI-600}
-- DPI=$BDPI
-- 
---cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
--+pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
--+ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
--+pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
--+hbfcfgfile=$HBF2GFDIR/$pattern.cfg
--+
--+# test for Chinese TTF. We check whether $NAME without the last two digits is
--+# in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
--+# $ttfline) expanded to MakeTTFPK.
--+
--+if test -n "$ttfline"; then
--+  dottfline="ttfline=\"$ttfline\""
--+  eval "$dottfline"
--+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
--+  cmd="MakeTTFPK $NAME.tfm dummy $ff \"$ttfline\" $DPI"
--+  MODE=ttf2pk
--+
--+# test for CJK bitmap fonts. We check whether $NAME without the last two
--+# digits has a config file in $HBF2GFDIR.
--+
--+elif test -r $hbfcfgfile; then
--+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
--+  cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
--+  MODE=hbf2gf
--+else
--+  cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
--+fi
-- 
-- set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-- PKDEST=$2
--@@ -56,6 +85,7 @@
-- PKDESTDIR=`echo $PKDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
-- TFMDESTDIR=`echo $TFMDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
-- PKNAME=`basename $PKDEST`
--+PLNAME=$NAME.pl
-- TFMNAME=$NAME.tfm
-- GFNAME=$NAME.$DPI'gf'
-- 
--@@ -76,7 +106,10 @@
--   { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
-- 
-- echo "$progname: Running $cmd"
---$cmd </dev/null
--+eval "$cmd </dev/null"
--+if test "$MODE" = "hbf2gf"; then
--+  pltotf ./$PLNAME $TFMNAME || exit 1
--+fi
-- test -f $TFMNAME ||
--   { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
-- 
--@@ -93,22 +126,25 @@
-- echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
-- append_db $TFMDESTDIR $TFMNAME
-- 
---MakeTeXmkdir "$PKDESTDIR"
---test -d "$PKDESTDIR" || exit 1
---if test ! -f $PKDESTDIR/$PKNAME; then
---  cd $TEMPDIR
---  test -r $GFNAME ||
---    { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
---  gftopk ./$GFNAME $PKNAME || exit 1
---  mv $PKNAME $PKDESTDIR/pktmp.$$
---  cd $PKDESTDIR
---  if test -f $PKNAME; then
---    rm -f pktmp.$$
---  else
--+# we don't install any .pk files produced ttf2pk or hbf2gf.
--+if test "$MODE" != "hbf2gf" && test "$MODE" != "ttf2pk"; then
--+  MakeTeXmkdir "$PKDESTDIR"
--+  test -d "$PKDESTDIR" || exit 1
--+  if test ! -f $PKDESTDIR/$PKNAME; then
--+    cd $TEMPDIR
--+    test -r $GFNAME ||
--+      { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
--+    gftopk ./$GFNAME $PKNAME || exit 1
--+    mv $PKNAME $PKDESTDIR/pktmp.$$
--     cd $PKDESTDIR
---    mv pktmp.$$ $PKNAME
---    chmod 644 $PKNAME
---    append_db $PKDESTDIR $PKNAME
--+    if test -f $PKNAME; then
--+      rm -f pktmp.$$
--+    else
--+      cd $PKDESTDIR
--+      mv pktmp.$$ $PKNAME
--+      chmod 644 $PKNAME
--+      append_db $PKDESTDIR $PKNAME
--+    fi
--   fi
-- fi
-- ) 1>&2 </dev/null
-+*** MakeTeXTFM.teTeX	Fri Aug 22 05:45:35 1997
-+--- MakeTeXTFM	Fri Jun 12 16:17:03 1998
-+***************
-+*** 41,46 ****
-+--- 41,50 ----
-+  : ${MAKETEXDIR=$TEXMF/maketex}
-+  export TEXMF MAKETEXDIR
-+  
-++ : ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
-++ : ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
-++ export TTF2PKDIR HBF2GFDIR
-++ 
-+  # Possible local customizations?
-+  test -r $MAKETEXDIR/maketex.site && . $MAKETEXDIR/maketex.site
-+  
-+***************
-+*** 48,54 ****
-+  BDPI=${MT_DEF_BDPI-600}
-+  DPI=$BDPI
-+  
-+! cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
-+  
-+  set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-+  PKDEST=$2
-+--- 52,83 ----
-+  BDPI=${MT_DEF_BDPI-600}
-+  DPI=$BDPI
-+  
-+! pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+! ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
-+! pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+! hbfcfgfile=$HBF2GFDIR/$pattern.cfg
-+! 
-+! # test for Chinese TTF. We check whether $NAME without the last two digits is
-+! # in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
-+! # $ttfline) expanded to MakeTTFPK.
-+! 
-+! if test -n "$ttfline"; then
-+!   dottfline="ttfline=\"$ttfline\""
-+!   eval "$dottfline"
-+!   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+!   cmd="MakeTTFPK $NAME.tfm dummy $ff \"$ttfline\" $DPI"
-+!   MODE=ttf2pk
-+! 
-+! # test for CJK bitmap fonts. We check whether $NAME without the last two
-+! # digits has a config file in $HBF2GFDIR.
-+! 
-+! elif test -r $hbfcfgfile; then
-+!   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+!   cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
-+!   MODE=hbf2gf
-+! else
-+!   cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
-+! fi
-+  
-+  set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-+  PKDEST=$2
-+***************
-+*** 56,61 ****
-+--- 85,91 ----
-+  PKDESTDIR=`echo $PKDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
-+  TFMDESTDIR=`echo $TFMDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
-+  PKNAME=`basename $PKDEST`
-++ PLNAME=$NAME.pl
-+  TFMNAME=$NAME.tfm
-+  GFNAME=$NAME.$DPI'gf'
-+  
-+***************
-+*** 76,82 ****
-+    { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
-+  
-+  echo "$progname: Running $cmd"
-+! $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
-+  test -f $TFMNAME ||
-+    { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
-+  
-+--- 106,115 ----
-+    { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
-+  
-+  echo "$progname: Running $cmd"
-+! eval $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
-+! if test "$MODE" = "hbf2gf"; then
-+!   pltotf ./$PLNAME $TFMNAME || exit 1
-+! fi
-+  test -f $TFMNAME ||
-+    { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
-+  
-+***************
-+*** 93,114 ****
-+  echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
-+  append_db $TFMDESTDIR $TFMNAME
-+  
-+! MakeTeXmkdir "$PKDESTDIR"
-+! test -d "$PKDESTDIR" || exit 1
-+! if test ! -f $PKDESTDIR/$PKNAME; then
-+!   cd $TEMPDIR
-+!   test -r $GFNAME ||
-+!     { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
-+!   gftopk ./$GFNAME $PKNAME || exit 1
-+!   mv $PKNAME $PKDESTDIR/pktmp.$$
-+!   cd $PKDESTDIR
-+!   if test -f $PKNAME; then
-+!     rm -f pktmp.$$
-+!   else
-+      cd $PKDESTDIR
-+!     mv pktmp.$$ $PKNAME
-+!     chmod 644 $PKNAME
-+!     append_db $PKDESTDIR $PKNAME
-+    fi
-+  fi
-+  ) 1>&2 </dev/null
-+--- 126,150 ----
-+  echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
-+  append_db $TFMDESTDIR $TFMNAME
-+  
-+! # we don't install any .pk files produced ttf2pk or hbf2gf.
-+! if test "$MODE" != "hbf2gf" && test "$MODE" != "ttf2pk"; then
-+!   MakeTeXmkdir "$PKDESTDIR"
-+!   test -d "$PKDESTDIR" || exit 1
-+!   if test ! -f $PKDESTDIR/$PKNAME; then
-+!     cd $TEMPDIR
-+!     test -r $GFNAME ||
-+!       { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
-+!     gftopk ./$GFNAME $PKNAME || exit 1
-+!     mv $PKNAME $PKDESTDIR/pktmp.$$
-+      cd $PKDESTDIR
-+!     if test -f $PKNAME; then
-+!       rm -f pktmp.$$
-+!     else
-+!       cd $PKDESTDIR
-+!       mv pktmp.$$ $PKNAME
-+!       chmod 644 $PKNAME
-+!       append_db $PKDESTDIR $PKNAME
-+!     fi
-+    fi
-+  fi
-+  ) 1>&2 </dev/null
---- 4_1.3/doc/teTeX/MakeTeXnames.diff.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/doc/teTeX/MakeTeXnames.diff	Fri Oct  2 17:33:22 1998
-@@ -1,12 +1,20 @@
----- MakeTeXnames.orig	Mon Aug 12 09:50:35 1996
--+++ MakeTeXnames	Mon Nov 11 07:26:00 1996
--@@ -53,8 +54,7 @@
-- if test -r $FONTNAME/special.map; then
--   set x `awk \
-- '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
---                 && substr (NAME, length (NAME), 1) ~ /[0-9]/ \
---                  && substr ($1, length ($1), 1) ~ /[^0-9]/)) \
--+  && substr (NAME, length ($1) + 1, length (NAME) - length ($1)) ~ /[0-9]/)) \
--  { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
--   shift
--   SUPPLIER=$1; TYPEFACE=$2
-+*** MakeTeXnames.teTeX	Fri Aug 22 05:45:35 1997
-+--- MakeTeXnames	Thu Jun 11 21:20:59 1998
-+***************
-+*** 53,60 ****
-+  if test -r $FONTNAME/special.map; then
-+    set x `awk \
-+  '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
-+!                  && substr (NAME, length (NAME), 1) ~ /[0-9]/ \
-+!                   && substr ($1, length ($1), 1) ~ /[^0-9]/)) \
-+   { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
-+    shift
-+    SUPPLIER=$1; TYPEFACE=$2
-+--- 53,59 ----
-+  if test -r $FONTNAME/special.map; then
-+    set x `awk \
-+  '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
-+!   && substr (NAME, length ($1) + 1, length (NAME) - length ($1)) ~ /[0-9]/)) \
-+   { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
-+    shift
-+    SUPPLIER=$1; TYPEFACE=$2
---- 4_1.3/doc/teTeX/special.map.diff.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/doc/teTeX/special.map.diff	Fri Oct  2 17:33:22 1998
-@@ -1,45 +1,52 @@
----- special.ori	Tue Jul 15 17:39:57 1997
--+++ special.map	Tue Jul 15 17:42:25 1997
--@@ -281,6 +281,7 @@
-- czssq		jknappen	sauter
-- czssqi		jknappen	sauter
-- dc		jknappen	dc
--+ec		jknappen	ec
-- fc		jknappen	fc
-- icm		jknappen	sauter
-- ilasy		jknappen	sauter
--@@ -294,3 +295,34 @@
-- tc		jknappen	tc
-- wasy		jknappen	sauter
-- stmary		jknappen	sauter
--+@c Vietnamese fonts in ET5 encoding
--+vm		wlemberg	vm
--+@c Russian LH fonts created with 0eccreat.tex
--+rx		lh		rx
--+@c CJK bitmap fonts in HBF format (to be handled by hbf2gf)
--+@c two running digits will be appended to the fontname
--+b5ka12		chinese		b5ka12
--+b5kr12		chinese		b5kr12
--+c1so12		chinese		c1so12
--+c2so12		chinese		c2so12
--+c3so12		chinese		c3so12
--+c4so12		chinese		c4so12
--+c5so12		chinese		c5so12
--+c6so12		chinese		c6so12
--+c7so12		chinese		c7so12
--+csso12		chinese		csso12
--+gsfs14		chinese		gsfs14
--+gsfr14		chinese		gsfr14
--+j2so12		japanese	j2so12
--+jssl12		japanese	jssl12
--+jsso12		japanese	jsso12
--+ksso17		korean		ksso17
--+@c CJK truetype fonts (to be handled by ttf2pk)
--+@c two running (hex) digits will be appended to the fontname
--+ntukai		chinese		ntukai
--+ntukar		chinese		ntukar
--+ntufsm		chinese		ntufsm
--+uwpstj		chinese		uwpstj
--+uwjmg3		japanese	uwjmg3
--+uwkmjf		korean		uwkmjf
--+cyberb		unicode		cyberb
-+*** special.map.teTeX	Thu Feb 27 08:22:16 1997
-+--- special.map	Thu Jun 11 09:51:32 1998
-+***************
-+*** 292,297 ****
-+--- 292,298 ----
-+  ec		jknappen	ec
-+  iec		jknappen	ec
-+  dc		jknappen	dc
-++ ec		jknappen	ec
-+  fc		jknappen	fc
-+  icm		jknappen	sauter
-+  ilasy		jknappen	sauter
-+***************
-+*** 305,310 ****
-+--- 306,342 ----
-+  tc		jknappen	tc
-+  wasy		jknappen	sauter
-+  stmary		jknappen	sauter
-++ @c Vietnamese fonts in ET5 encoding
-++ vm		wlemberg	vm
-++ @c Russian LH fonts created with 0eccreat.tex
-++ rx		lh		rx
-++ @c CJK bitmap fonts in HBF format (to be handled by hbf2gf)
-++ @c two running digits will be appended to the fontname
-++ b5ka12		chinese		b5ka12
-++ b5kr12		chinese		b5kr12
-++ c1so12		chinese		c1so12
-++ c2so12		chinese		c2so12
-++ c3so12		chinese		c3so12
-++ c4so12		chinese		c4so12
-++ c5so12		chinese		c5so12
-++ c6so12		chinese		c6so12
-++ c7so12		chinese		c7so12
-++ csso12		chinese		csso12
-++ gsfs14		chinese		gsfs14
-++ gsfr14		chinese		gsfr14
-++ j2so12		japanese	j2so12
-++ jssl12		japanese	jssl12
-++ jsso12		japanese	jsso12
-++ ksso17		korean		ksso17
-++ @c CJK truetype fonts (to be handled by ttf2pk)
-++ @c two running (hex) digits will be appended to the fontname
-++ ntukai		chinese		ntukai
-++ ntukar		chinese		ntukar
-++ ntufsm		chinese		ntufsm
-++ uwpstj		chinese		uwpstj
-++ uwjmg3		japanese	uwjmg3
-++ uwkmjf		korean		uwkmjf
-++ cyberb		unicode		cyberb
-+  zpsycm		adobe		mathptm
-+  zptmcm		adobe		mathptm
-+  zpzccm		adobe		mathptm
---- 4_1.3/doc/teTeX/texmf.cnf.diff.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/doc/teTeX/texmf.cnf.diff	Fri Oct  2 17:33:22 1998
-@@ -1,21 +1,31 @@
----- texmf.cnf.orig	Mon Aug 19 19:31:34 1996
--+++ texmf.cnf	Thu Nov  7 06:55:41 1996
--@@ -71,7 +71,7 @@
-- MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
-- VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
-- TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
---PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk}//:$KPSE_DOT
--+PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk,modeless}//:$KPSE_DOT
-- GFFONTS		= $KPSE_DOT
-- GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
-- BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
--@@ -79,6 +79,9 @@
-- TEXCONFIG	= $KPSE_DOT:~:$TEXMFS/{dvips//,web2c}
-- DVIPSHEADERS	= $KPSE_DOT:$TEXMFS/{dvips,fonts/type1}//
-- INDEXSTYLE	= $KPSE_DOT:$TEXMFS/makeindex//
--+
--+TTF2PKDIR	= $TEXMF/ttf2pk
--+HBF2GFDIR	= $TEXMF/hbf2gf
-- 
-- % The following line shows the compile-time default value. It does not
-- % make any sense to change it for run-time.
-+*** texmf.cnf.teTeX	Fri Aug 22 05:44:56 1997
-+--- texmf.cnf	Thu Jun 11 21:16:24 1998
-+***************
-+*** 71,77 ****
-+  MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
-+  VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
-+  TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
-+! PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk}//:$KPSE_DOT
-+  GFFONTS		= $KPSE_DOT
-+  GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
-+  BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
-+--- 71,77 ----
-+  MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
-+  VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
-+  TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
-+! PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk,modeless,ttf2pk}//:$KPSE_DOT
-+  GFFONTS		= $KPSE_DOT
-+  GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
-+  BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
-+***************
-+*** 79,84 ****
-+--- 79,87 ----
-+  TEXCONFIG	= $KPSE_DOT:~:$TEXMFS/{dvips//,web2c}
-+  DVIPSHEADERS	= $KPSE_DOT:$TEXMFS/{dvips,fonts/type1}//
-+  INDEXSTYLE	= $KPSE_DOT:$TEXMFS/makeindex//
-++ 
-++ TTF2PKDIR	= $TEXMF/ttf2pk
-++ HBF2GFDIR	= $TEXMF/hbf2gf
-+  
-+  % The following line shows the compile-time default value. It does not
-+  % make any sense to change it for run-time.
++	$(MAKE) -C Bg5conv $@
++	$(MAKE) -C CEFconv $@
++	$(MAKE) -C SJISconv $@
++	$(MAKE) -C hbf2gf distclean
++	$(MAKE) -C thaiconv $@
diff -urN CJK.orig/patches/patch-ae CJK/patches/patch-ae
--- CJK.orig/patches/patch-ae	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-ae	Sat Mar  6 05:38:21 1999
@@ -1,19 +1,17 @@
---- 4_1.3/examples/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/examples/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,16 @@
-+INSTALL_EX = /usr/bin/install -c -o root -g wheel -m 644
-+CJK_EX_DIR = $(PREFIX)/share/examples/CJK
+--- 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
 +
-+#
-+# Nothing to be done for "all" "clean"
-+#
-+all:
-+clean:
++build: sjisconv
++
++all: build
 +
-+#
-+# Install the documents.
-+#
-+install:
-+	@(mkdir -p $(CJK_EX_DIR)) && \
-+	($(INSTALL_EX) `ls .` $(CJK_EX_DIR))
++install: all
++	$(INSTALL_PROGRAM) sjisconv $(PREFIX)/bin
++	$(INSTALL_SCRIPT) sjislatex $(PREFIX)/bin
++	$(INSTALL_MAN) sjisconv.1 $(PREFIX)/man/man1
 +
++clean:
++	$(RM) sjisconv
diff -urN CJK.orig/patches/patch-af CJK/patches/patch-af
--- CJK.orig/patches/patch-af	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-af	Sat Mar  6 05:38:21 1999
@@ -1,51 +1,6 @@
---- 4_1.3/texinput/Bg5/c00kai.fd.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/texinput/Bg5/c00kai.fd	Fri Oct  2 17:33:22 1998
-@@ -4,6 +4,18 @@
- % created by Werner Lemberg <a7971428@unet.univie.ac.at>
- %
- % Version 4.1.3 (20-Jun-1997)
-+%
-+% Modified by 19 Sept 1995 by Stephen Simpson <simpson@math.psu.edu>
-+% We define a lot of font shapes for Big5 and implement them by means
-+% of the NTU fonts.  If you don't have all of the NTU fonts, you may
-+% make appropriate substitutions.
-+%
-+% The NTU TrueType fonts are available for anonymous FTP at
-+% ftp.ifcss.org, /pub/software/fonts/big5/ms-win/.  The TTF files are
-+% ntu_mr, ntu_br, ntu_mm, ntu_mb, ntu_kai, ntu_li_m, ntu_fs_m, and
-+% ntu_tw.  Note that ntu_li_m.ttf and ntu_fs_m.ttf contain only the
-+% more frequently used Chinese characters.  The ntu2cjk utility is used
-+% to generate TFM, AFM and PS files from TTF files.
- 
- \def\fileversion{4.1.3}
- \def\filedate{1997/06/20}
-@@ -11,12 +23,13 @@
- 
- 
- % traditional Chinese characters in Big 5 encoding scheme.
--
--% pixel font
-+ 
-+% font shape: kai
-+% ntukai.ttf is Kai3 Shu1 ("model book")
- 
- \DeclareFontFamily{C00}{kai}{}
- 
--\DeclareFontShape{C00}{kai}{m}{n}{<-> CJK * b5ka12}{}
--\DeclareFontShape{C00}{kai}{bx}{n}{<-> CJKb * b5ka12}{\CJKbold}
-+\DeclareFontShape{C00}{kai}{m}{n}{<-> CJK * ntukai}{}
-+\DeclareFontShape{C00}{kai}{bx}{n}{<-> CJKb * ntukai}{\CJKbold}
- 
- \endinput
---- 4_1.3/texinput/Bg5/c00kair.fd.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/texinput/Bg5/c00kair.fd	Fri Oct  2 17:33:22 1998
-@@ -16,7 +16,7 @@
- 
- \DeclareFontFamily{C00}{kair}{}
- 
--\DeclareFontShape{C00}{kair}{m}{n}{<-> CJK * b5kr12}{}
--\DeclareFontShape{C00}{kair}{bx}{n}{<-> CJKb * b5kr12}{\CJKbold}
-+\DeclareFontShape{C00}{kair}{m}{n}{<-> CJK * ntukar}{}
-+\DeclareFontShape{C00}{kair}{bx}{n}{<-> CJKb * ntukar}{\CJKbold}
- 
- \endinput
+--- 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)
diff -urN CJK.orig/patches/patch-ag CJK/patches/patch-ag
--- CJK.orig/patches/patch-ag	Sat Mar  6 05:25:59 1999
+++ CJK/patches/patch-ag	Sat Mar  6 05:38:21 1999
@@ -1,171 +1,17 @@
---- 4_1.3/utils/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/utils/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,16 @@
-+CJK_OS_TAG = OS=unix
+--- 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
 +
-+all:
-+	$(MAKE) -C Bg5conv $@ $(CJK_OS_TAG)
-+	$(MAKE) -C hbf2gf $@ $(CJK_OS_TAG)
-+	$(MAKE) -C ttf2pk/src $@ $(CJK_OS_TAG)
-+
-+install:
-+	$(MAKE) -C Bg5conv $@ $(CJK_OS_TAG)
-+	$(MAKE) -C hbf2gf $@ $(CJK_OS_TAG)
-+	$(MAKE) -C ttf2pk/src $@ $(CJK_OS_TAG)
-+
-+clean:
-+	$(MAKE) -C Bg5conv $@ $(CJK_OS_TAG)
-+	$(MAKE) -C hbf2gf $@ $(CJK_OS_TAG)
-+	$(MAKE) -C ttf2pk/src $@ $(CJK_OS_TAG)
---- 4_1.3/utils/Bg5conv/Makefile.orig	Fri Oct  2 17:33:22 1998
-+++ 4_1.3/utils/Bg5conv/Makefile	Fri Oct  2 17:33:22 1998
-@@ -0,0 +1,22 @@
-+INSTALL_MAN = /usr/bin/install -c -o root -g wheel -m 644
-+INSTALL_PROGRAM = /usr/bin/install -c -s -o bin -g bin -m 755
-+INSTALL_SCRIPT = /usr/bin/install -c -o bin -g bin -m 755
-+
-+CC = /usr/bin/cc
-+CFLAGS = -Wall -O3
-+
-+bg5conv:
-+	$(CC) $(CFLAGS) -o $@ bg5conv.c
-+
-+build: bg5conv
++build: thaiconv
 +
 +all: build
 +
 +install: all
-+	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
-+	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
-+	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
++	$(INSTALL_PROGRAM) thaiconv $(PREFIX)/bin
++	$(INSTALL_MAN) thaiconv.1 $(PREFIX)/man/man1
 +
 +clean:
-+	-$(RM) bg5conv
-+
---- 4_1.3/utils/hbf2gf/Makefile.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/utils/hbf2gf/Makefile	Fri Oct  2 17:33:22 1998
-@@ -2,6 +2,10 @@
- 
- # GNU Makefile for hbf2gf
- 
-+INSTALL_MAN = /usr/bin/install -c -o root -g wheel -m 644
-+INSTALL_DATA = $(INSTALL_MAN)
-+INSTALL_PROGRAM = /usr/bin/install -c -s -o bin -g bin -m 755
-+
- .PHONY: default all debug documentation clean \
-         do_all
- 
-@@ -82,6 +86,12 @@
-   all:
- 	$(MAKE) do_all CFLAGS=-s
- 
-+  install: all
-+	$(INSTALL_PROGRAM) hbf2gf $(PREFIX)/bin
-+	$(INSTALL_MAN) hbf2gf.1 $(PREFIX)/man/man1
-+	mkdir -p $(PREFIX)/share/texmf/hbf2gf
-+	$(INSTALL_DATA) cfg/b5ka12.cfg $(PREFIX)/share/texmf/hbf2gf
-+
-   debug:
- 	$(MAKE) do_all CFLAGS=-g
- 
-@@ -95,6 +105,7 @@
- 	-$(RM) *.idx
- 	-$(RM) *.log
- 	-$(RM) *.o
-+	-$(RM) hbf2gf
- 
- 
-   do_all: hbf2gf$(EXE)
---- 4_1.3/utils/ttf2pk/src/Makefile.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/utils/ttf2pk/src/Makefile	Fri Oct  2 17:33:22 1998
-@@ -2,6 +2,11 @@
- 
- # GNU Makefile for ttf2pk
- 
-+INSTALL_MAN = /usr/bin/install -c -o root -g wheel -m 644
-+INSTALL_DATA = $(INSTALL_MAN)
-+INSTALL_PROGRAM = /usr/bin/install -c -s -o bin -g bin -m 755
-+INSTALL_SCRIPT = /usr/bin/install -c -o bin -g bin -m 755
-+
- .PHONY: default all debug documentation clean depend \
-         do_all ttflib ttflib-doc
- 
-@@ -80,6 +85,13 @@
-   all:
- 	$(MAKE) do_all CFLAGS=-s
- 
-+  install: all
-+	$(INSTALL_SCRIPT) ../MakeTTFPK $(PREFIX)/bin
-+	$(INSTALL_PROGRAM) ttf2pk $(PREFIX)/bin
-+	$(INSTALL_MAN) ../ttf2pk.1 $(PREFIX)/man/man1
-+	mkdir -p $(PREFIX)/share/texmf/ttf2pk
-+	$(INSTALL_DATA) ../config/ttf2pk.cfg $(PREFIX)/share/texmf/ttf2pk
-+
-   debug:
- 	$(MAKE) do_all CFLAGS="-Wstrict-prototypes -g -DDEBUG"
- 
-@@ -88,7 +100,7 @@
- 
-   # remove the unnecessary files.
-   clean:
--	$(MAKE) -C ttflib clean
-+	$(MAKE) -C ttflib clean $(OSTAG)
- 	-$(RM) *$O
- 	-$(RM) *.cw
- 	-$(RM) *.hw
-@@ -97,26 +109,31 @@
- 	-$(RM) *.toc
- 	-$(RM) *.idx
- 	-$(RM) *.log
-+	-$(RM) ttf2pk
- 
-   # Dependencies.
-   depend:
--	$(MAKE) -C ttflib clean
-+	$(MAKE) -C ttflib clean $(OSTAG)
- 	gcc -E -M -I./ttflib *.c > dep.end
- 
- 
--  do_all: ttflib ttf2pk$(EXE)
-+  do_all: ttflib/ttflib.a ttf2pk$(EXE)
- 
--  ttflib:
--	$(MAKE) -C ttflib ttflib
-+  ttflib/ttflib.a:
-+	$(MAKE) -C ttflib all $(OSTAG)
- 
--  ttf2pk$(EXE): $(OBJ) ttflib/ttflib$(LIBO)
-+  ttf2pk$(EXE): $(OBJ) ttflib/ttflib.a
-     ifeq ($(OS),dos)
- 	$(CC) $(CFLAGS) -o $(basename $@) $^
- 	strip $(basename $@)
- 	coff2exe $(basename $@)
- 	-$(RM) $(basename $@)
-     else
--	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
-+        ifeq ($(PORTOBJFORMAT),elf)
-+		$(CC) $(CFLAGS) -o $@ $^ $(LIB)
-+        else
-+		$(CC) $(CFLAGS) -o $@ $^ $(LIB) ttflib/basic.o
-+        endif
-     endif
- 
-   ttflib-doc:
---- 4_1.3/utils/ttf2pk/src/ttflib/Makefile.orig	Fri Jun 20 11:13:00 1997
-+++ 4_1.3/utils/ttf2pk/src/ttflib/Makefile	Fri Oct  2 17:33:22 1998
-@@ -93,6 +93,7 @@
- 	-$(RM) *.toc
- 	-$(RM) *.idx
- 	-$(RM) *.log
-+	-$(RM) ttflib.a
- 
-   # Dependencies.
-   depend:
-@@ -109,7 +110,6 @@
- 
-   ttflib.tex: ttf2bmp.cw
- 	$(CWEAVE) +ai $< - $@
--	
- 
-   ifeq (dep.end,$(wildcard dep.end))
-     include dep.end
++	$(RM) thaiconv
Binary files CJK.orig/pkg/.tedfilepos and CJK/pkg/.tedfilepos differ
diff -urN CJK.orig/pkg/COMMENT CJK/pkg/COMMENT
--- CJK.orig/pkg/COMMENT	Sat Mar  6 05:25:59 1999
+++ CJK/pkg/COMMENT	Sat Mar  6 05:38:21 1999
@@ -1 +1 @@
-A Chinese support package to LaTeX2e/teTeX.
+A LaTeX2e macro package which enables the use of CJK scripts.
diff -urN CJK.orig/pkg/DESCR CJK/pkg/DESCR
--- CJK.orig/pkg/DESCR	Sat Mar  6 05:25:59 1999
+++ CJK/pkg/DESCR	Sat Mar  6 05:38:21 1999
@@ -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 -urN CJK.orig/pkg/PLIST CJK/pkg/PLIST
--- CJK.orig/pkg/PLIST	Sat Mar  6 05:25:59 1999
+++ CJK/pkg/PLIST	Sat Mar  6 05:38:21 1999
@@ -1,56 +1,335 @@
 @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/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
+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 +349,62 @@
 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/tex/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 -urN CJK.orig/scripts/post-extract CJK/scripts/post-extract
--- CJK.orig/scripts/post-extract	Sat Mar  6 05:25:59 1999
+++ CJK/scripts/post-extract	Thu Jan  1 08:00:00 1970
@@ -1,31 +0,0 @@
-#!/bin/sh
-PATH=/bin:${PREFIX}/bin
-export PATH
-
-#
-# The original CJK directory has set-group-ID bit set (don't know why).
-# Now clear that.
-#
-chmod -R g-s ${WRKSRC}
-
-#
-# Extract ntu_kai.ttf if USE_NTUTTF is defined.
-#
-if [ ${USE_NTUTTF} ]
-then
-    cp ${DISTDIR}/ntu_kai.a?? ${WRKDIR}
-    cd ${WRKDIR}
-    unarj x ntu_kai.arj
-    cat ntu_kai.ttf >> ntu_kai.tmp
-    rm ntu_kai.ttf
-    unarj x ntu_kai.a01
-    cat ntu_kai.ttf >> ntu_kai.tmp
-    rm ntu_kai.ttf
-    unarj x ntu_kai.a02
-    cat ntu_kai.ttf >> ntu_kai.tmp
-    rm ntu_kai.ttf
-    unarj x ntu_kai.a03
-    cat ntu_kai.ttf >> ntu_kai.tmp
-    mv ntu_kai.tmp ntu_kai.ttf
-    rm ntu_kai.a01 ntu_kai.a02 ntu_kai.a03 ntu_kai.arj
-fi
diff -urN CJK.orig/scripts/post-install CJK/scripts/post-install
--- CJK.orig/scripts/post-install	Sat Mar  6 05:25:59 1999
+++ CJK/scripts/post-install	Sat Mar  6 05:38:21 1999
@@ -1,21 +1,149 @@
 #!/bin/sh
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
-TeX_FONT_PATH=${PREFIX}/share/texmf/fonts
-export TeX_FONT_PATH
+# 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
 
-#
-# 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} ]
+# 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 -urN CJK.orig/scripts/pre-build CJK/scripts/pre-build
--- CJK.orig/scripts/pre-build	Thu Jan  1 08:00:00 1970
+++ CJK/scripts/pre-build	Sat Mar  6 05:38:21 1999
@@ -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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903052201.GAA00971>