- Fix RUN_DEPENDS.

- Use SUB_FILES for doc.xpdfrc.
- Fix absolute pathnames in doc.xpdfrc.
- Bump PORTREVISION because of print/adobe-cmaps update.

Approved by:	dryice at dryice dot name (maintainer)

3 files changed, 25 insertions, 20 deletions

diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 7c9f573e6cd5..58fa622aee05 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	20040727
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN} \
@@ -20,16 +20,21 @@ MAINTAINER=	dryice@dryice.name
 COMMENT=	Chinese xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf\
-		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-CNS1-0:${PORTSDIR}/print/adobe-cmaps \
+		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
 		${LOCALBASE}/share/arphicttf/logo.gif:${PORTSDIR}/chinese/arphicttf
 
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
+SUB_FILES=	dot.xpdfrc
+SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
+
 SIMP_FILES=	Adobe-GB1.cidToUnicode EUC-CN.unicodeMap GBK.unicodeMap \
 		ISO-2022-CN.unicodeMap README
 TRAD_FILES=	Adobe-CNS1.cidToUnicode Big5.unicodeMap \
 		Big5ascii.unicodeMap README
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
+
 do-install:
 	@${MKDIR} ${DATADIR}/chinese-simplified
 .for i in ${SIMP_FILES}
@@ -39,7 +44,7 @@ do-install:
 .for i in ${TRAD_FILES}
 	${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-traditional/${i} ${DATADIR}/chinese-traditional
 .endfor
-	${INSTALL_DATA} ${FILESDIR}/dot.xpdfrc ${DATADIR}/chinese-traditional
+	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${DATADIR}/chinese-traditional
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/chinese/xpdf/files/dot.xpdfrc b/chinese/xpdf/files/dot.xpdfrc
deleted file mode 100644
index cd0492d67338..000000000000
--- a/chinese/xpdf/files/dot.xpdfrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#----- begin Chinese Traditional support package (2004-jul-27)
-cidToUnicode	Adobe-CNS1	/usr/X11R6/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
-unicodeMap	Big5		/usr/X11R6/share/xpdf/chinese-traditional/Big5.unicodeMap
-unicodeMap	Big5ascii	/usr/X11R6/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir		Adobe-CNS1	/usr/local/share/ghostscript/Resource/CMap
-toUnicodeDir			/usr/local/share/ghostscript/Resource/CMap
-displayCIDFontTT	Adobe-CNS1	/usr/local/share/fonts/TrueType/bkai00mp.ttf
-#----- end Chinese Traditional support package
-#----- begin Chinese Simplified support package (2004-jul-27)
-cidToUnicode	Adobe-GB1	/usr/X11R6/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
-unicodeMap	ISO-2022-CN	/usr/X11R6/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
-unicodeMap	EUC-CN		/usr/X11R6/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
-unicodeMap	GBK		/usr/X11R6/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir		Adobe-GB1	/usr/local/share/ghostscript/Resource/CMap
-toUnicodeDir			/usr/local/share/ghostscript/Resource/CMap
-displayCIDFontTT	Adobe-GB1	/usr/local/share/fonts/TrueType/gkai00mp.ttf
-#----- end Chinese Simplified support package
diff --git a/chinese/xpdf/files/dot.xpdfrc.in b/chinese/xpdf/files/dot.xpdfrc.in
new file mode 100644
index 000000000000..4f1911746e87
--- /dev/null
+++ b/chinese/xpdf/files/dot.xpdfrc.in
@@ -0,0 +1,17 @@
+#----- begin Chinese Traditional support package (2004-jul-27)
+cidToUnicode	Adobe-CNS1	%%X11BASE%%/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
+unicodeMap	Big5		%%X11BASE%%/share/xpdf/chinese-traditional/Big5.unicodeMap
+unicodeMap	Big5ascii	%%X11BASE%%/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
+cMapDir		Adobe-CNS1	%%ADOBECMAPDIR%%
+toUnicodeDir			%%ADOBECMAPDIR%%
+displayCIDFontTT	Adobe-CNS1	%%LOCALBASE%%/share/fonts/TrueType/bkai00mp.ttf
+#----- end Chinese Traditional support package
+#----- begin Chinese Simplified support package (2004-jul-27)
+cidToUnicode	Adobe-GB1	%%X11BASE%%/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
+unicodeMap	ISO-2022-CN	%%X11BASE%%/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+unicodeMap	EUC-CN		%%X11BASE%%/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
+unicodeMap	GBK		%%X11BASE%%/share/xpdf/chinese-simplified/GBK.unicodeMap
+cMapDir		Adobe-GB1	%%ADOBECMAPDIR%%
+toUnicodeDir			%%ADOBECMAPDIR%%
+displayCIDFontTT	Adobe-GB1	%%LOCALBASE%%/share/fonts/TrueType/gkai00mp.ttf
+#----- end Chinese Simplified support package