10 files changed, 100 insertions, 75 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index fc13a4f95c8f..70229f349836 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -80,6 +80,7 @@
     SUBDIR += font-mplus-ipa
     SUBDIR += font-sazanami
     SUBDIR += font-shinonome
+    SUBDIR += font-std
     SUBDIR += font-ume
     SUBDIR += font-vlgothic
     SUBDIR += freepwing
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 6b8916fc32d9..95667cc53194 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 DISTFILES=	# empty
 
@@ -17,7 +17,7 @@ COMMENT=	A meta-port which setups Japanese fonts
 RUN_DEPENDS=	\
 		${FONTSDIR}/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \
 		${FONTSDIR}/5x10B.pcf.gz:${PORTSDIR}/japanese/k10 \
-		${FONTSDIR}/shnmk12.pcf.gz:${PORTSDIR}/japanese/shinonome \
+		${LOCALBASE}/share/font-shinonome/shnmk12.pcf.gz:${PORTSDIR}/japanese/font-shinonome \
 		${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
 		${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \
 		${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \
diff --git a/japanese/font-std/Makefile b/japanese/font-std/Makefile
new file mode 100644
index 000000000000..333f25df1627
--- /dev/null
+++ b/japanese/font-std/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:	font-std
+# Date created:		15 May 2009
+# Whom:			hrs
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-std
+PORTVERSION=	0.0.20090515
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Japanese Standard Fonts
+
+BUILD_DEPENDS=	${LOCALBASE}/share/font-ipa/ipam.otf:${PORTSDIR}/japanese/font-ipa \
+		${LOCALBASE}/share/font-ipa/ipag.otf:${PORTSDIR}/japanese/font-ipa
+
+NO_BUILD=	yes
+PLIST_FILES=	${FONTSDIR}/std.ja_JP/Ryumin-Light \
+		${FONTSDIR}/std.ja_JP/GothicBBB-Medium \
+		${FONTSDIR}/std.ja_JP/Mincho \
+		${FONTSDIR}/std.ja_JP/Gothic
+PLIST_DIRS=	${FONTSDIR}/std.ja_JP
+FONTSDIR=	${PREFIX}/share/fonts
+
+STD=		Mincho Gothic Ryumin-Light GothicBBB-Medium
+STD_Mincho=	${LOCALBASE}/share/font-ipa/ipam.otf
+STD_Gothic=	${LOCALBASE}/share/font-ipa/ipag.otf
+STD_Ryumin-Light=	${LOCALBASE}/share/font-ipa/ipam.otf
+STD_GothicBBB-Medium=	${LOCALBASE}/share/font-ipa/ipag.otf
+
+do-fetch:
+	@${DO_NADA}
+
+do-install:
+	${MKDIR} ${FONTSDIR}/std.ja_JP
+.for F in ${STD}
+	${LN} -s -f ${STD_${F}} ${FONTSDIR}/std.ja_JP/${F}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/japanese/font-std/pkg-descr b/japanese/font-std/pkg-descr
new file mode 100644
index 000000000000..f4ed2d17e0cb
--- /dev/null
+++ b/japanese/font-std/pkg-descr
@@ -0,0 +1,2 @@
+This port installs standard fonts for Japanese used in the Ports
+Collection.
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 3c51ac6bc2be..849de93bc586 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tgif-resource
 PORTVERSION=	4.1.45
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese graphics
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,7 +16,8 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese Resource and Configuration for TGIF
 
 RUN_DEPENDS=	tgif:${PORTSDIR}/graphics/tgif \
-		${LOCALBASE}/share/ipa-ttfonts/fonts/ipag.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+		${LOCALBASE}/share/fonts/TTF/ipagui.ttf:${PORTSDIR}/japanese/font-mplus-ipa \
+		${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index c4d302317ffd..e7cfdb0e96d6 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese print
 MASTER_SITES=	SF/xdvi
 PKGNAMEPREFIX=	ja-
@@ -28,8 +28,8 @@ RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \
-		${LOCALBASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \
-		${LOCALBASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts
+		${LOCALBASE}/${MINCHO}:${PORTSDIR}/japanese/font-std \
+		${LOCALBASE}/${GOTHIC}:${PORTSDIR}/japanese/font-std
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -80,28 +80,29 @@ XDVIETCDIR=	${TEXMFDIR}/xdvi/ptex
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 
 CIDFONTDIR=	${TEXMFDIR}/dvipdfm/CIDFont
-TTFMINCHO=	lib/X11/fonts/TrueType/ipam.ttf
-TTFGOTHIC=	lib/X11/fonts/TrueType/ipag.ttf
+MINCHO=		share/fonts/std.ja_JP/Ryumin-Light
+GOTHIC=		share/fonts/std.ja_JP/GothicBBB-Medium
 VFONTCAPFT_SRC=	${WRKSRC}/vfontmap.freetype
 VFONTCAPFT_SUB=	CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \
-		TTFMINCHO=${LOCALBASE}/${TTFMINCHO} \
-		TTFGOTHIC=${LOCALBASE}/${TTFGOTHIC}
+		MINCHO=${LOCALBASE}/${MINCHO} \
+		GOTHIC=${LOCALBASE}/${GOTHIC}
 
 .include <bsd.port.pre.mk>
 
 BDPI?=		600
 SHRINK?=	6
 DVIPS?=		dvips
+MF_MODES=	118:bitgraph \
+		240:canonlbp \
+		300:cx \
+		360:canonbjc \
+		400:nexthi \
+		600:ljfour
+.for B in ${BDPI}
+MF_MODE?=	${MF_MODES:M${B}*:C/.*://}
+.endfor
 .if !defined(MF_MODE) || empty(MF_MODE)
-MF_MODE!=	case ${BDPI} in\
-		118) ${ECHO_CMD} bitgraph ;;\
-		240) ${ECHO_CMD} canonlbp ;;\
-		300) ${ECHO_CMD} cx ;;\
-		360) ${ECHO_CMD} canonbjc ;;\
-		400) ${ECHO_CMD} nexthi ;;\
-		600) ${ECHO_CMD} ljfour ;;\
-		*) ${ECHO_CMD} cx ;;\
-		esac
+MF_MODE=	cx
 .endif
 
 DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
