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.
author: hrs <hrs@FreeBSD.org> 2009-05-31 17:19:10 +0800
committer: hrs <hrs@FreeBSD.org> 2009-05-31 17:19:10 +0800
commit: 2d6c1c335f7da84184c928e71005108a81b7a49c (patch)
tree: 0b71f26548d713c59e615d22ca5e8eec7b2a1a50
parent: e108b1d688b6fbd6d4c5dab75af56f0d50d70156 (diff)
download: freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.tar.gz
freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.tar.zst
freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.zip
27 files changed, 258 insertions, 192 deletions
diff --git a/UPDATING b/UPDATING
index 03a913243111..34cae94c2d98 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,54 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20090530:
+  AFFECTS: users of Japanese and Chinese fonts
+  AUTHOR: hrs@FreeBSD.org
+
+  Ports for Japanese fonts have been reorganized in the following way:
+
+  japanese/ipa-ttfonts -> japanese/font-mplus-ipa
+  japanese/ipa-ttfonts -> japanese/font-ipa
+  japanese/kochi-ttfonts -> japanese/font-kochi
+  japanese/mplusfonts -> japanese/font-mplus
+  japanese/sazanami-ttf -> japanese/font-sazanami
+  japanese/shinonome -> japanese/font-shinonome
+  japanese/umefont -> japanese/font-ume
+  japanese/vlgothic -> japanese/font-vlgothic
+
+  While basically these are port name changes for consistency,
+  installation directories are also changed:
+
+  font files -> ${PREFIX}/share/${PORTNAME}/*
+  symlinks -> ${PREFIX}/share/fonts/{TTF,OTF,fontname,...}/*
+  symlinks -> ${PREFIX}/lib/X11/fonts/{TTF,OTF,misc,fontname,...}/*
+
+  A user-visible one is that the directory name "TrueType" is replaced
+  with "TTF".
+
+  Also, japanese/font-std and chinese/font-std have been added as
+  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.
+
 20090516:
   AFFECTS: users of devel/viewvc 
   AUTHOR: pgollucci@FreeBSD.org
diff --git a/chinese/Makefile b/chinese/Makefile
index 275ff2e67596..69830b45164f 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -38,6 +38,7 @@
     SUBDIR += fcitx
     SUBDIR += firebird
     SUBDIR += fireflyttf
+    SUBDIR += font-std
     SUBDIR += fortunetw
     SUBDIR += fqterm
     SUBDIR += gb2jis
diff --git a/chinese/font-std/Makefile b/chinese/font-std/Makefile
new file mode 100644
index 000000000000..8017f3b47b8a
--- /dev/null
+++ b/chinese/font-std/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	font-std
+# Date created:		15 May 2009
+# Whom:			hrs
+#
+# $FreeBSD$
+#
+
+PORTNAME=	font-std
+PORTVERSION=	0.0.20090515
+CATEGORIES=	chinese x11-fonts
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Chinese Standard Fonts
+
+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+
+NO_BUILD=	yes
+PLIST_FILES=	${FONTSDIR}/std.zh_CN/STHeiti-Regular \
+		${FONTSDIR}/std.zh_CN/STSong-Light \
+		${FONTSDIR}/std.zh_CN/MSung-Light \
+		${FONTSDIR}/std.zh_CN/MHei-Medium
+PLIST_DIRS=	${FONTSDIR}/std.zh_CN
+FONTSDIR=	${PREFIX}/share/fonts
+
+do-fetch:
+	@${DO_NADA}
+
+do-install:
+	${MKDIR} ${FONTSDIR}/std.zh_CN
+	${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf ${FONTSDIR}/std.zh_CN/STHeiti-Regular
+	${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/gbsn00lp.ttf ${FONTSDIR}/std.zh_CN/STSong-Light
+	${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf ${FONTSDIR}/std.zh_CN/MSung-Light
+	${LN} -s -f ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf ${FONTSDIR}/std.zh_CN/MHei-Medium
+
+.include <bsd.port.mk>
diff --git a/chinese/font-std/pkg-descr b/chinese/font-std/pkg-descr
new file mode 100644
index 000000000000..50ef9d65aa22
--- /dev/null
+++ b/chinese/font-std/pkg-descr
@@ -0,0 +1,2 @@
+This port installs standard fonts for Chinese used in the Ports
+Collection.
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 8f91d496a271..4419149415d9 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN} \
@@ -22,7 +22,9 @@ COMMENT=	Chinese font support for xpdf
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${FONTSDIR}/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+		${FONTSDIR}/STHeiti-Regular:${PORTSDIR}/chinese/font-std \
+		${FONTSDIR}/STSong-Light:${PORTSDIR}/chinese/font-std \
+		${FONTSDIR}/MSung-Light:${PORTSDIR}/chinese/font-std
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -32,7 +34,7 @@ SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 PLIST_SUB=	EXTRARC=${EXTRARC}
 DATADIR=	${PREFIX}/share/xpdf
 
-FONTSDIR=	${LOCALBASE}/share/fonts/TrueType
+FONTSDIR=	${LOCALBASE}/share/fonts/std.zh_CN
 EXTRARC=	${DATADIR}/chinese-traditional/dot.xpdfrc
 ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 SIMP_FILES=	Adobe-GB1.cidToUnicode EUC-CN.unicodeMap GBK.unicodeMap \
diff --git a/chinese/xpdf/files/dot.xpdfrc.in b/chinese/xpdf/files/dot.xpdfrc.in
index 3d0d8dd9c176..0a3163d1422f 100644
--- a/chinese/xpdf/files/dot.xpdfrc.in
+++ b/chinese/xpdf/files/dot.xpdfrc.in
@@ -4,7 +4,7 @@ unicodeMap	Big5		%%DATADIR%%/chinese-traditional/Big5.unicodeMap
 unicodeMap	Big5ascii	%%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
 cMapDir		Adobe-CNS1	%%ADOBECMAPDIR%%
 toUnicodeDir			%%ADOBECMAPDIR%%
-displayCIDFontTT	Adobe-CNS1	%%FONTSDIR%%/bkai00mp.ttf
+displayCIDFontTT	Adobe-CNS1	%%FONTSDIR%%/STHeiti-Regular
 #----- end Chinese Traditional support package
 #----- begin Chinese Simplified support package (2004-jul-27)
 cidToUnicode	Adobe-GB1	%%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
@@ -13,5 +13,5 @@ unicodeMap	EUC-CN		%%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
 unicodeMap	GBK		%%DATADIR%%/chinese-simplified/GBK.unicodeMap
 cMapDir		Adobe-GB1	%%ADOBECMAPDIR%%
 toUnicodeDir			%%ADOBECMAPDIR%%
-displayCIDFontTT	Adobe-GB1	%%FONTSDIR%%/gkai00mp.ttf
+displayCIDFontTT	Adobe-GB1	%%FONTSDIR%%/STSong-Light
 #----- end Chinese Simplified support package
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
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 1a61058a94d4..df0c31c13394 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cups-pstoraster
 PORTVERSION=	8.15.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	ghostscript/${PORTVERSION}
@@ -20,7 +20,7 @@ COMMENT=	Postscript interpreter for CUPS printing to non-PS printers
 LIB_DEPENDS=	cupsimage.2:${PORTSDIR}/print/cups-image
 
 .if defined(WITH_CJK)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/ipag.ttf:${PORTSDIR}/japanese/ipa-ttfonts \
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std \
 		${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-lib_cidfmap
 .endif
diff --git a/print/cups-pstoraster/files/extra-patch-lib_cidfmap b/print/cups-pstoraster/files/extra-patch-lib_cidfmap
index a231ec0f220e..88790f724b56 100644
--- a/print/cups-pstoraster/files/extra-patch-lib_cidfmap
+++ b/print/cups-pstoraster/files/extra-patch-lib_cidfmap
@@ -4,8 +4,8 @@
  %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
  %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
  %
-+/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] >> ;
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 3] >> ;
 +
 +/HeiseiMin-W3		/Ryumin-Light ;
 +%/HeiseiMin-W3		/WadaMin-Regular ;
diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile
index 4abdd24411ef..02cbef152139 100644
--- a/print/ghostscript7-commfont/Makefile
+++ b/print/ghostscript7-commfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript7-commfont
 PORTVERSION=	7.07
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/print/ghostscript7-commfont/files/Makefile.in b/print/ghostscript7-commfont/files/Makefile.in
index 8fd5e50f2477..ca964984a91f 100644
--- a/print/ghostscript7-commfont/files/Makefile.in
+++ b/print/ghostscript7-commfont/files/Makefile.in
@@ -25,33 +25,33 @@ TEMPLATES_CID=	ko.serif ko.sansserif
 CS.CMAPS=	ac15
 
 CS.SERIF.GENERIC=	STSong-Light
-CS.SERIF.GENERIC_SUBST=	STSong-Light.ttf
+CS.SERIF.GENERIC_SUBST=	STSong-Light
 CS.SERIF=	STSong-Light
 
 CS.SANSSERIF.GENERIC=	STHeiti-Regular
-CS.SANSSERIF.GENERIC_SUBST=	STHeiti-Regular.ttf
+CS.SANSSERIF.GENERIC_SUBST=	STHeiti-Regular
 CS.SANSSERIF=	STHeiti-Regular
 
 CT.CMAPS=	ag15
 
 CT.SERIF.GENERIC=	MSung-Light
-CT.SERIF.GENERIC_SUBST=	MSung-Light.ttf
+CT.SERIF.GENERIC_SUBST=	MSung-Light
 CT.SERIF=	MSung-Light
 
 CT.SANSSERIF.GENERIC=	MHei-Medium
-CT.SANSSERIF.GENERIC_SUBST=	MHei-Medium.ttf
+CT.SANSSERIF.GENERIC_SUBST=	MHei-Medium
 CT.SANSSERIF=	MHei-Medium
 
 JA.CMAPS=	aj16 aj20
 
 JA.SERIF.GENERIC=	Ryumin-Light
-JA.SERIF.GENERIC_SUBST=	Ryumin-Light.ttf
+JA.SERIF.GENERIC_SUBST=	Ryumin-Light
 JA.SERIF=	Ryumin-Light \
 		FutoMinA101-Bold \
 		HeiseiMin-W3
 
 JA.SANSSERIF.GENERIC=	GothicBBB-Medium
-JA.SANSSERIF.GENERIC_SUBST=	GothicBBB-Medium.ttf
+JA.SANSSERIF.GENERIC_SUBST=	GothicBBB-Medium
 JA.SANSSERIF=	GothicBBB-Medium \
 		FutoGoB101-Bold \
 		HeiseiKakuGo-W5 \
diff --git a/print/ghostscript7-jpnfont/Makefile b/print/ghostscript7-jpnfont/Makefile
index 9f3ca703d8ea..03c8da615dcf 100644
--- a/print/ghostscript7-jpnfont/Makefile
+++ b/print/ghostscript7-jpnfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript7-jpnfont
 PORTVERSION=	7.07
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print japanese
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,7 +15,7 @@ DISTFILES=	# empty
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Japanese font support for Ghostscript 7.x
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts \
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std \
 		${LOCALBASE}/share/ghostscript/Resource/CIDFont/Ryumin-Light:${PORTSDIR}/print/ghostscript7-commfont
 
 # set these forcibly
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index d25942135371..fcfdc679a308 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript8
 PORTVERSION=	8.64
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
diff --git a/print/ghostscript8/files/patch-Resource-Init-cidfmap b/print/ghostscript8/files/patch-Resource-Init-cidfmap
index 6ca3ffd518a9..f51d0be6848c 100644
--- a/print/ghostscript8/files/patch-Resource-Init-cidfmap
+++ b/print/ghostscript8/files/patch-Resource-Init-cidfmap
@@ -1,11 +1,11 @@
---- Resource/Init/cidfmap.orig	2005-12-29 04:56:24.000000000 +0900
-+++ Resource/Init/cidfmap	2008-03-04 07:04:11.000000000 +0900
-@@ -26,3 +26,58 @@
+--- Resource/Init/cidfmap.orig	2008-08-08 13:22:38.000000000 +0900
++++ Resource/Init/cidfmap	2009-05-15 03:26:04.000000000 +0900
+@@ -26,3 +26,59 @@
  %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
  %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
  %
-+/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] >> ;
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 3] >> ;
 +
 +/Ryumin-Medium		/Ryumin-Light ;
 +/Ryumin-Regular		/Ryumin-Light ;
@@ -56,6 +56,7 @@
 +/HYSMyeongJo-Medium	/Munhwa-Regular ;
 +/HYRGoThic-Medium	/MunhwaGothic-Bold ;
 +
-+/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular.ttf) /SubfontID 0 /CSI [(CNS1) 5] >> ;
-+/STSong-Light << /FileType /TrueType /Path (STSong-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
-+/MSung-Light << /FileType /TrueType /Path (MSung-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
++/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular) /SubfontID 0 /CSI [(CNS1) 5] >> ;
++/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ;
++/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ;
++/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ;
diff --git a/print/ghostscript8/files/patch-lib-FAPIcidfmap b/print/ghostscript8/files/patch-lib-FAPIcidfmap
index f90521e1b400..156c3e8458f2 100644
--- a/print/ghostscript8/files/patch-lib-FAPIcidfmap
+++ b/print/ghostscript8/files/patch-lib-FAPIcidfmap
@@ -1,11 +1,11 @@
 --- lib/FAPIcidfmap.orig	2006-06-01 00:29:52.000000000 +0900
-+++ lib/FAPIcidfmap	2008-03-04 07:05:55.000000000 +0900
-@@ -29,4 +29,58 @@
++++ lib/FAPIcidfmap	2009-05-15 03:27:31.000000000 +0900
+@@ -29,4 +29,59 @@
  %
  %  /Ryumin-Medium     << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
  %  /HeiseiKakuGo-W5   << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
-+%/Ryumin-Light		<< /Path (Ryumin-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
-+%/GothicBBB-Medium	<< /Path (GothicBBB-Medium.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/Ryumin-Light		<< /Path (Ryumin-Light) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/GothicBBB-Medium	<< /Path (GothicBBB-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
 +
 +/Ryumin-Medium		/Ryumin-Light ;
 +/Ryumin-Regular		/Ryumin-Light ;
@@ -28,7 +28,7 @@
 +/HiraKakuStd-W8		/GothicBBB-Medium ;
 +
 +/HiraMaruPro-W4		/GothicBBB-Medium ;
-+
+ 
 +/HiraMinPro-W3		/Ryumin-Light ;
 +
 +/HeiseiMin-W3		/Ryumin-Light ;
@@ -38,7 +38,7 @@
 +/FutoMinA101Pro-Bold	/Ryumin-Light ;
 +/FutoGoB101-Bold	/GothicBBB-Medium ;
 +/FutoGoB101Pro-Bold	/GothicBBB-Medium ;
- 
++
 +/Jun101-Light		/Ryumin-Light ;
 +/Jun101Pro-Light	/Ryumin-Light ;
 +
@@ -56,6 +56,7 @@
 +/HYSMyeongJo-Medium	/Munhwa-Regular ;
 +/HYRGoThic-Medium	/MunhwaGothic-Bold ;
 +
-+%/STHeiti-Regular << /Path (STHeiti-Regular.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
-+%/STSong-Light << /Path (STSong-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
-+%/MSung-Light << /Path (MSung-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
++%/STHeiti-Regular << /Path (STHeiti-Regular) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/STSong-Light << /Path (STSong-Light) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
++%/MSung-Light << /Path (MSung-Light) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/MHei-Medium << /Path (MHei-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
diff --git a/print/gsfonts/Makefile b/print/gsfonts/Makefile
index a06a5f865cfa..1bae0ab3d26d 100644
--- a/print/gsfonts/Makefile
+++ b/print/gsfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsfonts
 PORTVERSION=	8.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ \
 		${MASTER_SITE_TEX_CTAN:S/$/:CTAN/}
@@ -15,74 +15,40 @@ MASTER_SITE_SUBDIR=	support/ghostscript/fonts/:CTAN
 DISTFILES=	${GS_FONTS_STD:S/$/:DEFAULT,CTAN/} ${GS_FONTS_OTHER:S/$/:DEFAULT,CTAN/}
 DIST_SUBDIR=	ghostscript
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fonts used by GNU Ghostscript (or X)
+MAINTAINER=	doceng@FreeBSD.org
+COMMENT=	Standard Fonts for Ghostscript
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-SUB_FILES=	pkg-message
-SUB_LIST=	FONTSDIR="${FONTSDIR}"
+PORTDOCS=	ChangeLog README README.tweaks TODO
 
-#
-# Local variables
-#
-
-FONTSDIR?=	${PREFIX}/share/ghostscript/fonts
+FONTSDIR=	${PREFIX}/share/ghostscript/fonts
 GS_FONTS_STD=	ghostscript-fonts-std-8.11.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
-CJKFONTS?=	TrueType/ipam.ttf Ryumin-Light.ttf \
-		TrueType/ipag.ttf GothicBBB-Medium.ttf \
-		TrueType/bkai00mp.ttf STHeiti-Regular.ttf \
-		TrueType/gbsn00lp.ttf STSong-Light.ttf \
-		TrueType/bsmi00lp.ttf MSung-Light.ttf
-.SILENT:
-
-post-patch:
-	${CP} ${WRKSRC}/fonts/fonts.scale ${WRKSRC}/fonts/fonts.scale.urw
-	${CP} ${FILESDIR}/fonts.scale ${WRKSRC}/fonts/fonts.scale
-	${CP} ${FILESDIR}/fonts.scale ${WRKSRC}/fonts/fonts.dir
-	${CP} ${FILESDIR}/Fontmap ${WRKSRC}/fonts/Fontmap
+CJKFONTS?=	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
 
-#
-# Install
-#
-
-do-install: install-fonts install-docs display-message
-
-install-fonts:
+do-install:
 	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/COPYING ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.afm ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.gsf ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfa ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfb ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pfm ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.dir ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/fonts.scale.urw ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/Fontmap ${FONTSDIR}
-	set -- ${CJKFONTS}; while :; do \
-	case $$# in \
-	0) break ;; \
-	*) LHS=$$1; shift; RHS=$$1; shift; \
-		cd ${FONTSDIR} \
-		&& ${LN} -s -f ${PREFIX}/share/fonts/$${LHS} $${RHS}; \
-	esac; \
+	cd ${WRKSRC}/fonts && \
+		${INSTALL_DATA} fonts.dir COPYING \
+			*.afm *.gsf *.pfa *.pfb *.pfm ${FONTSDIR}/ \
+		&& ${INSTALL_DATA} fonts.scale ${FONTSDIR}/fonts.scale.urw
+	cd ${FILESDIR} && \
+		${INSTALL_DATA} fonts.scale Fontmap ${FONTSDIR}/
+	for F in ${CJKFONTS}; do \
+		${LN} -s -f ${PREFIX}/share/fonts/$${F} ${FONTSDIR}/; \
 	done
 
-install-docs:
 .if !defined(NOPORTDOCS)
+post-install:
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/README.tweaks ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/TODO ${DOCSDIR}
+	cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-display-message:
-	${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/print/gsfonts/files/pkg-message.in b/print/gsfonts/files/pkg-message.in
deleted file mode 100644
index 36b5a77fe8d0..000000000000
--- a/print/gsfonts/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-
-IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these
-fonts before using.  The copyright can be found at %%FONTSDIR%%/COPYING.
-To use these fonts, follow the instructions below.
-
-Make sure that the freetype module is loaded.  If it is not, add the
-following line to the "Modules" section of XF86Config:
-
-	Load "freetype"
-
-Add the following line to the "Files" section of XF86Config:
-
-	FontPath "%%FONTSDIR%%/"
-
-===========================================================================
diff --git a/print/gsfonts/pkg-plist b/print/gsfonts/pkg-plist
index 37445171f8e5..2ab348a8f820 100644
--- a/print/gsfonts/pkg-plist
+++ b/print/gsfonts/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%FONTSDIR%%/COPYING
 %%FONTSDIR%%/Fontmap
 %%FONTSDIR%%/a010013l.afm
@@ -152,15 +153,10 @@
 %%FONTSDIR%%/z003034l.afm
 %%FONTSDIR%%/z003034l.pfb
 %%FONTSDIR%%/z003034l.pfm
-%%FONTSDIR%%/Ryumin-Light.ttf
-%%FONTSDIR%%/GothicBBB-Medium.ttf
-%%FONTSDIR%%/STHeiti-Regular.ttf
-%%FONTSDIR%%/STSong-Light.ttf
-%%FONTSDIR%%/MSung-Light.ttf
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.tweaks
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%FONTSDIR%%/Ryumin-Light
+%%FONTSDIR%%/GothicBBB-Medium
+%%FONTSDIR%%/STHeiti-Regular
+%%FONTSDIR%%/STSong-Light
+%%FONTSDIR%%/MSung-Light
 @dirrm %%FONTSDIR%%
 @dirrmtry share/ghostscript
author	hrs <hrs@FreeBSD.org>	2009-05-31 17:19:10 +0800
committer	hrs <hrs@FreeBSD.org>	2009-05-31 17:19:10 +0800
commit	2d6c1c335f7da84184c928e71005108a81b7a49c (patch)
tree	0b71f26548d713c59e615d22ca5e8eec7b2a1a50
parent	e108b1d688b6fbd6d4c5dab75af56f0d50d70156 (diff)
download	freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.tar.gz freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.tar.zst freebsd-ports-gnome-2d6c1c335f7da84184c928e71005108a81b7a49c.zip