7 files changed, 71 insertions, 129 deletions

diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index f20fde26ebf2..b8d736df3134 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -7,32 +7,26 @@
 
 PORTNAME=	CJK
 PORTVERSION=	4.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/cjk/\
   		ftp://ftp.ffii.org/pub/cjk/
 DISTNAME=	cjk-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rafan@infor.org
 COMMENT=	A LaTeX2e macro package which enables the use of CJK scripts
 
-BROKEN=		"Installation and dependency problems"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
-		ttf2pk:${PORTSDIR}/print/freetype:build
+		ttf2pk:${PORTSDIR}/print/freetype-tools
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
-NO_PACKAGE=	"Needs ttf2pk source from FreeType"
-
 USE_GMAKE=	yes
 USE_FREETYPE=	yes
 ARPHICDIR=	${PREFIX}/share/texmf/fonts/truetype/arphic
 
 MAN1=		bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \
-		hbf2gf.1 sjisconv.1 ttf2pk.1 ttf2tfm.1
+		hbf2gf.1 sjisconv.1
 
 pre-patch:
 	@${RM} -f ${WRKSRC}/Makefile
@@ -48,10 +42,9 @@ post-install:
 	${RM} -fr ${PREFIX}/share/examples/CJK
 	${CP} -R ${WRKSRC}/examples ${PREFIX}/share/examples/CJK
 	@${MKDIR} ${ARPHICDIR}	# Install Arphic fonts
-	@${LN} -s ${PREFIX}/share/fonts/TrueType/bkai00mp.ttf ${ARPHICDIR}/arb5_kai.ttf
-	@${LN} -s ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf ${ARPHICDIR}/arb5_sung.ttf
-	@${LN} -s ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf ${ARPHICDIR}/argb_sung.ttf
-	@${LN} -s ${PREFIX}/share/fonts/TrueType/gkai00mp.ttf ${ARPHICDIR}/argb_kai.ttf
-	@${LN} -s ttf2pk ${PREFIX}/share/texmf/ttf2tfm
+	@${LN} -fs ${PREFIX}/share/fonts/TrueType/bkai00mp.ttf ${ARPHICDIR}/arb5_kai.ttf
+	@${LN} -fs ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf ${ARPHICDIR}/arb5_sung.ttf
+	@${LN} -fs ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf ${ARPHICDIR}/argb_sung.ttf
+	@${LN} -fs ${PREFIX}/share/fonts/TrueType/gkai00mp.ttf ${ARPHICDIR}/argb_kai.ttf
 
 .include <bsd.port.mk>
diff --git a/chinese/CJK/files/UBig5.sfd.diff b/chinese/CJK/files/UBig5.sfd.diff
deleted file mode 100644
index 899896a35e91..000000000000
--- a/chinese/CJK/files/UBig5.sfd.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- UBig5.sfd.orig   Thu Dec 10 22:40:10 1998
-+++ UBig5.sfd        Fri Jan 21 23:38:41 2000
-@@ -1746,12 +1746,12 @@
-    0x6207 0x6B1E 0x7227 0x864C 0x8EA8 0x9482 0x9480 0x9481 \
-    0x9A69 0x9A68 0x9B2E 0x9E19 0x7229 0x864B 0x8B9F 0x9483 \
-    0x9C79 0x9EB7 0x7675 0x9A6B 0x9C7A 0x9E1D 0x7069 0x706A \
--   0x9EA4 0x9F7E 0x9F49 0x9F98 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
--   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
--   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
--   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
--   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
--   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-+   0x9EA4 0x9F7E 0x9F49 0x9F98 0x7881 0x92B9 0x88CF 0x58BB \
-+   0x6052 0x7CA7 0x5AFA 0x2554 0x2566 0x2557 0x2560 0x256C \
-+   0x2563 0x255A 0x2569 0x255D 0x2552 0x2564 0x2555 0x255E \
-+   0x256A 0x2561 0x2558 0x2567 0x255B 0x2553 0x2565 0x2556 \
-+   0x255F 0x256B 0x2562 0x2559 0x2568 0x255C 0x2551 0x2550 \
-+   0x256D 0x256E 0x2570 0x256F 0x25A0 0xFFFE 0xFFFE 0xFFFE \
-    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
-    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
diff --git a/chinese/CJK/files/patch-texinput::Bg5::c00bsmi.fd b/chinese/CJK/files/patch-texinput-Bg5-c00bsmi.fd
index 8ad26a7bf328..8ad26a7bf328 100644
--- a/chinese/CJK/files/patch-texinput::Bg5::c00bsmi.fd
+++ b/chinese/CJK/files/patch-texinput-Bg5-c00bsmi.fd
diff --git a/chinese/CJK/pkg-deinstall b/chinese/CJK/pkg-deinstall
index f652ce9f0dab..917e6c2b0f32 100644
--- a/chinese/CJK/pkg-deinstall
+++ b/chinese/CJK/pkg-deinstall
@@ -7,7 +7,7 @@ fi
 
 TEXMFMAIN=`kpsexpand '$TEXMFMAIN'`
 TEXMFCNF=${TEXMFMAIN}/web2c/texmf.cnf
