- Add a patch to fix a bug which prevents rendering multibyte

  TrueType fonts from working.

- A file cidfmap now includes entries for Ryumin-Light and
  GothicBBB-Medium.  They points japanese/kochi-ttfonts by default
  (but this port does not depend on it).

Approved by:	linimon (mentor)

15 files changed, 243 insertions, 6 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index bb3b902e01ab..56f8d09a3c64 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -61,7 +61,8 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION="${GS_VERSION}"
+PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
+		CIDFONTDIR=${CIDFONTDIR}
 
 SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
 		WITHOUT_X11="${WITHOUT_X11}" \
@@ -113,6 +114,7 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
+CIDFONTDIR=	${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
 
 # Additional Drivers:
 
@@ -439,6 +441,7 @@ pre-su-install:
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
+	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
 	${ECHO_MSG} ">>>   stripping gs ..."
 .if defined(WITH_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index 1aa8a557c6f1..0e56519292bc 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	5
+GS_REVISION=	6
 GS_EPOCH=	1
diff --git a/print/ghostscript-afpl/files/patch-lib::cidfmap b/print/ghostscript-afpl/files/patch-lib::cidfmap
new file mode 100644
index 000000000000..78c204e203e1
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib::cidfmap
@@ -0,0 +1,41 @@
+--- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
++++ lib/cidfmap	Sun Jun 13 23:58:08 2004
+@@ -26,3 +26,38 @@
+ %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
+ %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+ %
++/Ryumin-Light <<
++/FileType /TrueType
++/Path (kochi-mincho-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/GothicBBB-Medium <<
++/FileType /TrueType
++/Path (kochi-gothic-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++%/HeiseiMin-W3		/WadaMin-Regular ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++%/HeiseiKakuGo-W5	/WadaGo-Bold ;
++/FutoMinA101-Bold	/Ryumin-Light ;
++%/FutoMinA101-Bold	/WadaMin-Regular ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++%/FutoGoB101-Bold	/WadaGo-Bold ;
++/Jun101-Light		/Ryumin-Light ;
++%/Jun101-Light		/WadaMin-Regular ;
++/MidashiGo-MB31		/GothicBBB-Medium ;
++%/MidashiGo-MB31	/WadaGo-Bold ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
diff --git a/print/ghostscript-afpl/files/patch-lib::gs_ttf.ps b/print/ghostscript-afpl/files/patch-lib::gs_ttf.ps
new file mode 100644
index 000000000000..aeec34bd0c60
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lib::gs_ttf.ps
@@ -0,0 +1,33 @@
+--- lib/gs_ttf.ps.orig	Sat Feb 14 04:43:51 2004
++++ lib/gs_ttf.ps	Mon Jun  7 12:51:44 2004
+@@ -519,7 +519,7 @@
+   (maxp) 1 index
+   (name) 1 index
+   (OS/2) 1 index
+-  (post) 1 index
++  (post) { .readbigtable }
+   (vhea) 1 index
+ 	% Big tables
+   (glyf) { .readbigtable }
+@@ -854,10 +854,17 @@
+   } ifelse
+ 		% Stack: ... /FontInfo mark key1 value1 ...
+   post null ne {
+-    /ItalicAngle post 4 gets32 65536.0 div
+-    /isFixedPitch post 12 getu32 0 ne
+-    /UnderlinePosition post 8 gets16 upem div
+-    /UnderlineThickness post 10 gets16 upem div
++    post type /arraytype eq {
++      % this post table is a big table. /post should be [(...) ...]
++      % data we actually need here should be first one in array.
++      /posttable post 1 get def
++    } {
++      /posttable post def
++    } ifelse
++    /ItalicAngle posttable 4 gets32 65536.0 div
++    /isFixedPitch posttable 12 getu32 0 ne
++    /UnderlinePosition posttable 8 gets16 upem div
++    /UnderlineThickness posttable 10 gets16 upem div
+   } if
+   counttomark 0 ne { .dicttomark } { pop pop } ifelse
+   /XUID [orgXUID 42 curxuid]
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 463e41bddd9f..0f02d3552a82 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -407,6 +407,8 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
+@exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
+@unexec rm -f %%CIDFONTDIR%%/CIDFont
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index bb3b902e01ab..56f8d09a3c64 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -61,7 +61,8 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION="${GS_VERSION}"
+PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
+		CIDFONTDIR=${CIDFONTDIR}
 
 SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
 		WITHOUT_X11="${WITHOUT_X11}" \
@@ -113,6 +114,7 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
+CIDFONTDIR=	${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
 
 # Additional Drivers:
 
@@ -439,6 +441,7 @@ pre-su-install:
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
+	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
 	${ECHO_MSG} ">>>   stripping gs ..."
 .if defined(WITH_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 1aa8a557c6f1..0e56519292bc 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	5
+GS_REVISION=	6
 GS_EPOCH=	1
diff --git a/print/ghostscript-gpl/files/patch-lib::cidfmap b/print/ghostscript-gpl/files/patch-lib::cidfmap
new file mode 100644
index 000000000000..78c204e203e1
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib::cidfmap
@@ -0,0 +1,41 @@
+--- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
++++ lib/cidfmap	Sun Jun 13 23:58:08 2004
+@@ -26,3 +26,38 @@
+ %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
+ %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+ %
++/Ryumin-Light <<
++/FileType /TrueType
++/Path (kochi-mincho-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/GothicBBB-Medium <<
++/FileType /TrueType
++/Path (kochi-gothic-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++%/HeiseiMin-W3		/WadaMin-Regular ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++%/HeiseiKakuGo-W5	/WadaGo-Bold ;
++/FutoMinA101-Bold	/Ryumin-Light ;
++%/FutoMinA101-Bold	/WadaMin-Regular ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++%/FutoGoB101-Bold	/WadaGo-Bold ;
++/Jun101-Light		/Ryumin-Light ;
++%/Jun101-Light		/WadaMin-Regular ;
++/MidashiGo-MB31		/GothicBBB-Medium ;
++%/MidashiGo-MB31	/WadaGo-Bold ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
diff --git a/print/ghostscript-gpl/files/patch-lib::gs_ttf.ps b/print/ghostscript-gpl/files/patch-lib::gs_ttf.ps
new file mode 100644
index 000000000000..aeec34bd0c60
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-lib::gs_ttf.ps
@@ -0,0 +1,33 @@
+--- lib/gs_ttf.ps.orig	Sat Feb 14 04:43:51 2004
++++ lib/gs_ttf.ps	Mon Jun  7 12:51:44 2004
+@@ -519,7 +519,7 @@
+   (maxp) 1 index
+   (name) 1 index
+   (OS/2) 1 index
+-  (post) 1 index
++  (post) { .readbigtable }
+   (vhea) 1 index
+ 	% Big tables
+   (glyf) { .readbigtable }
+@@ -854,10 +854,17 @@
+   } ifelse
+ 		% Stack: ... /FontInfo mark key1 value1 ...
+   post null ne {
+-    /ItalicAngle post 4 gets32 65536.0 div
+-    /isFixedPitch post 12 getu32 0 ne
+-    /UnderlinePosition post 8 gets16 upem div
+-    /UnderlineThickness post 10 gets16 upem div
++    post type /arraytype eq {
++      % this post table is a big table. /post should be [(...) ...]
++      % data we actually need here should be first one in array.
++      /posttable post 1 get def
++    } {
++      /posttable post def
++    } ifelse
++    /ItalicAngle posttable 4 gets32 65536.0 div
++    /isFixedPitch posttable 12 getu32 0 ne
++    /UnderlinePosition posttable 8 gets16 upem div
++    /UnderlineThickness posttable 10 gets16 upem div
+   } if
+   counttomark 0 ne { .dicttomark } { pop pop } ifelse
+   /XUID [orgXUID 42 curxuid]
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 463e41bddd9f..0f02d3552a82 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -407,6 +407,8 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
+@exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
+@unexec rm -f %%CIDFONTDIR%%/CIDFont
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index bb3b902e01ab..56f8d09a3c64 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -61,7 +61,8 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION="${GS_VERSION}"
+PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
+		CIDFONTDIR=${CIDFONTDIR}
 
 SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
 		WITHOUT_X11="${WITHOUT_X11}" \
@@ -113,6 +114,7 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
+CIDFONTDIR=	${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
 
 # Additional Drivers:
 
@@ -439,6 +441,7 @@ pre-su-install:
 
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
+	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
 	${ECHO_MSG} ">>>   stripping gs ..."
 .if defined(WITH_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 1aa8a557c6f1..0e56519292bc 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	5
+GS_REVISION=	6
 GS_EPOCH=	1
diff --git a/print/ghostscript8/files/patch-lib::cidfmap b/print/ghostscript8/files/patch-lib::cidfmap
new file mode 100644
index 000000000000..78c204e203e1
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib::cidfmap
@@ -0,0 +1,41 @@
+--- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
++++ lib/cidfmap	Sun Jun 13 23:58:08 2004
+@@ -26,3 +26,38 @@
+ %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
+ %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+ %
++/Ryumin-Light <<
++/FileType /TrueType
++/Path (kochi-mincho-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/GothicBBB-Medium <<
++/FileType /TrueType
++/Path (kochi-gothic-subst.ttf)
++/SubfontID 0
++/CSI [(Japan1) 3]
++>> ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++%/HeiseiMin-W3		/WadaMin-Regular ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++%/HeiseiKakuGo-W5	/WadaGo-Bold ;
++/FutoMinA101-Bold	/Ryumin-Light ;
++%/FutoMinA101-Bold	/WadaMin-Regular ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++%/FutoGoB101-Bold	/WadaGo-Bold ;
++/Jun101-Light		/Ryumin-Light ;
++%/Jun101-Light		/WadaMin-Regular ;
++/MidashiGo-MB31		/GothicBBB-Medium ;
++%/MidashiGo-MB31	/WadaGo-Bold ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
diff --git a/print/ghostscript8/files/patch-lib::gs_ttf.ps b/print/ghostscript8/files/patch-lib::gs_ttf.ps
new file mode 100644
index 000000000000..aeec34bd0c60
--- /dev/null
+++ b/print/ghostscript8/files/patch-lib::gs_ttf.ps
@@ -0,0 +1,33 @@
+--- lib/gs_ttf.ps.orig	Sat Feb 14 04:43:51 2004
++++ lib/gs_ttf.ps	Mon Jun  7 12:51:44 2004
+@@ -519,7 +519,7 @@
+   (maxp) 1 index
+   (name) 1 index
+   (OS/2) 1 index
+-  (post) 1 index
++  (post) { .readbigtable }
+   (vhea) 1 index
+ 	% Big tables
+   (glyf) { .readbigtable }
+@@ -854,10 +854,17 @@
+   } ifelse
+ 		% Stack: ... /FontInfo mark key1 value1 ...
+   post null ne {
+-    /ItalicAngle post 4 gets32 65536.0 div
+-    /isFixedPitch post 12 getu32 0 ne
+-    /UnderlinePosition post 8 gets16 upem div
+-    /UnderlineThickness post 10 gets16 upem div
++    post type /arraytype eq {
++      % this post table is a big table. /post should be [(...) ...]
++      % data we actually need here should be first one in array.
++      /posttable post 1 get def
++    } {
++      /posttable post def
++    } ifelse
++    /ItalicAngle posttable 4 gets32 65536.0 div
++    /isFixedPitch posttable 12 getu32 0 ne
++    /UnderlinePosition posttable 8 gets16 upem div
++    /UnderlineThickness posttable 10 gets16 upem div
+   } if
+   counttomark 0 ne { .dicttomark } { pop pop } ifelse
+   /XUID [orgXUID 42 curxuid]
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 463e41bddd9f..0f02d3552a82 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -407,6 +407,8 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
+@exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
+@unexec rm -f %%CIDFONTDIR%%/CIDFont
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc