[MAINTAINER] chinese/CJK: update to 4.6.0

	- Update to 4.6.0
	- Remove first master site, which does not contain 4.6.0 and
	  is not an official mirror.

PR:		ports/89874
Submitted by:	Rong-En Fan <rafan@infor.org>

8 files changed, 266 insertions, 250 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index b8d736df3134..bc870d92fda1 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	CJK
-PORTVERSION=	4.5.2
-PORTREVISION=	2
+PORTVERSION=	4.6.0
+PORTREVISION=	0
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/cjk/\
-  		ftp://ftp.ffii.org/pub/cjk/
+MASTER_SITES=	http://cjk.ffii.org/
 DISTNAME=	cjk-${PORTVERSION}
 
 MAINTAINER=	rafan@infor.org
diff --git a/chinese/CJK/distinfo b/chinese/CJK/distinfo
index 85f5cae7c007..989b0cb55b21 100644
--- a/chinese/CJK/distinfo
+++ b/chinese/CJK/distinfo
@@ -1,2 +1,3 @@
-MD5 (cjk-4.5.2.tar.gz) = c3ffc4a8719ba2f0a050e53bd4f400f8
-SIZE (cjk-4.5.2.tar.gz) = 435805
+MD5 (cjk-4.6.0.tar.gz) = 9de3cd0d4d275dca375ce66ee973aea9
+SHA256 (cjk-4.6.0.tar.gz) = 7d2f12966d12a768cca5fe8f585b272b5edc46efe4af630c60a97ac07635857b
+SIZE (cjk-4.6.0.tar.gz) = 489890
diff --git a/chinese/CJK/files/patch-ac b/chinese/CJK/files/patch-ac
index 34bcf74377d6..4eb9e6d958e1 100644
--- a/chinese/CJK/files/patch-ac
+++ b/chinese/CJK/files/patch-ac
@@ -20,7 +20,7 @@
 +
 +hbf2gf_build:
 +	$(CHMOD) +x hbf2gf/config.guess hbf2gf/config.sub hbf2gf/configure
-+	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-dir=$(PREFIX); $(MAKE) all)
++	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-lib=$(LOCALBASE)/lib --with-kpathsea-include=$(LOCALBASE)/include; $(MAKE) all)
 +
 +all: hbf2gf_build
 +	$(MAKE) -C Bg5conv $@
@@ -50,9 +50,9 @@
 +	$(MAKE) -C extconv $@
 +	$(MAKE) -C hbf2gf distclean
 +	$(MAKE) -C pyhyphen $@
---- 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 @@
+--- utils/Bg5conv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/Bg5conv/Makefile	Fri Dec  2 02:38:21 2005
+@@ -0,0 +1,15 @@
 +bg5conv:
 +	$(CC) $(CFLAGS) -o $@ bg5conv.c
 +
@@ -63,12 +63,13 @@
 +install: all
 +	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5pdflatex $(PREFIX)/bin
 +	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
 +
 +clean:
 +	$(RM) bg5conv
---- utils/CEFconv/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/CEFconv/Makefile	Sat Feb 20 07:26:46 1999
+--- utils/CEFconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/CEFconv/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,20 @@
 +cef5conv:
 +	$(CC) $(CFLAGS) -o $@ cef5conv.c
@@ -90,9 +91,9 @@
 +
 +clean:
 +	$(RM) *conv
---- utils/SJISconv/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/SJISconv/Makefile	Sat Feb 20 07:29:10 1999
-@@ -0,0 +1,14 @@
+--- utils/SJISconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/SJISconv/Makefile	Fri Dec  2 02:39:02 2005
+@@ -0,0 +1,15 @@
 +sjisconv:
 +	$(CC) $(CFLAGS) -o $@ sjisconv.c
 +