-SPECIALMAP=${TEXMFMAIN}/fontname/special.map
+SPECIALMAP=${TEXMFMAIN}-dist/fonts/map/fontname/special.map
 
 # Edit web2c/texmf.cnf
 sed -e "/ttf2pk/d" ${TEXMFCNF} > ${TEXMFCNF}.tmp
@@ -21,7 +21,6 @@ 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
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index b86cd5914ae5..7181c7e75c7d 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -13,57 +13,55 @@ bin/hbf2gf
 bin/pinyin
 bin/sjisconv
 bin/sjislatex
-bin/ttf2pk
-bin/ttf2tfm
-%%PORTDOCS%%share/doc/CJK/CEF.doc
-%%PORTDOCS%%share/doc/CJK/CJK.doc
-%%PORTDOCS%%share/doc/CJK/COPYING
-%%PORTDOCS%%share/doc/CJK/INSTALL
-%%PORTDOCS%%share/doc/CJK/TDS.doc
-%%PORTDOCS%%share/doc/CJK/chinese/README
-%%PORTDOCS%%share/doc/CJK/chinese/READMEb5.tex
-%%PORTDOCS%%share/doc/CJK/chinese/READMEgb.tex
-%%PORTDOCS%%share/doc/CJK/chinese/emTeXb5.doc
-%%PORTDOCS%%share/doc/CJK/chinese/teTeXb5.doc
-%%PORTDOCS%%share/doc/CJK/cjk-enc.doc
-%%PORTDOCS%%share/doc/CJK/commands.doc
-%%PORTDOCS%%share/doc/CJK/dvidrv.doc
-%%PORTDOCS%%share/doc/CJK/fonts.doc
-%%PORTDOCS%%share/doc/CJK/hbf2gf.doc
-%%PORTDOCS%%share/doc/CJK/history.2_5
-%%PORTDOCS%%share/doc/CJK/history.txt
-%%PORTDOCS%%share/doc/CJK/japanese/README
-%%PORTDOCS%%share/doc/CJK/japanese/ascii.doc
-%%PORTDOCS%%share/doc/CJK/japanese/japanese.doc
-%%PORTDOCS%%share/doc/CJK/japanese/japanese.jis
-%%PORTDOCS%%share/doc/CJK/japanese/jp-fonts.doc
-%%PORTDOCS%%share/doc/CJK/japanese/jp-tex.doc
-%%PORTDOCS%%share/doc/CJK/japanese/preview.doc
-%%PORTDOCS%%share/doc/CJK/japanese/shibuaki.doc
-%%PORTDOCS%%share/doc/CJK/pinyin.doc
-%%PORTDOCS%%share/doc/CJK/pyhyphen.doc
-%%PORTDOCS%%share/doc/CJK/ruby.doc
-%%PORTDOCS%%share/doc/CJK/thaifont.doc
-%%PORTDOCS%%share/doc/CJK/vertical.doc
+%%PORTDOCS%%%%DOCSDIR%%/CEF.doc
+%%PORTDOCS%%%%DOCSDIR%%/CJK.doc
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/TDS.doc
+%%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%%/history.2_5
+%%PORTDOCS%%%%DOCSDIR%%/history.txt
+%%PORTDOCS%%%%DOCSDIR%%/japanese/README
+%%PORTDOCS%%%%DOCSDIR%%/japanese/ascii.doc
+%%PORTDOCS%%%%DOCSDIR%%/japanese/japanese.doc
+%%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
 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/mule-2.3/cjk-enc.el
