3 files changed, 23 insertions, 21 deletions

diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index 0943d6997c37..b404fa54b524 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.01
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 DISTNAME=	xpdf-korean
@@ -15,27 +16,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Korean xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
-		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-Korea1-0:${PORTSDIR}/print/adobe-cmaps \
+		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
 		${X11BASE}/lib/X11/fonts/TrueType/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf
 
+NO_BUILD=	yes
 USE_X_PREFIX=	yes
+SUB_FILES=	dot.xpdfrc
+SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR}
+
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 INSTALL_FILES=	Adobe-Korea1.cidToUnicode ISO-2022-KR.unicodeMap \
-		README dot.xpdfrc
+		README
 
 .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/korean
+	${MKDIR} ${DATADIR}/korean
+	${INSTALL_DATA} ${WRKDIR}/dot.xpdfrc ${DATADIR}/korean
 .for i in ${INSTALL_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/xpdf/korean
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}/korean
 .endfor
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/korean/xpdf/files/dot.xpdfrc b/korean/xpdf/files/dot.xpdfrc.in
index 11f107e847f1..87d1f4dbee1b 100644
--- a/korean/xpdf/files/dot.xpdfrc
+++ b/korean/xpdf/files/dot.xpdfrc.in
@@ -1,8 +1,9 @@
 #Korean PDF resources
+# $FreeBSD$
 cidToUnicode	Adobe-Korea1	%%PREFIX%%/share/xpdf/korean/Adobe-Korea1.cidToUnicode
 unicodeMap	ISO-2022-KR	%%PREFIX%%/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir		Adobe-Korea1	%%LOCALBASE%%/share/ghostscript/Resource/CMap
-toUnicodeDir			%%LOCALBASE%%/share/ghostscript/Resource/CMap
+cMapDir		Adobe-Korea1	%%ADOBECMAPDIR%%
+toUnicodeDir			%%ADOBECMAPDIR%%
 displayNamedCIDFontTT	Batang		"%%X11BASE%%/lib/X11/fonts/TrueType/UnBatang.ttf"
 displayNamedCIDFontTT	Batang,Bold	"%%X11BASE%%/lib/X11/fonts/TrueType/UnBatangBold.ttf"
 displayNamedCIDFontTT	Dotum		"%%X11BASE%%/lib/X11/fonts/TrueType/UnDotum.ttf"
diff --git a/korean/xpdf/pkg-plist b/korean/xpdf/pkg-plist
index dc49ec5dce00..ff83f008d52f 100644
--- a/korean/xpdf/pkg-plist
+++ b/korean/xpdf/pkg-plist
@@ -1,9 +1,9 @@
-share/xpdf/korean/Adobe-Korea1.cidToUnicode
-share/xpdf/korean/ISO-2022-KR.unicodeMap
-share/xpdf/korean/README
-@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.korea
-@unexec (umask 222; grep -F -v --file=%D/share/xpdf/korean/dot.xpdfrc %D/etc/xpdfrc.korea > %D/etc/xpdfrc)
-share/xpdf/korean/dot.xpdfrc
-@unexec rm -f %D/etc/xpdfrc.korea
-@dirrm share/xpdf/korean
-@dirrm share/xpdf
+@comment $FreeBSD$
+%%DATADIR%%/korean/Adobe-Korea1.cidToUnicode
+%%DATADIR%%/korean/ISO-2022-KR.unicodeMap
+%%DATADIR%%/korean/README
+@unexec cp %D/etc/xpdfrc %D/etc/xpdfrc.korea
+@unexec (umask 222; /usr/bin/sed '/^#Korean PDF resources$/,/^#Korean PDF resources$/d' < %D/etc/xpdfrc.korea > %D/etc/xpdfrc && rm -f %D/etc/xpdfrc.korea)
+%%DATADIR%%/korean/dot.xpdfrc
+@dirrm %%DATADIR%%/korean
+@dirrmtry %%DATADIR%%