@@ -103,13 +104,14 @@
 +install: all
 +	$(INSTALL_PROGRAM) sjisconv $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) sjislatex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) sjispdflatex $(PREFIX)/bin
 +	$(INSTALL_MAN) sjisconv.1 $(PREFIX)/man/man1
 +
 +clean:
 +	$(RM) sjisconv
---- utils/extconv/Makefile.orig	Wed Sep  8 00:22:41 1999
-+++ utils/extconv/Makefile	Mon Sep  6 15:12:14 1999
-@@ -0,0 +1,15 @@
+--- utils/extconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/extconv/Makefile	Fri Dec  2 02:39:33 2005
+@@ -0,0 +1,17 @@
 +extconv:
 +	$(CC) $(CFLAGS) -o $@ extconv.c
 +
@@ -121,7 +123,9 @@
 +	$(INSTALL_PROGRAM) extconv $(PREFIX)/bin
 +	$(INSTALL_MAN) extconv.1 $(PREFIX)/man/man1
 +	$(INSTALL_SCRIPT) bg5+latex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5+pdflatex $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) gbklatex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) gbkpdflatex $(PREFIX)/bin
 +
 +clean:
 +	$(RM) extconv
@@ -136,14 +140,14 @@
          done
  
  uninstall:
---- utils/lisp/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/lisp/Makefile	Sat Feb 27 17:52:17 1999
+--- utils/lisp/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/lisp/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,3 @@
 +install:
 +	(mkdir -p ${PREFIX}/share/emacs/site-lisp/CJK) && \
 +	($(CP) -R [a-z]* ${PREFIX}/share/emacs/site-lisp/CJK)
---- utils/pyhyphen/Makefile.orig	Mon Jan 10 15:07:11 2000
-+++ utils/pyhyphen/Makefile	Mon Jan 10 15:15:06 2000
+--- utils/pyhyphen/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/pyhyphen/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,14 @@
 +pinyin:
 +	$(CC) $(CFLAGS) -o $@ pinyin.c
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index 4872f80d9a53..f06c1a409392 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -1,57 +1,84 @@
 bin/bg5conv
 bin/bg5+latex
+bin/bg5+pdflatex
 bin/bg5latex
+bin/bg5pdflatex
 bin/cef5conv
 bin/cef5latex
+bin/cef5pdflatex
 bin/cefconv
 bin/ceflatex
+bin/cefpdflatex
 bin/cefsconv
 bin/cefslatex
+bin/cefspdflatex
 bin/extconv
 bin/gbklatex
+bin/gbkpdflatex
 bin/hbf2gf
 bin/pinyin
 bin/sjisconv
 bin/sjislatex
-%%PORTDOCS%%%%DOCSDIR%%/CEF.doc
-%%PORTDOCS%%%%DOCSDIR%%/CJK.doc
+bin/sjispdflatex
+%%PORTDOCS%%%%DOCSDIR%%/CEF.txt
+%%PORTDOCS%%%%DOCSDIR%%/CJK.txt
+%%PORTDOCS%%%%DOCSDIR%%/CJKutf8.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/TDS.doc
+%%PORTDOCS%%%%DOCSDIR%%/TDS.txt
 %%PORTDOCS%%%%DOCSDIR%%/chinese/README
 %%PORTDOCS%%%%DOCSDIR%%/chinese/READMEb5.tex
 %%PORTDOCS%%%%DOCSDIR%%/chinese/READMEgb.tex
