Update to the lastest version.

PR: 21733
Submitted by: MAINTAINER

7 files changed, 60 insertions, 45 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index 37b667f88e2b..65b37cfcde34 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	CJK
 PORTVERSION=	4.3.0
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/keith/
-DISTFILES=	cjk-20000418.tar.gz
+DISTNAME=	cjk-20001003
 
 MAINTAINER=	keith@freebsd.sinica.edu.tw
 
@@ -23,6 +23,7 @@ NO_PACKAGE=	"Needs ttf2pk source from FreeType"
 USE_GMAKE=	yes
 USE_FREETYPE=	yes
 WRKSRC=		${WRKDIR}/cjk-current
+ARPHICDIR=	${PREFIX}/share/texmf/fonts/truetype/arphic
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -31,8 +32,14 @@ post-install:
 .endif
 	${RM} -fr ${PREFIX}/share/examples/CJK
 	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
+	@${MKDIR} ${ARPHICDIR}	# Install Arphic fonts
+	@${LN} -s ${X11BASE}/lib/X11/fonts/TrueType/bkai00mp.ttf ${ARPHICDIR}/arb5_kai.ttf
+	@${LN} -s ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf ${ARPHICDIR}/arb5_sung.ttf
+	@${LN} -s ${X11BASE}/lib/X11/fonts/TrueType/gbsn00lp.ttf ${ARPHICDIR}/argb_sung.ttf
+	@${LN} -s ${X11BASE}/lib/X11/fonts/TrueType/gkai00mp.ttf ${ARPHICDIR}/argb_kai.ttf
+	@${LN} -s ttf2pk ${PREFIX}/share/texmf/ttf2tfm
 
 MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
-		hbf2gf.1 sjisconv.1 thaiconv.1 ttf2pk.1 ttf2tfm.1
+		hbf2gf.1 sjisconv.1 ttf2pk.1 ttf2tfm.1
 
 .include <bsd.port.mk>
diff --git a/chinese/CJK/distinfo b/chinese/CJK/distinfo
index 74fdd33e887f..fcb7d61d0244 100644
--- a/chinese/CJK/distinfo
+++ b/chinese/CJK/distinfo
@@ -1 +1 @@
-MD5 (cjk-20000418.tar.gz) = 921a11cbb11334d85b15a2de65f8fe04
+MD5 (cjk-20001003.tar.gz) = fcc974b26e16166f80b91453ea74e915
diff --git a/chinese/CJK/files/patch-ac b/chinese/CJK/files/patch-ac
index b6c47766373a..d52dc7b6095d 100644
--- a/chinese/CJK/files/patch-ac
+++ b/chinese/CJK/files/patch-ac
@@ -1,6 +1,6 @@
 --- utils/Makefile.orig	Thu Jan  6 20:50:10 2000
 +++ utils/Makefile	Thu Jan  6 20:52:17 2000
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,49 @@
 +CC = /usr/bin/cc
 +CFLAGS = -Wall -O
 +
@@ -28,7 +28,6 @@
 +	$(MAKE) -C SJISconv $@
 +	$(MAKE) -C extconv $@
 +	$(MAKE) -C pyhyphen $@
-+	$(MAKE) -C thaiconv $@
 +
 +hbf2gf_install:
 +	$(CHMOD) +x hbf2gf/mkinstalldirs
@@ -43,7 +42,6 @@
 +	$(MAKE) -C extconv $@
 +	$(MAKE) -C lisp $@
 +	$(MAKE) -C pyhyphen $@
-+	$(MAKE) -C thaiconv $@
 +
 +clean:
 +	$(MAKE) -C Bg5conv $@
@@ -52,7 +50,6 @@
 +	$(MAKE) -C extconv $@
 +	$(MAKE) -C hbf2gf distclean
 +	$(MAKE) -C pyhyphen $@
-+	$(MAKE) -C thaiconv $@
 --- utils/Bg5conv/Makefile.orig	Thu Jan  1 08:00:00 1970
 +++ utils/Bg5conv/Makefile	Sat Feb 20 07:17:29 1999
 @@ -0,0 +1,14 @@
@@ -162,20 +159,3 @@
 +
 +clean:
 +	$(RM) pinyin
