japanese/font-std, chinese/font-std, and dependency fixups due

to it have been added.  These are to install standard fonts used in the
Ports Collection.  Currently they contain:

 std.ja_JP/Mincho
 std.ja_JP/Gothic
 std.ja_JP/Ryumin-Light
 std.ja_JP/GothicBBB-Medium
 std.zh_CN/STHeiti-Regular
 std.zh_CN/STSong-Light
 std.zh_CN/MSung-Light
 std.zh_CN/MHei-Medium

under ${PREFIX}/share/fonts/.  They are just symlinks to
corresponding font files.  The symlink names are based on popular
PostScript font names.

Applications should refer the font files via XLFD or fontconfig
first.  If they need a direct reference to the font file, please use
files in std.*/*.  This is because direct reference to a specific
font name in an application configuration file makes the maintenance
difficult when the font file name is changed, for example.

2 files changed, 26 insertions, 26 deletions

diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 8fd74c6b63a8..ea6d34f2bc6c 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-jafont
@@ -18,7 +18,8 @@ COMMENT=	Japanese font support for xpdf
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${FONTSDIR}/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+		${FONTSDIR}/Ryumin-Light:${PORTSDIR}/japanese/font-std \
+		${FONTSDIR}/GothicBBB-Medium:${PORTSDIR}/japanese/font-std
 
 NO_BUILD=	yes
 SUB_FILES=	dot.xpdfrc
@@ -27,7 +28,7 @@ SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 PLIST_SUB=	EXTRARC=${EXTRARC}
 DATADIR=	${PREFIX}/share/xpdf
 
-FONTSDIR=	${LOCALBASE}/share/fonts/TrueType
+FONTSDIR=	${LOCALBASE}/share/fonts/std.ja_JP
 EXTRARC=	${DATADIR}/japanese/dot.xpdfrc
 ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 INSTALL_FILES=	Adobe-Japan1.cidToUnicode ISO-2022-JP.unicodeMap \
diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in
index 222b39f59116..a5090a3d4e78 100644
--- a/japanese/xpdf/files/dot.xpdfrc.in
+++ b/japanese/xpdf/files/dot.xpdfrc.in
@@ -6,27 +6,26 @@ unicodeMap	EUC-JP		%%DATADIR%%/japanese/EUC-JP.unicodeMap
 unicodeMap	Shift-JIS	%%DATADIR%%/japanese/Shift-JIS.unicodeMap
 cMapDir		Adobe-Japan1	%%ADOBECMAPDIR%%
 toUnicodeDir			%%ADOBECMAPDIR%%
-displayNamedCIDFontTT	Ryumin-Light			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	Ryumin-Light-H			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	Ryumin-Light-V			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	HeiseiMin-W3H			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	MS-Mincho			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium		"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-H		"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-V		"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	MS-Gothic			"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%FONTSDIR%%/ipam.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold			"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%FONTSDIR%%/ipag.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%FONTSDIR%%/ipag.ttf"
+displayNamedCIDFontTT	Ryumin-Light			"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	Ryumin-Light-H			"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	Ryumin-Light-V			"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	Ryumin-Light-Identity		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	HeiseiMin-W3H			"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	MS-Mincho			"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	FutoMinA101-Bold		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%FONTSDIR%%/Ryumin-Light"
+displayNamedCIDFontTT	GothicBBB-Medium		"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	GothicBBB-Medium-H		"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	GothicBBB-Medium-V		"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	MS-Gothic			"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	FutoGoB101-Bold			"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%FONTSDIR%%/GothicBBB-Medium"
+displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%FONTSDIR%%/GothicBBB-Medium"
 #Japanese PDF resources