-%%PORTDOCS%%%%DOCSDIR%%/chinese/emTeXb5.doc
-%%PORTDOCS%%%%DOCSDIR%%/chinese/teTeXb5.doc
-%%PORTDOCS%%%%DOCSDIR%%/cjk-enc.doc
-%%PORTDOCS%%%%DOCSDIR%%/commands.doc
-%%PORTDOCS%%%%DOCSDIR%%/dvidrv.doc
-%%PORTDOCS%%%%DOCSDIR%%/fonts.doc
-%%PORTDOCS%%%%DOCSDIR%%/hbf2gf.doc
+%%PORTDOCS%%%%DOCSDIR%%/chinese/emTeXb5.txt
+%%PORTDOCS%%%%DOCSDIR%%/chinese/teTeXb5.txt
+%%PORTDOCS%%%%DOCSDIR%%/cjk-enc.txt
+%%PORTDOCS%%%%DOCSDIR%%/commands.txt
+%%PORTDOCS%%%%DOCSDIR%%/dvidrv.txt
+%%PORTDOCS%%%%DOCSDIR%%/fdxfiles.txt
+%%PORTDOCS%%%%DOCSDIR%%/fonts.txt
+%%PORTDOCS%%%%DOCSDIR%%/hbf2gf.txt
 %%PORTDOCS%%%%DOCSDIR%%/history.2_5
 %%PORTDOCS%%%%DOCSDIR%%/history.txt
 %%PORTDOCS%%%%DOCSDIR%%/japanese/README
-%%PORTDOCS%%%%DOCSDIR%%/japanese/ascii.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.doc
+%%PORTDOCS%%%%DOCSDIR%%/japanese/ascii.txt
 %%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.jis
-%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-fonts.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-tex.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/preview.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/shibuaki.doc
-%%PORTDOCS%%%%DOCSDIR%%/pinyin.doc
-%%PORTDOCS%%%%DOCSDIR%%/pyhyphen.doc
-%%PORTDOCS%%%%DOCSDIR%%/ruby.doc
-%%PORTDOCS%%%%DOCSDIR%%/thaifont.doc
-%%PORTDOCS%%%%DOCSDIR%%/vertical.doc
+%%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-fonts.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-tex.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/preview.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/shibuaki.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/bkai.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/cid-x.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/cwtb.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/dvipdfmx.cfg
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/gen-map.pl
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/map.list
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/Bg5/c00cwtb.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/Bg5/c00tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/GB/c10tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/JIS/c40tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/SJIS/c49tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/updmap.my
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/wcl.sfd
+%%PORTDOCS%%%%DOCSDIR%%/pinyin.txt
+%%PORTDOCS%%%%DOCSDIR%%/pyhyphen.txt
+%%PORTDOCS%%%%DOCSDIR%%/reftex.txt
+%%PORTDOCS%%%%DOCSDIR%%/ruby.txt
+%%PORTDOCS%%%%DOCSDIR%%/thaifont.txt
+%%PORTDOCS%%%%DOCSDIR%%/vertical.txt
 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.3/thai-word.el
+share/emacs/site-lisp/CJK/emacs/cjk-enc.el
+share/emacs/site-lisp/CJK/emacs/thai-word.el
 share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
 %%EXAMPLESDIR%%/Big5.tex
 %%EXAMPLESDIR%%/Big5vert.tex
 %%EXAMPLESDIR%%/CEF_test.tex
 %%EXAMPLESDIR%%/CJKbabel.tex
+%%EXAMPLESDIR%%/CJKfntef.tex
+%%EXAMPLESDIR%%/CJKmixed.tex
+%%EXAMPLESDIR%%/CJKutf8.tex
 %%EXAMPLESDIR%%/GB.tex
 %%EXAMPLESDIR%%/JIS.tex
 %%EXAMPLESDIR%%/KS.tex
@@ -250,17 +277,20 @@ share/texmf/hbf2gf/jsso12.cfg
 share/texmf/hbf2gf/ksso17.cfg
 share/texmf/tex/generic/babel/pinyin.ldf
 share/texmf/tex/generic/hyphen/pyhyph.tex
-share/texmf/tex/latex/CJK/Bg5/c00bsmi.fd
-share/texmf/tex/latex/CJK/Bg5/c00bsmir.fd
 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/c00bsmi.fdv