@@ -120,6 +121,8 @@ DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
 	READMEs/README.xdvik20c-j1.0p1.patch READMEs/README.vf2ft \
 	READMEs/README.xdvik-22.15-j1.04.patch
 
+PORTDOCS=	${DOCS:S,READMEs/,,}
+
 pre-build:
 	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 	${SED} ${VFONTCAPFT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -140,7 +143,8 @@ post-install:
 		${PREFIX}/${XDVIETCDIR}/XDvi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/texk/xdvik/,} ${DOCSDIR}
+	cd ${WRKSRC}/texk/xdvik && \
+		${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	${MKTEXLSR}
 
diff --git a/japanese/xdvik/files/vfontmap.freetype b/japanese/xdvik/files/vfontmap.freetype
index 6ef76725dea8..c2538ce57458 100644
--- a/japanese/xdvik/files/vfontmap.freetype
+++ b/japanese/xdvik/files/vfontmap.freetype
@@ -8,7 +8,7 @@
 %    "tfm name2" "{,unicode,adobejapan,cidv}"
 
 %%%CIDFONTDIR%%/HiraMinPro-W3.otf
-%%TTFMINCHO%%
+%%MINCHO%%
 	min
 	tmin
 	nmin
@@ -16,7 +16,7 @@
 	jis-v
 	dm
 %%%CIDFONTDIR%%/HiraKakuPro-W6.otf
-%%TTFGOTHIC%%
+%%GOTHIC%%
 	goth
 	tgoth
 	ngoth
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 5e0f1130e524..e7c1c97667c3 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -11,31 +11,5 @@ libexec/xdviprint
 %%XDVIETCDIR%%/xdvipaper.jdvi2kps
 %%XDVIETCDIR%%/XDvi
 @dirrm %%XDVIETCDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp.html
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HEADERS.DOC
-%%PORTDOCS%%%%DOCSDIR%%/InternalVars
-%%PORTDOCS%%%%DOCSDIR%%/README.jp+toc+hal2
-%%PORTDOCS%%%%DOCSDIR%%/README.jp-patch
-%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi
-%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi+paper
-%%PORTDOCS%%%%DOCSDIR%%/README.miyu-beta6
-%%PORTDOCS%%%%DOCSDIR%%/README.ptex
-%%PORTDOCS%%%%DOCSDIR%%/README.src-specials
-%%PORTDOCS%%%%DOCSDIR%%/README.t1fonts
-%%PORTDOCS%%%%DOCSDIR%%/README.t1mapper
-%%PORTDOCS%%%%DOCSDIR%%/README.tasai-ussy
-%%PORTDOCS%%%%DOCSDIR%%/README.vf2ft
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-jp
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.0.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.1p5.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20a-j1.1.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0+hal2+dvisel
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0p1.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch
-%%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%
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