From f5904870de6f2043c76d83974245a951af0e645d Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 24 Apr 2007 12:52:52 +0000
Subject: Use japanese/ipa-ttfonts as the default Japanese TrueType font if any
 (i.e. no dependency added).  Bump PORTREVISION.

---
 print/ghostscript-gpl/Makefile.inc             |  2 +-
 print/ghostscript-gpl/files/patch-lib::cidfmap | 21 +++++----------------
 print/ghostscript8/Makefile.inc                |  2 +-
 print/ghostscript8/files/patch-lib::cidfmap    | 21 +++++----------------
 print/gsfonts/Makefile                         |  5 ++++-
 print/gsfonts/pkg-plist                        |  2 ++
 6 files changed, 18 insertions(+), 35 deletions(-)

(limited to 'print')

diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 76371fb69530..25f14f474277 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	2
+GS_REVISION=	3
 GS_EPOCH=	0
diff --git a/print/ghostscript-gpl/files/patch-lib::cidfmap b/print/ghostscript-gpl/files/patch-lib::cidfmap
index 78c204e203e1..a231ec0f220e 100644
--- a/print/ghostscript-gpl/files/patch-lib::cidfmap
+++ b/print/ghostscript-gpl/files/patch-lib::cidfmap
@@ -1,22 +1,11 @@
---- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
-+++ lib/cidfmap	Sun Jun 13 23:58:08 2004
-@@ -26,3 +26,38 @@
+--- lib/cidfmap.orig	Thu Dec 29 04:56:24 2005
++++ lib/cidfmap	Mon Apr  9 00:47:56 2007
+@@ -26,3 +26,27 @@
  %   /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]
-+>> ;
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
 +
 +/HeiseiMin-W3		/Ryumin-Light ;
 +%/HeiseiMin-W3		/WadaMin-Regular ;
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 76371fb69530..25f14f474277 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	2
+GS_REVISION=	3
 GS_EPOCH=	0
diff --git a/print/ghostscript8/files/patch-lib::cidfmap b/print/ghostscript8/files/patch-lib::cidfmap
index 78c204e203e1..a231ec0f220e 100644
--- a/print/ghostscript8/files/patch-lib::cidfmap
+++ b/print/ghostscript8/files/patch-lib::cidfmap
@@ -1,22 +1,11 @@
---- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
-+++ lib/cidfmap	Sun Jun 13 23:58:08 2004
-@@ -26,3 +26,38 @@
+--- lib/cidfmap.orig	Thu Dec 29 04:56:24 2005
++++ lib/cidfmap	Mon Apr  9 00:47:56 2007
+@@ -26,3 +26,27 @@
  %   /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]
-+>> ;
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
 +
 +/HeiseiMin-W3		/Ryumin-Light ;
 +%/HeiseiMin-W3		/WadaMin-Regular ;
diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index 20bdfd041f2b..68f14e4970c8 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsfonts
 PORTVERSION=	8.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ \
 		${MASTER_SITE_TEX_CTAN:S/$/:CTAN/}
@@ -60,6 +60,9 @@ install-fonts:
 	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale.urw ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/Fontmap ${FONTSDIR}
+	cd ${FONTSDIR} && \
+		${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/ipam.ttf Ryumin-Light.ttf; \
+		${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/ipag.ttf GothicBBB-Medium.ttf
 
 install-docs:
 .if !defined(NOPORTDOCS)
diff --git a/print/gsfonts/pkg-plist b/print/gsfonts/pkg-plist
index 83ad5ee89ac4..2becf2df2335 100644
--- a/print/gsfonts/pkg-plist
+++ b/print/gsfonts/pkg-plist
@@ -152,6 +152,8 @@
 %%FONTSDIR%%/z003034l.afm
 %%FONTSDIR%%/z003034l.pfb
 %%FONTSDIR%%/z003034l.pfm
+%%FONTSDIR%%/Ryumin-Light.ttf
+%%FONTSDIR%%/GothicBBB-Medium.ttf
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.tweaks
-- 
cgit v1.2.3