+share/texmf/tex/latex/CJK/Bg5/c00bkai.fdx
+share/texmf/tex/latex/CJK/Bg5/c00bsmi.fd
+share/texmf/tex/latex/CJK/Bg5/c00bsmi.fdx
+share/texmf/tex/latex/CJK/Bg5/c00bsmir.fd
+share/texmf/tex/latex/CJK/Bg5/c00bsmir.fdx
 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/c00kair.fdx
 share/texmf/tex/latex/CJK/Bg5/c00song.fd
 share/texmf/tex/latex/CJK/Bg5/c01song.fd
 share/texmf/tex/latex/CJK/Bg5/c09song.fd
@@ -268,8 +298,10 @@ 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/CJKfntef.sty
 share/texmf/tex/latex/CJK/CJKnumb.sty
 share/texmf/tex/latex/CJK/CJKulem.sty
+share/texmf/tex/latex/CJK/CJKutf8.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
@@ -281,11 +313,11 @@ 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/c10gbsn.fd
-share/texmf/tex/latex/CJK/GB/c10gbsn.fdv
 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/c10gbsn.fd
+share/texmf/tex/latex/CJK/GB/c10gbsn.fdx
 share/texmf/tex/latex/CJK/GB/c10kai.fd
 share/texmf/tex/latex/CJK/GB/c10song.fd
 share/texmf/tex/latex/CJK/GB/c11song.fd
@@ -306,100 +338,58 @@ 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/c63dn.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/c63jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jsr.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/c63pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ph.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/c63sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63vd.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/c64dn.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/c64jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jsr.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/c64pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ph.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/c64sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64vd.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/c65dn.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/c65jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jsr.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/c65pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ph.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/c65sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65vd.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
@@ -440,6 +430,13 @@ 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/c70bkai.fd
+share/texmf/tex/latex/CJK/UTF8/c70bkai.fdx
+share/texmf/tex/latex/CJK/UTF8/c70bsmi.fd
+share/texmf/tex/latex/CJK/UTF8/c70bsmi.fdx
+share/texmf/tex/latex/CJK/UTF8/c70gbsn.fd
+share/texmf/tex/latex/CJK/UTF8/c70gkai.fd
+share/texmf/tex/latex/CJK/UTF8/c70mj.fd
 share/texmf/tex/latex/CJK/UTF8/c70song.fd
 share/texmf/tex/latex/CJK/extended.chr
 share/texmf/tex/latex/CJK/extended.enc
@@ -455,14 +452,21 @@ share/texmf/tex/latex/CJK/standard.enc
 share/texmf/tex/latex/CJK/thai/c90cmr.fd
 share/texmf/tex/latex/CJK/thai/c90cmss.fd
 share/texmf/tex/latex/CJK/thai/c90cmtt.fd
-share/texmf/tex/latex/CJK/thai/c90dbss.fd
+share/texmf/tex/latex/CJK/thai/c90enc.def
+share/texmf/tex/latex/CJK/thai/c90gar.fd
 share/texmf/tex/latex/CJK/thai/c90nrsr.fd
 share/texmf/tex/latex/CJK/thai/thaicjk.ldf
-share/texmf/tex/latex/CJK/thai/c90enc.def
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/chinese
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/japanese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/Bg5
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/GB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/JIS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/SJIS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/emacs/site-lisp/CJK/emacs-20.3
+@dirrm share/emacs/site-lisp/CJK/emacs
 @dirrm share/emacs/site-lisp/CJK/mule-2.3
 @dirrm share/emacs/site-lisp/CJK
 @dirrm %%EXAMPLESDIR%%
diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index b8d736df3134..bc870d92fda1 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	CJK
-PORTVERSION=	4.5.2
-PORTREVISION=	2
+PORTVERSION=	4.6.0
+PORTREVISION=	0
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/cjk/\
-  		ftp://ftp.ffii.org/pub/cjk/
+MASTER_SITES=	http://cjk.ffii.org/
 DISTNAME=	cjk-${PORTVERSION}
 
 MAINTAINER=	rafan@infor.org
