- Enable UTF8 Arphic font by default

- Make UTF8 font name compatible with Debian/Ubuntu's latex-cjk package, so
  that users can compile his/her latex files in both environment.
- Bump PORTREVISION

3 files changed, 73 insertions, 2 deletions

diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index 8f4044932794..315ef36b709e 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex-cjk
 PORTVERSION=	4.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print chinese japanese korean
 MASTER_SITES=	http://cjk.ffii.org/ \
 		ftp://freebsd.csie.ntu.edu.tw/users/rafan/
@@ -41,7 +41,7 @@ WRKFONTDIR=	${WRKDIR}/fonts
 # Options: WITH_*/WITHOUT_*
 OPTIONS=	CCMAP       "CCT CCMap package (for PDFTeX's CID support)" on \
 		DVIPDFMX    "Install and configure DVIPDFMx for CJK" on \
-		UTF8ARPHIC  "Arphic free fonts in UTF-8 (no Type 1)" off
+		UTF8ARPHIC  "Arphic free fonts in UTF-8 (no Type 1)" on
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/latex-cjk/files/patch-texinput-UTF8-fdfiles b/print/latex-cjk/files/patch-texinput-UTF8-fdfiles
new file mode 100644
index 000000000000..3d83993cfd28
--- /dev/null
+++ b/print/latex-cjk/files/patch-texinput-UTF8-fdfiles
@@ -0,0 +1,65 @@
+--- texinput/UTF8/c70bkai.fd.orig	2009-08-12 01:28:25.000000000 +0800
++++ texinput/UTF8/c70bkai.fd	2009-08-12 01:28:53.000000000 +0800
+@@ -15,7 +15,11 @@
+ 
+ \DeclareFontFamily{C70}{bkai}{\hyphenchar \font\m@ne}
+ 
+-\DeclareFontShape{C70}{bkai}{m}{n}{<-> CJK * bkaiu}{\CJKnormal}
+-\DeclareFontShape{C70}{bkai}{bx}{n}{<-> CJKb * bkaiu}{\CJKbold}
++\DeclareFontShape{C70}{bkai}{m}{n}{<-> CJK * arb5kaiu}{\CJKnormal}
++\DeclareFontShape{C70}{bkai}{bx}{n}{<-> CJKb * arb5kaiu}{\CJKbold}
++\DeclareFontShape{C70}{bkai}{m}{sl}{<-> CJK * arb5kaiusl}{\CJKnormal}
++\DeclareFontShape{C70}{bkai}{bx}{sl}{<-> CJKb * arb5kaiusl}{\CJKbold}
++\DeclareFontShape{C70}{bkai}{m}{it}{<-> CJK * arb5kaiusl}{\CJKnormal}
++\DeclareFontShape{C70}{bkai}{bx}{it}{<-> CJKb * arb5kaiusl}{\CJKbold}
+ 
+ \endinput
+--- texinput/UTF8/c70bsmi.fd.orig	2009-08-12 01:29:35.000000000 +0800
++++ texinput/UTF8/c70bsmi.fd	2009-08-12 01:29:58.000000000 +0800
+@@ -15,7 +15,12 @@
+ 
+ \DeclareFontFamily{C70}{bsmi}{\hyphenchar \font\m@ne}
+ 
+-\DeclareFontShape{C70}{bsmi}{m}{n}{<-> CJK * bsmiu}{\CJKnormal}
+-\DeclareFontShape{C70}{bsmi}{bx}{n}{<-> CJKb * bsmiu}{\CJKbold}
++\DeclareFontShape{C70}{bsmi}{m}{n}{<-> CJK * arb5sungu}{\CJKnormal}
++\DeclareFontShape{C70}{bsmi}{bx}{n}{<-> CJKb * arb5sungu}{\CJKbold}
++\DeclareFontShape{C70}{bsmi}{m}{sl}{<-> CJK * arb5sungusl}{\CJKnormal}
++\DeclareFontShape{C70}{bsmi}{bx}{sl}{<-> CJKb * arb5sungusl}{\CJKbold}
++\DeclareFontShape{C70}{bsmi}{m}{it}{<-> CJK * arb5sungusl}{\CJKnormal}
++\DeclareFontShape{C70}{bsmi}{bx}{it}{<-> CJKb * arb5sungusl}{\CJKbold}
++
+ 
+ \endinput
+--- texinput/UTF8/c70gbsn.fd.orig	2009-08-12 01:31:12.000000000 +0800
++++ texinput/UTF8/c70gbsn.fd	2009-08-12 01:31:47.000000000 +0800
+@@ -15,7 +15,11 @@
+ 
+ \DeclareFontFamily{C70}{gbsn}{\hyphenchar \font\m@ne}
+ 
+-\DeclareFontShape{C70}{gbsn}{m}{n}{<-> CJK * gbsnu}{\CJKnormal}
+-\DeclareFontShape{C70}{gbsn}{bx}{n}{<-> CJKb * gbsnu}{\CJKbold}
++\DeclareFontShape{C70}{gbsn}{m}{n}{<-> CJK * argbsungu}{\CJKnormal}
++\DeclareFontShape{C70}{gbsn}{bx}{n}{<-> CJKb * argbsungu}{\CJKbold}
++\DeclareFontShape{C70}{gbsn}{m}{sl}{<-> CJK * argbsungusl}{\CJKnormal}
++\DeclareFontShape{C70}{gbsn}{bx}{sl}{<-> CJKb * argbsungusl}{\CJKbold}
++\DeclareFontShape{C70}{gbsn}{m}{it}{<-> CJK * argbsungusl}{\CJKnormal}
++\DeclareFontShape{C70}{gbsn}{bx}{it}{<-> CJKb * argbsungusl}{\CJKbold}
+ 
+ \endinput
+--- texinput/UTF8/c70gkai.fd.orig	2009-08-12 01:30:11.000000000 +0800
++++ texinput/UTF8/c70gkai.fd	2009-08-12 01:30:36.000000000 +0800
+@@ -15,7 +15,11 @@
+ 
+ \DeclareFontFamily{C70}{gkai}{\hyphenchar \font\m@ne}
+ 
+-\DeclareFontShape{C70}{gkai}{m}{n}{<-> CJK * gkaiu}{\CJKnormal}
+-\DeclareFontShape{C70}{gkai}{bx}{n}{<-> CJKb * gkaiu}{\CJKbold}
++\DeclareFontShape{C70}{gkai}{m}{n}{<-> CJK * argbkaiu}{\CJKnormal}
++\DeclareFontShape{C70}{gkai}{bx}{n}{<-> CJKb * argbkaiu}{\CJKbold}
++\DeclareFontShape{C70}{gkai}{m}{sl}{<-> CJK * argbkaiusl}{\CJKnormal}
++\DeclareFontShape{C70}{gkai}{bx}{sl}{<-> CJKb * argbkaiusl}{\CJKbold}
++\DeclareFontShape{C70}{gkai}{m}{it}{<-> CJK * argbkaiusl}{\CJKnormal}
++\DeclareFontShape{C70}{gkai}{bx}{it}{<-> CJKb * argbkaiusl}{\CJKbold}
+ 
+ \endinput
diff --git a/print/latex-cjk/files/pkg-message.in b/print/latex-cjk/files/pkg-message.in
index 4a98abe62499..69a57f274774 100644
--- a/print/latex-cjk/files/pkg-message.in
+++ b/print/latex-cjk/files/pkg-message.in
@@ -22,6 +22,9 @@ Then use ttf2tfm to generate corresponding tfm files.
      \begin{CJK}{GB}{song}
      \begin{CJK}{GB}{kai}
 
+   You can also use bkai instead of kai if you want to be compatible
+   with latex-cjk package on Debian/Ubuntu.
+
 2. By using "ccmap" with CJK, PDF generated by PDFTeX ("ccmap" does NOT
    work with LaTeX, DVIPS, DVIPDFm, etc.) may be searched for Chinese
    text, and may be copied Chinese text from, when viewed in Adobe Reader.
@@ -78,6 +81,9 @@ http://sarovar.org/tracker/index.php?func=detail&aid=306&group_id=106&atid=493
      \begin{CJK}{UTF8}{gbsong}  % Arphic Songti, GB2312 glyphs covered
      \begin{CJK}{UTF8}{gbkai}   % Arphic Kaiti,  GB2312 glyphs covered
 
+   If you want to be compatible with Debian/Ubuntu's latex-cjk package,
+   you can use bsmi, bkai, gbsn, and gkai, respectively.   
+
 6. If you want to use Type 1 fonts, use the following font names:
 
      \begin{CJK}{Bg5}{t1song}