4 files changed, 36 insertions, 18 deletions

diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 4fbd8baa64cd..42fff3e69b3f 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	2.02
+PORTVERSION=	3.00
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-japanese
@@ -14,23 +14,26 @@ DISTNAME=	xpdf-japanese
 MAINTAINER=	mita@FreeBSD.org
 COMMENT=	Japanese xpdf font support
 
-RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf\
-		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-Japan1-0:${PORTSDIR}/print/adobe-cmaps\
-		${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
+RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
+		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-Japan1-0:${PORTSDIR}/print/adobe-cmaps \
+		${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
-BROKEN=		"Checksum mismatch"
-
-NO_BUILD=	yes
 USE_X_PREFIX=	yes
 INSTALL_FILES=	Adobe-Japan1.cidToUnicode ISO-2022-JP.unicodeMap \
 		EUC-JP.unicodeMap Shift-JIS.unicodeMap \
-		README
+		README dot.xpdfrc
+
+do-build:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	        -e 's|%%X11BASE%%|${X11BASE}|g' \
+	        -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+			${FILESDIR}/dot.xpdfrc > ${WRKSRC}/dot.xpdfrc
+
 do-install:
 	${MKDIR} ${PREFIX}/share/xpdf/japanese
 .for i in ${INSTALL_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/xpdf/japanese
 .endfor
-	${INSTALL_DATA} ${FILESDIR}/dot.xpdfrc ${PREFIX}/share/xpdf/japanese
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/xpdf/distinfo b/japanese/xpdf/distinfo
index a5ef947074b7..ce2e364e708e 100644
--- a/japanese/xpdf/distinfo
+++ b/japanese/xpdf/distinfo
@@ -1 +1,2 @@
-MD5 (xpdf-japanese.tar.gz) = 7f3d680a49fd71cb86c0d60527402217
+MD5 (xpdf-japanese.tar.gz) = 2fe6d4701482af0d69084c574fe14d90
+SIZE (xpdf-japanese.tar.gz) = 494624
diff --git a/japanese/xpdf/files/dot.xpdfrc b/japanese/xpdf/files/dot.xpdfrc
index 816e516bbf1c..36f996e83be0 100644
--- a/japanese/xpdf/files/dot.xpdfrc
+++ b/japanese/xpdf/files/dot.xpdfrc
@@ -1,8 +1,22 @@
 #Japanese PDF resources
-cidToUnicode Adobe-Japan1 /usr/X11R6/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-unicodeMap   ISO-2022-JP  /usr/X11R6/share/xpdf/japanese/ISO-2022-JP.unicodeMap
-unicodeMap   EUC-JP  /usr/X11R6/share/xpdf/japanese/EUC-JP.unicodeMap
-unicodeMap   Shift-JIS  /usr/X11R6/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir      Adobe-Japan1 /usr/local/share/ghostscript/Resource/CMap
-toUnicodeDir  /usr/local/share/ghostscript/Resource/CMap
-displayCIDFontX Adobe-Japan1    '-alias-fixed-medium-r-normal--%s-*-*-*-c-*-jisx0208.1983-0' ISO-2022-JP
+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
+cMapDir		Adobe-Japan1	%%LOCALBASE%%/share/ghostscript/Resource/CMap
+toUnicodeDir			%%LOCALBASE%%/share/ghostscript/Resource/CMap
+displayNamedCIDFontTT	Ryumin-Light		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	Ryumin-Light-V		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	HeiseiMin-W3H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	FutoMinA101-Bold-V	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	GothicBBB-Medium-V	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	HeiseiKakuGo-W5H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+displayNamedCIDFontTT	FutoGoB101-Bold-V	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
+#Japanese PDF resources
diff --git a/japanese/xpdf/pkg-install b/japanese/xpdf/pkg-install
index 31881f15f0c2..7fc369ace2a1 100644
--- a/japanese/xpdf/pkg-install
+++ b/japanese/xpdf/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
 fi
 XPDFRC=${PKG_PREFIX}/etc/xpdfrc
 ADDRESOURCE=${PKG_PREFIX}/share/xpdf/japanese/dot.xpdfrc
-/usr/bin/grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nojapan
+/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