diff --git a/print/latex-cjk/distinfo b/print/latex-cjk/distinfo
index 85f5cae7c007..989b0cb55b21 100644
--- a/print/latex-cjk/distinfo
+++ b/print/latex-cjk/distinfo
@@ -1,2 +1,3 @@
-MD5 (cjk-4.5.2.tar.gz) = c3ffc4a8719ba2f0a050e53bd4f400f8
-SIZE (cjk-4.5.2.tar.gz) = 435805
+MD5 (cjk-4.6.0.tar.gz) = 9de3cd0d4d275dca375ce66ee973aea9
+SHA256 (cjk-4.6.0.tar.gz) = 7d2f12966d12a768cca5fe8f585b272b5edc46efe4af630c60a97ac07635857b
+SIZE (cjk-4.6.0.tar.gz) = 489890
diff --git a/print/latex-cjk/files/patch-ac b/print/latex-cjk/files/patch-ac
index 34bcf74377d6..4eb9e6d958e1 100644
--- a/print/latex-cjk/files/patch-ac
+++ b/print/latex-cjk/files/patch-ac
@@ -20,7 +20,7 @@
 +
 +hbf2gf_build:
 +	$(CHMOD) +x hbf2gf/config.guess hbf2gf/config.sub hbf2gf/configure
-+	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-dir=$(PREFIX); $(MAKE) all)
++	(cd hbf2gf; ./configure --prefix=$(PREFIX) --with-kpathsea-lib=$(LOCALBASE)/lib --with-kpathsea-include=$(LOCALBASE)/include; $(MAKE) all)
 +
 +all: hbf2gf_build
 +	$(MAKE) -C Bg5conv $@
@@ -50,9 +50,9 @@
 +	$(MAKE) -C extconv $@
 +	$(MAKE) -C hbf2gf distclean
 +	$(MAKE) -C pyhyphen $@
---- 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 @@
+--- utils/Bg5conv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/Bg5conv/Makefile	Fri Dec  2 02:38:21 2005
+@@ -0,0 +1,15 @@
 +bg5conv:
 +	$(CC) $(CFLAGS) -o $@ bg5conv.c
 +
@@ -63,12 +63,13 @@
 +install: all
 +	$(INSTALL_PROGRAM) bg5conv $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) bg5latex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5pdflatex $(PREFIX)/bin
 +	$(INSTALL_MAN) bg5conv.1 $(PREFIX)/man/man1
 +
 +clean:
 +	$(RM) bg5conv
---- utils/CEFconv/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/CEFconv/Makefile	Sat Feb 20 07:26:46 1999
+--- utils/CEFconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/CEFconv/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,20 @@
 +cef5conv:
 +	$(CC) $(CFLAGS) -o $@ cef5conv.c
@@ -90,9 +91,9 @@
 +
 +clean:
 +	$(RM) *conv
---- utils/SJISconv/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/SJISconv/Makefile	Sat Feb 20 07:29:10 1999
-@@ -0,0 +1,14 @@
+--- utils/SJISconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/SJISconv/Makefile	Fri Dec  2 02:39:02 2005
+@@ -0,0 +1,15 @@
 +sjisconv:
 +	$(CC) $(CFLAGS) -o $@ sjisconv.c
 +
@@ -103,13 +104,14 @@
 +install: all
 +	$(INSTALL_PROGRAM) sjisconv $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) sjislatex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) sjispdflatex $(PREFIX)/bin
 +	$(INSTALL_MAN) sjisconv.1 $(PREFIX)/man/man1
 +
 +clean:
 +	$(RM) sjisconv
---- utils/extconv/Makefile.orig	Wed Sep  8 00:22:41 1999
-+++ utils/extconv/Makefile	Mon Sep  6 15:12:14 1999
-@@ -0,0 +1,15 @@
+--- utils/extconv/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/extconv/Makefile	Fri Dec  2 02:39:33 2005
+@@ -0,0 +1,17 @@
 +extconv:
 +	$(CC) $(CFLAGS) -o $@ extconv.c
 +