-share/examples/CJK/Big5.tex
-share/examples/CJK/Big5vert.tex
-share/examples/CJK/CEF_test.tex
-share/examples/CJK/CJKbabel.tex
-share/examples/CJK/GB.tex
-share/examples/CJK/JIS.tex
-share/examples/CJK/KS.tex
-share/examples/CJK/README
-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/examples/CJK/thai.tex
+%%EXAMPLESDIR%%/Big5.tex
+%%EXAMPLESDIR%%/Big5vert.tex
+%%EXAMPLESDIR%%/CEF_test.tex
+%%EXAMPLESDIR%%/CJKbabel.tex
+%%EXAMPLESDIR%%/GB.tex
+%%EXAMPLESDIR%%/JIS.tex
+%%EXAMPLESDIR%%/KS.tex
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/SJIS.tex
+%%EXAMPLESDIR%%/UTF8.tex
+%%EXAMPLESDIR%%/muletest.tex
+%%EXAMPLESDIR%%/py_test.tex
+%%EXAMPLESDIR%%/rubytest.tex
+%%EXAMPLESDIR%%/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
@@ -461,27 +459,13 @@ 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/tex/latex/CJK/thai/c90enc.def
-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/UBg5plus.sfd
-share/texmf/ttf2pk/UBig5.sfd
-share/texmf/ttf2pk/UGB.sfd
-share/texmf/ttf2pk/UGBK.sfd
-share/texmf/ttf2pk/UJIS.sfd
-share/texmf/ttf2pk/UKS.sfd
-share/texmf/ttf2pk/Unicode.sfd
-share/texmf/ttf2pk/VPS.rpl
-share/texmf/ttf2pk/ttfonts.map
-%%PORTDOCS%%@dirrm share/doc/CJK/chinese
-%%PORTDOCS%%@dirrm share/doc/CJK/japanese
-%%PORTDOCS%%@dirrm share/doc/CJK
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/chinese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/japanese
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/emacs/site-lisp/CJK/emacs-20.3
 @dirrm share/emacs/site-lisp/CJK/mule-2.3
 @dirrm share/emacs/site-lisp/CJK
-@dirrm share/examples/CJK
+@dirrm %%EXAMPLESDIR%%
 @dirrm share/texmf/fonts/tfm/arphic/arb5kai
 @dirrm share/texmf/fonts/tfm/arphic/arb5sung
 @dirrm share/texmf/fonts/tfm/arphic/argbkai
@@ -502,4 +486,3 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/texmf/tex/latex/CJK/mule
 @dirrm share/texmf/tex/latex/CJK/thai
 @dirrm share/texmf/tex/latex/CJK
-@dirrm share/texmf/ttf2pk
diff --git a/chinese/CJK/scripts/post-install b/chinese/CJK/scripts/post-install
index e76ee2475e54..01efc32732bd 100644
--- a/chinese/CJK/scripts/post-install
+++ b/chinese/CJK/scripts/post-install
@@ -11,43 +11,36 @@ then
   rm ${PREFIX}/bin/mktexpk.CJK
 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.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}; )
+SPECIALMAP="${TEXMFMAIN}-dist/fonts/map/fontname/special.map"
 
 # fontname/special.map: add arb5kai/arb5sung/argbkai/argbsung entries.