---- utils/thaiconv/Makefile.orig	Sun Dec 13 12:00:00 1998
-+++ utils/thaiconv/Makefile	Sat Feb 20 07:39:03 1999
-@@ -14,3 +14,14 @@
- 	c2cweb -b "The thaiconv program" -l -v thaiconv.c
- 	$(CWEAVE) +ai thaiconv.cw
- 	$(TEX) thaiconv
-+
-+build: thaiconv
-+
-+all: build
-+
-+install: all
-+	$(INSTALL_PROGRAM) thaiconv $(PREFIX)/bin
-+	$(INSTALL_MAN) thaiconv.1 $(PREFIX)/man/man1
-+
-+clean:
-+	$(RM) thaiconv
diff --git a/chinese/CJK/pkg-deinstall b/chinese/CJK/pkg-deinstall
new file mode 100644
index 000000000000..f652ce9f0dab
--- /dev/null
+++ b/chinese/CJK/pkg-deinstall
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Run just once.
+if [ "x$2" != "xDEINSTALL" ]; then
+  exit 0
+fi
+
+TEXMFMAIN=`kpsexpand '$TEXMFMAIN'`
+TEXMFCNF=${TEXMFMAIN}/web2c/texmf.cnf
+SPECIALMAP=${TEXMFMAIN}/fontname/special.map
+
+# Edit web2c/texmf.cnf
+sed -e "/ttf2pk/d" ${TEXMFCNF} > ${TEXMFCNF}.tmp
+sed -e "/ttf2tfm/d" ${TEXMFCNF}.tmp > ${TEXMFCNF}
+rm -f ${TEXMFCNF}.tmp
+
+# Edit fontname/special.map
+sed -e "/Arphic/d" ${SPECIALMAP} > ${SPECIALMAP}.tmp
+sed -e "/^arb5/d" ${SPECIALMAP}.tmp > ${SPECIALMAP}
+sed -e "/^argb/d" ${SPECIALMAP} > ${SPECIALMAP}.tmp
+mv -f ${SPECIALMAP}.tmp ${SPECIALMAP}
+
+# Delete symbolic links
+rm -f ${TEXMFMAIN}/ttf2tfm
+rm -f ${TEXMFMAIN}/fonts/truetype/arphic/arb5_kai.ttf
+rm -f ${TEXMFMAIN}/fonts/truetype/arphic/arb5_sung.ttf
+rm -f ${TEXMFMAIN}/fonts/truetype/arphic/argb_kai.ttf
+rm -f ${TEXMFMAIN}/fonts/truetype/arphic/argb_sung.ttf
+
+#
+# Update ls-R.  We have to run twice to get correct result.
+# Strange bug of texconfig.
+#
+texconfig rehash
+texconfig rehash
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index fa58ec6aa5aa..2bf918a8165e 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -13,7 +13,6 @@ bin/hbf2gf
 bin/pinyin
 bin/sjisconv
 bin/sjislatex
-bin/thaiconv
 bin/ttf2pk
 bin/ttf2tfm
 share/doc/CJK/CEF.doc
@@ -44,11 +43,12 @@ share/doc/CJK/japanese/shibuaki.doc
 share/doc/CJK/pinyin.doc
 share/doc/CJK/pyhyphen.doc
 share/doc/CJK/ruby.doc
+share/doc/CJK/thaifont.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/cjk-enc.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/mule-2.3/cjk-enc.el
 share/examples/CJK/Big5.tex
 share/examples/CJK/Big5vert.tex
@@ -62,6 +62,7 @@ share/examples/CJK/UTF8.tex
 share/examples/CJK/muletest.tex
 share/examples/CJK/py_test.tex
 share/examples/CJK/rubytest.tex
+share/examples/CJK/thai.tex
 share/texmf/fonts/tfm/arphic/arb5kai/arb5kai01.tfm
 share/texmf/fonts/tfm/arphic/arb5kai/arb5kai02.tfm
 share/texmf/fonts/tfm/arphic/arb5kai/arb5kai03.tfm
@@ -232,10 +233,6 @@ share/texmf/fonts/tfm/arphic/argbsung/argbsung29.tfm
 share/texmf/fonts/tfm/arphic/argbsung/argbsung30.tfm
 share/texmf/fonts/tfm/arphic/argbsung/argbsung31.tfm
 share/texmf/fonts/tfm/arphic/argbsung/argbsung32.tfm
-share/texmf/fonts/truetype/arphic/arb5_kai.ttf
-share/texmf/fonts/truetype/arphic/arb5_sung.ttf
-share/texmf/fonts/truetype/arphic/argb_kai.ttf
-share/texmf/fonts/truetype/arphic/argb_sung.ttf
 share/texmf/hbf2gf/README
 share/texmf/hbf2gf/b5ka12.cfg
 share/texmf/hbf2gf/b5kr12.cfg
@@ -270,6 +267,7 @@ 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/CJKulem.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
@@ -432,7 +430,7 @@ 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/SJISdnp.cpx
+share/texmf/tex/latex/CJK/SJIS/SJISdnp.chr
 share/texmf/tex/latex/CJK/SJIS/SJISdnp.enc
 share/texmf/tex/latex/CJK/SJIS/c49song.fd
 share/texmf/tex/latex/CJK/UTF8/UTF8.bdg