@@ -121,7 +123,9 @@
 +	$(INSTALL_PROGRAM) extconv $(PREFIX)/bin
 +	$(INSTALL_MAN) extconv.1 $(PREFIX)/man/man1
 +	$(INSTALL_SCRIPT) bg5+latex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) bg5+pdflatex $(PREFIX)/bin
 +	$(INSTALL_SCRIPT) gbklatex $(PREFIX)/bin
++	$(INSTALL_SCRIPT) gbkpdflatex $(PREFIX)/bin
 +
 +clean:
 +	$(RM) extconv
@@ -136,14 +140,14 @@
          done
  
  uninstall:
---- utils/lisp/Makefile.orig	Thu Jan  1 08:00:00 1970
-+++ utils/lisp/Makefile	Sat Feb 27 17:52:17 1999
+--- utils/lisp/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/lisp/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,3 @@
 +install:
 +	(mkdir -p ${PREFIX}/share/emacs/site-lisp/CJK) && \
 +	($(CP) -R [a-z]* ${PREFIX}/share/emacs/site-lisp/CJK)
---- utils/pyhyphen/Makefile.orig	Mon Jan 10 15:07:11 2000
-+++ utils/pyhyphen/Makefile	Mon Jan 10 15:15:06 2000
+--- utils/pyhyphen/Makefile.orig	Fri Dec  2 02:37:40 2005
++++ utils/pyhyphen/Makefile	Fri Dec  2 02:37:40 2005
 @@ -0,0 +1,14 @@
 +pinyin:
 +	$(CC) $(CFLAGS) -o $@ pinyin.c
diff --git a/print/latex-cjk/pkg-plist b/print/latex-cjk/pkg-plist
index 4872f80d9a53..f06c1a409392 100644
--- a/print/latex-cjk/pkg-plist
+++ b/print/latex-cjk/pkg-plist
@@ -1,57 +1,84 @@
 bin/bg5conv
 bin/bg5+latex
+bin/bg5+pdflatex
 bin/bg5latex
+bin/bg5pdflatex
 bin/cef5conv
 bin/cef5latex
+bin/cef5pdflatex
 bin/cefconv
 bin/ceflatex
+bin/cefpdflatex
 bin/cefsconv
 bin/cefslatex
+bin/cefspdflatex
 bin/extconv
 bin/gbklatex
+bin/gbkpdflatex
 bin/hbf2gf
 bin/pinyin
 bin/sjisconv
 bin/sjislatex
-%%PORTDOCS%%%%DOCSDIR%%/CEF.doc
-%%PORTDOCS%%%%DOCSDIR%%/CJK.doc
+bin/sjispdflatex
+%%PORTDOCS%%%%DOCSDIR%%/CEF.txt
+%%PORTDOCS%%%%DOCSDIR%%/CJK.txt
+%%PORTDOCS%%%%DOCSDIR%%/CJKutf8.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/TDS.doc
+%%PORTDOCS%%%%DOCSDIR%%/TDS.txt
 %%PORTDOCS%%%%DOCSDIR%%/chinese/README
 %%PORTDOCS%%%%DOCSDIR%%/chinese/READMEb5.tex
 %%PORTDOCS%%%%DOCSDIR%%/chinese/READMEgb.tex
