5 files changed, 67 insertions, 67 deletions

diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index ef247225dc6a..9a0913318513 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -6,38 +6,45 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	3.00
-PORTREVISION=	4
+PORTVERSION=	3.02
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
+PKGNAMESUFFIX=	-jafont
 DISTNAME=	xpdf-japanese
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Japanese xpdf font support
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Japanese font support for xpdf
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${LOCALBASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
+		${FONTSDIR}/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
 
 NO_BUILD=	yes
 SUB_FILES=	dot.xpdfrc
-SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
+SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
+		FONTSDIR=${FONTSDIR}
+PLIST_SUB=	EXTRARC=${EXTRARC}
+DATADIR=	${PREFIX}/share/xpdf
 
+FONTSDIR=	${LOCALBASE}/share/fonts/TrueType
+EXTRARC=	${DATADIR}/japanese/dot.xpdfrc
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 INSTALL_FILES=	Adobe-Japan1.cidToUnicode ISO-2022-JP.unicodeMap \
 		EUC-JP.unicodeMap Shift-JIS.unicodeMap \
-		README
-ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
-
-.if defined(WITHOUT_X11)
-BROKEN=		"Broken dependency when WITHOUT_X11 set"
-.endif
+		README ../dot.xpdfrc
 
 do-install:
-	${MKDIR} ${PREFIX}/share/xpdf/japanese
-	${INSTALL_DATA} ${WRKDIR}/dot.xpdfrc ${PREFIX}/share/xpdf/japanese
-.for i in ${INSTALL_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/xpdf/japanese
-.endfor
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${MKDIR} ${DATADIR}/japanese
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/japanese
+
+post-install:
+	exec < ${LOCALBASE}/etc/xpdfrc; \
+		${RM} -f ${LOCALBASE}/etc/xpdfrc; \
+		( ${GREP} -v "${EXTRARC}"; \
+		  ${ECHO_CMD} "include ${EXTRARC}" ) \
+		> ${LOCALBASE}/etc/xpdfrc
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${LOCALBASE}/etc/xpdfrc
+	${CHMOD} 0444 ${LOCALBASE}/etc/xpdfrc
 
 .include <bsd.port.mk>
diff --git a/japanese/xpdf/distinfo b/japanese/xpdf/distinfo
index 8c9624fb1101..d9885501f8a2 100644
--- a/japanese/xpdf/distinfo
+++ b/japanese/xpdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpdf-japanese.tar.gz) = 2fe6d4701482af0d69084c574fe14d90
-SHA256 (xpdf-japanese.tar.gz) = 0e2ac5eda981701da744102494cca9698cb42d8ae8820fa041721f8dc94797ec
-SIZE (xpdf-japanese.tar.gz) = 494624
+MD5 (xpdf-japanese.tar.gz) = a11ee6476d0f381983664fc614f7a95e
+SHA256 (xpdf-japanese.tar.gz) = b7419fc10d078628a407e5966146450acbe81d9a5e7f63448916536f0ac6432f
+SIZE (xpdf-japanese.tar.gz) = 494803
diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in
index 0bcf1b25579b..222b39f59116 100644
--- a/japanese/xpdf/files/dot.xpdfrc.in
+++ b/japanese/xpdf/files/dot.xpdfrc.in
@@ -1,28 +1,32 @@
 #Japanese PDF resources
-cidToUnicode	Adobe-Japan1	%%PREFIX%%/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-unicodeMap	ISO-2022-JP	%%PREFIX%%/share/xpdf/japanese/ISO-2022-JP.unicodeMap
-unicodeMap	EUC-JP		%%PREFIX%%/share/xpdf/japanese/EUC-JP.unicodeMap
-unicodeMap	Shift-JIS	%%PREFIX%%/share/xpdf/japanese/Shift-JIS.unicodeMap
+# $FreeBSD$
+cidToUnicode	Adobe-Japan1	%%DATADIR%%/japanese/Adobe-Japan1.cidToUnicode
+unicodeMap	ISO-2022-JP	%%DATADIR%%/japanese/ISO-2022-JP.unicodeMap
+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			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-H			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-V			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	HeiseiMin-W3H			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold			"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
-displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%LOCALBASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+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"
 #Japanese PDF resources
diff --git a/japanese/xpdf/pkg-install b/japanese/xpdf/pkg-install
deleted file mode 100644
index e05ac775d28d..000000000000
--- a/japanese/xpdf/pkg-install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-if [ "$2" = "PRE-INSTALL" ]; then
-  exit 0
-fi
-umask 222
-XPDFRC=${PKG_PREFIX}/etc/xpdfrc
-ADDRESOURCE=${PKG_PREFIX}/share/xpdf/japanese/dot.xpdfrc
-/usr/bin/sed '/^#Japanese PDF resources$/,/^#Japanese PDF resources$/d' ${XPDFRC} > ${XPDFRC}.nojapan
-/bin/rm -f ${XPDFRC}
-/bin/cat ${XPDFRC}.nojapan ${ADDRESOURCE} > ${XPDFRC}
-/bin/rm -f ${XPDFRC}.nojapan
diff --git a/japanese/xpdf/pkg-plist b/japanese/xpdf/pkg-plist
index 25dbf599fbf4..2dfcdeae200c 100644
--- a/japanese/xpdf/pkg-plist
+++ b/japanese/xpdf/pkg-plist
@@ -1,11 +1,11 @@
-share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-share/xpdf/japanese/EUC-JP.unicodeMap
-share/xpdf/japanese/ISO-2022-JP.unicodeMap
-share/xpdf/japanese/README
-share/xpdf/japanese/Shift-JIS.unicodeMap
-@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.japan
-@unexec (umask 222; grep -F -v --file=%D/share/xpdf/japanese/dot.xpdfrc %D/etc/xpdfrc.japan > %D/etc/xpdfrc)
-share/xpdf/japanese/dot.xpdfrc
-@unexec rm -f %D/etc/xpdfrc.japan
-@dirrm share/xpdf/japanese
-@dirrm share/xpdf
+@comment $FreeBSD$
+%%DATADIR%%/japanese/Adobe-Japan1.cidToUnicode
+%%DATADIR%%/japanese/EUC-JP.unicodeMap
+%%DATADIR%%/japanese/ISO-2022-JP.unicodeMap
+%%DATADIR%%/japanese/README
+%%DATADIR%%/japanese/Shift-JIS.unicodeMap
+@exec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; ( grep -v "%%EXTRARC%%"; echo "include %%EXTRARC%%" ) > %D/etc/xpdfrc; chmod 0444 %D/etc/xpdfrc
+@unexec exec < %D/etc/xpdfrc; rm -f %D/etc/xpdfrc; grep -v "%%EXTRARC%%" > %D/etc/xpdfrc
+%%DATADIR%%/japanese/dot.xpdfrc
+@dirrm %%DATADIR%%/japanese
+@dirrmtry %%DATADIR%%