diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 910992c84f93..92bc66d2f90a 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -1,44 +1,44 @@
 # New ports collection makefile for:	ja-xpdf
 # Date created:		21 Avr 2002
 # Whom:			MITA Yoshio <mita@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xpdf
 PORTVERSION=	3.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-japanese
 
-MAINTAINER=	mita@FreeBSD.org
+MAINTAINER=	ports@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 \
+		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
 		${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
 USE_X_PREFIX=	yes
+NO_BUILD=	yes
+SUB_FILES=	dot.xpdfrc
+SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
+
 INSTALL_FILES=	Adobe-Japan1.cidToUnicode ISO-2022-JP.unicodeMap \
 		EUC-JP.unicodeMap Shift-JIS.unicodeMap \
-		README dot.xpdfrc
+		README
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 
 .if defined(WITHOUT_X11)
 BROKEN=		"Broken dependency when WITHOUT_X11 set"
 .endif
 
-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
+	${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
 
 .include <bsd.port.mk>
diff --git a/japanese/xpdf/files/dot.xpdfrc b/japanese/xpdf/files/dot.xpdfrc.in
similarity index 94%
rename from japanese/xpdf/files/dot.xpdfrc
rename to japanese/xpdf/files/dot.xpdfrc.in
index 0839304ecc48..be3aca389cec 100644
--- a/japanese/xpdf/files/dot.xpdfrc
+++ b/japanese/xpdf/files/dot.xpdfrc.in
@@ -1,28 +1,28 @@
 #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
-cMapDir		Adobe-Japan1	%%LOCALBASE%%/share/ghostscript/Resource/CMap
-toUnicodeDir			%%LOCALBASE%%/share/ghostscript/Resource/CMap
+cMapDir		Adobe-Japan1	%%ADOBECMAPDIR%%
+toUnicodeDir			%%ADOBECMAPDIR%%
 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	Ryumin-Light-Identity		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
 displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf"
 displayNamedCIDFontTT	Ryumin-Light-Identity-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	GothicBBB-Medium-Identity	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
 displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%X11BASE%%/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf"
 displayNamedCIDFontTT	GothicBBB-Medium-Identity-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