-%%PORTDOCS%%%%DOCSDIR%%/chinese/emTeXb5.doc
-%%PORTDOCS%%%%DOCSDIR%%/chinese/teTeXb5.doc
-%%PORTDOCS%%%%DOCSDIR%%/cjk-enc.doc
-%%PORTDOCS%%%%DOCSDIR%%/commands.doc
-%%PORTDOCS%%%%DOCSDIR%%/dvidrv.doc
-%%PORTDOCS%%%%DOCSDIR%%/fonts.doc
-%%PORTDOCS%%%%DOCSDIR%%/hbf2gf.doc
+%%PORTDOCS%%%%DOCSDIR%%/chinese/emTeXb5.txt
+%%PORTDOCS%%%%DOCSDIR%%/chinese/teTeXb5.txt
+%%PORTDOCS%%%%DOCSDIR%%/cjk-enc.txt
+%%PORTDOCS%%%%DOCSDIR%%/commands.txt
+%%PORTDOCS%%%%DOCSDIR%%/dvidrv.txt
+%%PORTDOCS%%%%DOCSDIR%%/fdxfiles.txt
+%%PORTDOCS%%%%DOCSDIR%%/fonts.txt
+%%PORTDOCS%%%%DOCSDIR%%/hbf2gf.txt
 %%PORTDOCS%%%%DOCSDIR%%/history.2_5
 %%PORTDOCS%%%%DOCSDIR%%/history.txt
 %%PORTDOCS%%%%DOCSDIR%%/japanese/README
-%%PORTDOCS%%%%DOCSDIR%%/japanese/ascii.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.doc
+%%PORTDOCS%%%%DOCSDIR%%/japanese/ascii.txt
 %%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.jis
-%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-fonts.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-tex.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/preview.doc
-%%PORTDOCS%%%%DOCSDIR%%/japanese/shibuaki.doc
-%%PORTDOCS%%%%DOCSDIR%%/pinyin.doc
-%%PORTDOCS%%%%DOCSDIR%%/pyhyphen.doc
-%%PORTDOCS%%%%DOCSDIR%%/ruby.doc
-%%PORTDOCS%%%%DOCSDIR%%/thaifont.doc
-%%PORTDOCS%%%%DOCSDIR%%/vertical.doc
+%%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-fonts.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/jp-tex.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/preview.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/shibuaki.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/bkai.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/cid-x.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/cwtb.map
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/dvipdfmx.cfg
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/gen-map.pl
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/map.list
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/Bg5/c00cwtb.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/Bg5/c00tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/GB/c10tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/JIS/c40tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/texinput/SJIS/c49tmpl.fd
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/updmap.my
+%%PORTDOCS%%%%DOCSDIR%%/pdf/examples/wcl.sfd
+%%PORTDOCS%%%%DOCSDIR%%/pinyin.txt
+%%PORTDOCS%%%%DOCSDIR%%/pyhyphen.txt
+%%PORTDOCS%%%%DOCSDIR%%/reftex.txt
+%%PORTDOCS%%%%DOCSDIR%%/ruby.txt
+%%PORTDOCS%%%%DOCSDIR%%/thaifont.txt
+%%PORTDOCS%%%%DOCSDIR%%/vertical.txt
 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.3/thai-word.el
+share/emacs/site-lisp/CJK/emacs/cjk-enc.el
+share/emacs/site-lisp/CJK/emacs/thai-word.el
 share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
 %%EXAMPLESDIR%%/Big5.tex
 %%EXAMPLESDIR%%/Big5vert.tex
 %%EXAMPLESDIR%%/CEF_test.tex
 %%EXAMPLESDIR%%/CJKbabel.tex
+%%EXAMPLESDIR%%/CJKfntef.tex
+%%EXAMPLESDIR%%/CJKmixed.tex
+%%EXAMPLESDIR%%/CJKutf8.tex
 %%EXAMPLESDIR%%/GB.tex
 %%EXAMPLESDIR%%/JIS.tex
 %%EXAMPLESDIR%%/KS.tex
@@ -250,17 +277,20 @@ share/texmf/hbf2gf/jsso12.cfg
 share/texmf/hbf2gf/ksso17.cfg
 share/texmf/tex/generic/babel/pinyin.ldf
 share/texmf/tex/generic/hyphen/pyhyph.tex