-if [ -n "`grep arb5kai ${TEXMFMAIN}/fontname/special.map`" ]
+if [ -n "`grep arb5kai ${SPECIALMAP}`" ]
 then
   echo Seems arb5kai already in special.map, file untouched.
 else
-  echo "@c Arphic BIG5 Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map
-  echo "arb5kai		big5		arb5kai" >> ${TEXMFMAIN}/fontname/special.map
+  echo "@c Arphic BIG5 Kaiti TTF" >> ${SPECIALMAP}
+  echo "arb5kai		big5		arb5kai" >> ${SPECIALMAP}
 fi
-if [ -n "`grep arb5sung ${TEXMFMAIN}/fontname/special.map`" ]
+if [ -n "`grep arb5sung ${SPECIALMAP}`" ]
 then
   echo Seems arb5sung already in special.map, file untouched.
 else
-  echo "@c Arphic BIG5 Mingti TTF" >> ${TEXMFMAIN}/fontname/special.map
-  echo "arb5sung		big5		arb5sung" >> ${TEXMFMAIN}/fontname/special.map
+  echo "@c Arphic BIG5 Mingti TTF" >> ${SPECIALMAP}
+  echo "arb5sung		big5		arb5sung" >> ${SPECIALMAP}
 fi
-if [ -n "`grep argbkai ${TEXMFMAIN}/fontname/special.map`" ]
+if [ -n "`grep argbkai ${SPECIALMAP}`" ]
 then
   echo Seems argbkai already in special.map, file untouched.
 else
-  echo "@c Arphic GB Kaiti TTF" >> ${TEXMFMAIN}/fontname/special.map
-  echo "argbkai		gb		argbkai" >> ${TEXMFMAIN}/fontname/special.map
+  echo "@c Arphic GB Kaiti TTF" >> ${SPECIALMAP}
+  echo "argbkai		gb		argbkai" >> ${SPECIALMAP}
 fi
-if [ -n "`grep argbsung ${TEXMFMAIN}/fontname/special.map`" ]
+if [ -n "`grep argbsung ${SPECIALMAP}`" ]
 then
   echo Seems argbsung already in special.map, file untouched.
 else
-  echo "@c Arphic GB Sungti TTF" >> ${TEXMFMAIN}/fontname/special.map
-  echo "argbsung		gb		argbsung" >> ${TEXMFMAIN}/fontname/special.map
+  echo "@c Arphic GB Sungti TTF" >> ${SPECIALMAP}
+  echo "argbsung		gb		argbsung" >> ${SPECIALMAP}
 fi
 
 # ttf2pk/ttfonts.map: add arb5kai/arb5sung/argbkai/argbsung entries.
@@ -76,11 +69,6 @@ else
   echo "argbsung@UGB@   argb_sung Pid=3 Eid=1" >> ${TEXMFMAIN}/ttf2pk/ttfonts.map
 fi
 
-# ttf2pk/UBig5.sfd: apply patch to support Eten's extention
-(cd ${TEXMFMAIN}/ttf2pk;
- patch < ${FILESDIR}/UBig5.sfd.diff;
- rm -f UBig5.sfd.orig; )
-
 # web2c/texmf.cnf
 if [ -n "`grep TTF2PKINPUTS ${TEXMFMAIN}/web2c/texmf.cnf`" ]
 then
diff --git a/chinese/CJK/scripts/pre-build b/chinese/CJK/scripts/pre-build
index 3c415af4b1ec..1ed3d9ae54e2 100644
--- a/chinese/CJK/scripts/pre-build
+++ b/chinese/CJK/scripts/pre-build
@@ -2,7 +2,7 @@
 PATH=/bin:/usr/bin; export PATH
 
 # Check if teTeX is installed.
-if [ ! -f ${PREFIX}/share/texmf/doc/tetex/teTeX-FAQ ]; then
+if [ ! -f ${LOCALBASE}/share/texmf/doc/tetex/teTeX-FAQ ]; then
   echo "-----------------------------------------"
   echo "teTeX is not installed!"
   echo "It's recommended to use CJK upon teTeX!"