@@ -451,7 +449,11 @@ share/texmf/tex/latex/CJK/standard.bdg
 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/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/c90nrsr.fd
+share/texmf/tex/latex/CJK/thai/thaicjk.ldf
 share/texmf/ttf2pk/Big5.sfd
 share/texmf/ttf2pk/ET5.enc
 share/texmf/ttf2pk/EUC.sfd
@@ -469,7 +471,6 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/doc/CJK/chinese
 @dirrm share/doc/CJK/japanese
 @dirrm share/doc/CJK
-@dirrm share/emacs/site-lisp/CJK/emacs-20
 @dirrm share/emacs/site-lisp/CJK/emacs-20.3
 @dirrm share/emacs/site-lisp/CJK/mule-2.3
 @dirrm share/emacs/site-lisp/CJK
@@ -479,7 +480,7 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/texmf/fonts/tfm/arphic/argbkai
 @dirrm share/texmf/fonts/tfm/arphic/argbsung
 @dirrm share/texmf/fonts/tfm/arphic
-@dirrm share/texmf/fonts/truetype/arphic
+@unexec rmdir %D/share/texmf/fonts/truetype/arphic 2>/dev/null || true
 @unexec rmdir %D/share/texmf/fonts/truetype 2>/dev/null || true
 @dirrm share/texmf/hbf2gf
 @dirrm share/texmf/tex/latex/CJK/Bg5
@@ -495,4 +496,3 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/texmf/tex/latex/CJK/thai
 @dirrm share/texmf/tex/latex/CJK
 @dirrm share/texmf/ttf2pk
-@unexec rm -f %D/share/texmf/ttf2tfm
diff --git a/chinese/CJK/scripts/post-install b/chinese/CJK/scripts/post-install
index d7fffa441871..e76ee2475e54 100644
--- a/chinese/CJK/scripts/post-install
+++ b/chinese/CJK/scripts/post-install
@@ -13,19 +13,12 @@ fi
 
 # Install ttf2pk binary in ${PORTSDIR}/print/freetype, data in ${TEXMF}/ttf2pk,
 # and link ${TEXMF}/ttf2tfm to ${TEXMF}/ttf2pk.
-(cd ${PORTSDIR}/print/freetype/work/freetype-1.3/contrib/ttf2pk;
+(cd ${PORTSDIR}/print/freetype/work/freetype-1.3.1/contrib/ttf2pk;
  ./configure --prefix=${PREFIX} --with-kpathsea-dir=${PREFIX};
  make depend all install;
  rm -fr ${TEXMFMAIN}/ttf2pk ${TEXMFMAIN}/ttf2tfm;
  cp -R data ${TEXMFMAIN}/ttf2pk;
- cd ${TEXMFMAIN}; ln -s ttf2pk ttf2tfm; )
-
-# Install Arphic TTF fonts
-mkdir -p ${TEXMFMAIN}/fonts/truetype/arphic
-ln -s ${X11BASE}/lib/X11/fonts/TrueType/bkai00mp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/arb5_kai.ttf
-ln -s ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/arb5_sung.ttf
-ln -s ${X11BASE}/lib/X11/fonts/TrueType/gbsn00lp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/argb_sung.ttf
-ln -s ${X11BASE}/lib/X11/fonts/TrueType/gkai00mp.ttf ${TEXMFMAIN}/fonts/truetype/arphic/argb_kai.ttf
+ cd ${TEXMFMAIN}; )
 
 # fontname/special.map: add arb5kai/arb5sung/argbkai/argbsung entries.
 if [ -n "`grep arb5kai ${TEXMFMAIN}/fontname/special.map`" ]
diff --git a/chinese/CJK/scripts/pre-build b/chinese/CJK/scripts/pre-build
index 332e03c0b34f..32b8c2924a5d 100644
--- a/chinese/CJK/scripts/pre-build
+++ b/chinese/CJK/scripts/pre-build
@@ -9,7 +9,7 @@ if [ ! -f ${PREFIX}/share/texmf/doc/tetex/README ]; then
   echo "-----------------------------------------"
   exit 1
 # Juse grep for 1.0 is not a preferred method, but it seems there is no
-# other way solving this.
+# other way identifying whether teTeX 1.0 or above is installed.
 elif [ -z "`head -1 ${PREFIX}/share/texmf/doc/tetex/README |grep 1\.0`" ]; then
   echo "-------------------------------------------" 
   echo " You do not have teTeX-1.0 installed!"