-share/texmf/tex/latex/CJK/Bg5/c00bsmi.fd
-share/texmf/tex/latex/CJK/Bg5/c00bsmir.fd
 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/c00bsmi.fdv
+share/texmf/tex/latex/CJK/Bg5/c00bkai.fdx
+share/texmf/tex/latex/CJK/Bg5/c00bsmi.fd
+share/texmf/tex/latex/CJK/Bg5/c00bsmi.fdx
+share/texmf/tex/latex/CJK/Bg5/c00bsmir.fd
+share/texmf/tex/latex/CJK/Bg5/c00bsmir.fdx
 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/c00kair.fdx
 share/texmf/tex/latex/CJK/Bg5/c00song.fd
 share/texmf/tex/latex/CJK/Bg5/c01song.fd
 share/texmf/tex/latex/CJK/Bg5/c09song.fd
@@ -268,8 +298,10 @@ 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/CJKfntef.sty
 share/texmf/tex/latex/CJK/CJKnumb.sty
 share/texmf/tex/latex/CJK/CJKulem.sty
+share/texmf/tex/latex/CJK/CJKutf8.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
@@ -281,11 +313,11 @@ 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/c10gbsn.fd
-share/texmf/tex/latex/CJK/GB/c10gbsn.fdv
 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/c10gbsn.fd
+share/texmf/tex/latex/CJK/GB/c10gbsn.fdx
 share/texmf/tex/latex/CJK/GB/c10kai.fd
 share/texmf/tex/latex/CJK/GB/c10song.fd
 share/texmf/tex/latex/CJK/GB/c11song.fd
@@ -306,100 +338,58 @@ 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/c63dn.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/c63jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63jsr.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/c63pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63ph.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/c63sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c63vd.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/c64dn.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/c64jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64jsr.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/c64pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64ph.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/c64sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c64vd.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/c65dn.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/c65jgt.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jmj.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jnv.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65jsr.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/c65pga.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65ph.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/c65sh.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65tz.fd
+share/texmf/tex/latex/CJK/KS/HLaTeX/c65vd.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
@@ -440,6 +430,13 @@ 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/c70bkai.fd
+share/texmf/tex/latex/CJK/UTF8/c70bkai.fdx
+share/texmf/tex/latex/CJK/UTF8/c70bsmi.fd
+share/texmf/tex/latex/CJK/UTF8/c70bsmi.fdx
+share/texmf/tex/latex/CJK/UTF8/c70gbsn.fd
+share/texmf/tex/latex/CJK/UTF8/c70gkai.fd
+share/texmf/tex/latex/CJK/UTF8/c70mj.fd
 share/texmf/tex/latex/CJK/UTF8/c70song.fd
 share/texmf/tex/latex/CJK/extended.chr
 share/texmf/tex/latex/CJK/extended.enc
@@ -455,14 +452,21 @@ share/texmf/tex/latex/CJK/standard.enc
 share/texmf/tex/latex/CJK/thai/c90cmr.fd
 share/texmf/tex/latex/CJK/thai/c90cmss.fd
 share/texmf/tex/latex/CJK/thai/c90cmtt.fd
-share/texmf/tex/latex/CJK/thai/c90dbss.fd
+share/texmf/tex/latex/CJK/thai/c90enc.def
+share/texmf/tex/latex/CJK/thai/c90gar.fd
 share/texmf/tex/latex/CJK/thai/c90nrsr.fd
 share/texmf/tex/latex/CJK/thai/thaicjk.ldf
-share/texmf/tex/latex/CJK/thai/c90enc.def
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/chinese
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/japanese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/Bg5
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/GB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/JIS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput/SJIS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples/texinput
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/emacs/site-lisp/CJK/emacs-20.3
+@dirrm share/emacs/site-lisp/CJK/emacs
 @dirrm share/emacs/site-lisp/CJK/mule-2.3
 @dirrm share/emacs/site-lisp/CJK
 @dirrm %%EXAMPLESDIR%%