Update to 3.03.

11 files changed, 266 insertions, 82 deletions

diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 88cde68392a7..30706015fdab 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	zh-xpdf
-# Date created:		21 Avr 2002
-# Whom:			chshen <statue@freebsd.sinica.edu.tw>
-#
+# Created by: chshen <statue@freebsd.sinica.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	xpdf
-PORTVERSION=	3.02
-PORTREVISION=	1
+PORTVERSION=	3.03
 PORTEPOCH=	2
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
@@ -15,8 +10,8 @@ MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	support/xpdf
 PKGNAMESUFFIX=	-zhfont
-DISTFILES=	xpdf-chinese-simplified-2004-jul-27.tar.gz \
-		xpdf-chinese-traditional-2004-jul-27.tar.gz
+DISTFILES=	xpdf-chinese-simplified-2011-sep-02${EXTRACT_SUFX} \
+		xpdf-chinese-traditional-2011-sep-02${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Chinese font support for xpdf
@@ -33,7 +28,6 @@ SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 		FONTSDIR=${FONTSDIR}
 PLIST_SUB=	EXTRARC=${EXTRARC}
-DATADIR=	${PREFIX}/share/xpdf
 
 FONTSDIR=	${LOCALBASE}/share/fonts/std.zh_CN
 EXTRARC=	${DATADIR}/chinese-traditional/dot.xpdfrc
@@ -51,6 +45,14 @@ do-install:
 	cd ${WRKSRC}/xpdf-chinese-traditional \
 		&& ${INSTALL_DATA} ${TRAD_FILES} ${DATADIR}/chinese-traditional
 	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${DATADIR}/chinese-traditional
+	${MKDIR} ${DATADIR}/chinese-traditional/CMap
+	cd ${DATADIR}/chinese-traditional/CMap && \
+		${FIND} ${ADOBECMAPDIR}/ac15/CMap \
+			-type f -exec ${LN} -s -f {} . \;
+	${MKDIR} ${DATADIR}/chinese-simplified/CMap
+	cd ${DATADIR}/chinese-simplified/CMap && \
+		${FIND} ${ADOBECMAPDIR}/ag15/CMap \
+			-type f -exec ${LN} -s -f {} . \;
 
 post-install:
 	exec < ${LOCALBASE}/etc/xpdfrc; \
diff --git a/chinese/xpdf/distinfo b/chinese/xpdf/distinfo
index 9962e65acf29..a00abe57d3ca 100644
--- a/chinese/xpdf/distinfo
+++ b/chinese/xpdf/distinfo
@@ -1,4 +1,4 @@
-SHA256 (xpdf-chinese-simplified-2004-jul-27.tar.gz) = ac886f7bccdc7c70fcfcbd9916ea907a93f0fe698ff7ca81da8f312c7fab07d7
-SIZE (xpdf-chinese-simplified-2004-jul-27.tar.gz) = 835960
-SHA256 (xpdf-chinese-traditional-2004-jul-27.tar.gz) = 49269682ac4b5af2b54763dd2fe7f539ba0ec2452f0545980f4927ffa2a5f2ed
-SIZE (xpdf-chinese-traditional-2004-jul-27.tar.gz) = 794604
+SHA256 (xpdf-chinese-simplified-2011-sep-02.tar.gz) = 04dcffe01cfa596ee655c1a072235e0b7803430e43582d78ee2e156f2e5364e9
+SIZE (xpdf-chinese-simplified-2011-sep-02.tar.gz) = 907207
+SHA256 (xpdf-chinese-traditional-2011-sep-02.tar.gz) = 6ecd751da8c1d9c396ede45a1e96fbedf3e919156c8644f430b79fd5e501d35d
+SIZE (xpdf-chinese-traditional-2011-sep-02.tar.gz) = 913558
diff --git a/chinese/xpdf/files/dot.xpdfrc.in b/chinese/xpdf/files/dot.xpdfrc.in
index 0a3163d1422f..729b32c1d30f 100644
--- a/chinese/xpdf/files/dot.xpdfrc.in
+++ b/chinese/xpdf/files/dot.xpdfrc.in
@@ -2,16 +2,16 @@
 cidToUnicode	Adobe-CNS1	%%DATADIR%%/chinese-traditional/Adobe-CNS1.cidToUnicode
 unicodeMap	Big5		%%DATADIR%%/chinese-traditional/Big5.unicodeMap
 unicodeMap	Big5ascii	%%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
-cMapDir		Adobe-CNS1	%%ADOBECMAPDIR%%
-toUnicodeDir			%%ADOBECMAPDIR%%
-displayCIDFontTT	Adobe-CNS1	%%FONTSDIR%%/STHeiti-Regular
+cMapDir		Adobe-CNS1	%%DATADIR%%/chinese-traditinoal/CMap
+toUnicodeDir			%%DATADIR%%/chinese-traditinoal/CMap
+fontFileCC	Adobe-CNS1	%%FONTSDIR%%/STHeiti-Regular
 #----- end Chinese Traditional support package
 #----- begin Chinese Simplified support package (2004-jul-27)
 cidToUnicode	Adobe-GB1	%%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
 unicodeMap	ISO-2022-CN	%%DATADIR%%/chinese-simplified/ISO-2022-CN.unicodeMap
 unicodeMap	EUC-CN		%%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
 unicodeMap	GBK		%%DATADIR%%/chinese-simplified/GBK.unicodeMap
-cMapDir		Adobe-GB1	%%ADOBECMAPDIR%%
-toUnicodeDir			%%ADOBECMAPDIR%%
-displayCIDFontTT	Adobe-GB1	%%FONTSDIR%%/STSong-Light
+cMapDir		Adobe-GB1	%%DATADIR%%/chinese-simplified/CMap
+toUnicodeDir			%%DATADIR%%/chinese-simplified/CMap
+fontFileCC	Adobe-GB1	%%FONTSDIR%%/STSong-Light
 #----- end Chinese Simplified support package
diff --git a/chinese/xpdf/pkg-plist b/chinese/xpdf/pkg-plist
index 3c5733468adc..16203cf050f3 100644
--- a/chinese/xpdf/pkg-plist
+++ b/chinese/xpdf/pkg-plist
@@ -11,6 +11,88 @@
 @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; chmod 0444 %D/etc/xpdfrc
 %%DATADIR%%/chinese-traditional/dot.xpdfrc
-@dirrm %%DATADIR%%/chinese-simplified
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-0
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-1
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-2
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-3
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-4
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-5
+%%DATADIR%%/chinese-traditional/CMap/Adobe-CNS1-UCS2
+%%DATADIR%%/chinese-traditional/CMap/B5-H
+%%DATADIR%%/chinese-traditional/CMap/B5-V
+%%DATADIR%%/chinese-traditional/CMap/B5pc-H
+%%DATADIR%%/chinese-traditional/CMap/B5pc-UCS2
+%%DATADIR%%/chinese-traditional/CMap/B5pc-UCS2C
+%%DATADIR%%/chinese-traditional/CMap/B5pc-V
+%%DATADIR%%/chinese-traditional/CMap/CNS-EUC-H
+%%DATADIR%%/chinese-traditional/CMap/CNS-EUC-V
+%%DATADIR%%/chinese-traditional/CMap/CNS1-H
+%%DATADIR%%/chinese-traditional/CMap/CNS1-V
+%%DATADIR%%/chinese-traditional/CMap/CNS2-H
+%%DATADIR%%/chinese-traditional/CMap/CNS2-V
+%%DATADIR%%/chinese-traditional/CMap/ETHK-B5-H
+%%DATADIR%%/chinese-traditional/CMap/ETHK-B5-V
+%%DATADIR%%/chinese-traditional/CMap/ETen-B5-H
+%%DATADIR%%/chinese-traditional/CMap/ETen-B5-UCS2
+%%DATADIR%%/chinese-traditional/CMap/ETen-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKdla-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKdla-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKdlb-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKdlb-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKgccs-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKgccs-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKm314-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKm314-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKm471-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKm471-B5-V
+%%DATADIR%%/chinese-traditional/CMap/HKscs-B5-H
+%%DATADIR%%/chinese-traditional/CMap/HKscs-B5-V
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UCS2-H
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UCS2-V
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF16-H
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF16-V
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF32-H
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF32-V
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF8-H
+%%DATADIR%%/chinese-traditional/CMap/UniCNS-UTF8-V
+@dirrm %%DATADIR%%/chinese-traditional/CMap
 @dirrm %%DATADIR%%/chinese-traditional
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-0
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-1
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-2
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-3
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-4
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-5
+%%DATADIR%%/chinese-simplified/CMap/Adobe-GB1-UCS2
+%%DATADIR%%/chinese-simplified/CMap/GB-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GB-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/GB-H
+%%DATADIR%%/chinese-simplified/CMap/GB-V
+%%DATADIR%%/chinese-simplified/CMap/GBK-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GBK-EUC-UCS2
+%%DATADIR%%/chinese-simplified/CMap/GBK-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/GBK2K-H
+%%DATADIR%%/chinese-simplified/CMap/GBK2K-V
+%%DATADIR%%/chinese-simplified/CMap/GBKp-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GBKp-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/GBT-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GBT-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/GBT-H
+%%DATADIR%%/chinese-simplified/CMap/GBT-V
+%%DATADIR%%/chinese-simplified/CMap/GBTpc-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GBTpc-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/GBpc-EUC-H
+%%DATADIR%%/chinese-simplified/CMap/GBpc-EUC-UCS2
+%%DATADIR%%/chinese-simplified/CMap/GBpc-EUC-UCS2C
+%%DATADIR%%/chinese-simplified/CMap/GBpc-EUC-V
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UCS2-H
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UCS2-V
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF16-H
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF16-V
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF32-H
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF32-V
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF8-H
+%%DATADIR%%/chinese-simplified/CMap/UniGB-UTF8-V
+@dirrm %%DATADIR%%/chinese-simplified/CMap
+@dirrm %%DATADIR%%/chinese-simplified
 @dirrmtry %%DATADIR%%
diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 24441882b157..9e34bac280e3 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	ja-xpdf
-# Date created:		21 Avr 2002
-# Whom:			MITA Yoshio <mita@FreeBSD.org>
-#
+# Created by: MITA Yoshio <mita@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xpdf
-PORTVERSION=	3.02
-PORTREVISION=	3
+PORTVERSION=	3.03
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-jafont
@@ -26,7 +21,6 @@ SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 		FONTSDIR=${FONTSDIR}
 PLIST_SUB=	EXTRARC=${EXTRARC}
-DATADIR=	${PREFIX}/share/xpdf
 
 FONTSDIR=	${LOCALBASE}/share/fonts/std.ja_JP
 EXTRARC=	${DATADIR}/japanese/dot.xpdfrc
@@ -39,6 +33,10 @@ do-install:
 	${MKDIR} ${DATADIR}/japanese
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/japanese
+	${MKDIR} ${DATADIR}/japanese/CMap
+	cd ${DATADIR}/japanese/CMap && \
+		${FIND} ${ADOBECMAPDIR}/aj16/CMap ${ADOBECMAPDIR}/aj20/CMap \
+			-type f -exec ${LN} -s -f {} . \;
 
 post-install:
 	exec < ${LOCALBASE}/etc/xpdfrc; \
diff --git a/japanese/xpdf/files/dot.xpdfrc.in b/japanese/xpdf/files/dot.xpdfrc.in
index a5090a3d4e78..343e658902d6 100644
--- a/japanese/xpdf/files/dot.xpdfrc.in
+++ b/japanese/xpdf/files/dot.xpdfrc.in
@@ -4,28 +4,28 @@ 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			"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	Ryumin-Light-H			"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	Ryumin-Light-V			"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	Ryumin-Light-Identity		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	Ryumin-Light-Identity-H		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	Ryumin-Light-Identity-V		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	HeiseiMin-W3H			"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	MS-Mincho			"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	FutoMinA101-Bold		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	FutoMinA101-Bold-H		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	FutoMinA101-Bold-V		"%%FONTSDIR%%/Ryumin-Light"
-displayNamedCIDFontTT	GothicBBB-Medium		"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	GothicBBB-Medium-H		"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	GothicBBB-Medium-V		"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity	"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-H	"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	GothicBBB-Medium-Identity-V	"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	HeiseiKakuGo-W5H		"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	MS-Gothic			"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	FutoGoB101-Bold			"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	FutoGoB101-Bold-H		"%%FONTSDIR%%/GothicBBB-Medium"
-displayNamedCIDFontTT	FutoGoB101-Bold-V		"%%FONTSDIR%%/GothicBBB-Medium"
+cMapDir		Adobe-Japan1	%%DATADIR%%/japanese/CMap
+toUnicodeDir			%%DATADIR%%/japanese/CMap
+fontFile	Ryumin-Light			"%%FONTSDIR%%/Ryumin-Light"
+fontFile	Ryumin-Light-H			"%%FONTSDIR%%/Ryumin-Light"
+fontFile	Ryumin-Light-V			"%%FONTSDIR%%/Ryumin-Light"
+fontFile	Ryumin-Light-Identity		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	Ryumin-Light-Identity-H		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	Ryumin-Light-Identity-V		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	HeiseiMin-W3H			"%%FONTSDIR%%/Ryumin-Light"
+fontFile	MS-Mincho			"%%FONTSDIR%%/Ryumin-Light"
+fontFile	FutoMinA101-Bold		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	FutoMinA101-Bold-H		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	FutoMinA101-Bold-V		"%%FONTSDIR%%/Ryumin-Light"
+fontFile	GothicBBB-Medium		"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	GothicBBB-Medium-H		"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	GothicBBB-Medium-V		"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	GothicBBB-Medium-Identity	"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	GothicBBB-Medium-Identity-H	"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	GothicBBB-Medium-Identity-V	"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	HeiseiKakuGo-W5H		"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	MS-Gothic			"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	FutoGoB101-Bold			"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	FutoGoB101-Bold-H		"%%FONTSDIR%%/GothicBBB-Medium"
+fontFile	FutoGoB101-Bold-V		"%%FONTSDIR%%/GothicBBB-Medium"
 #Japanese PDF resources
diff --git a/japanese/xpdf/pkg-plist b/japanese/xpdf/pkg-plist
index e08106f7e5a7..4d5cd545ff81 100644
--- a/japanese/xpdf/pkg-plist
+++ b/japanese/xpdf/pkg-plist
@@ -7,5 +7,81 @@
 @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; chmod 0444 %D/etc/xpdfrc
 %%DATADIR%%/japanese/dot.xpdfrc
+%%DATADIR%%/japanese/CMap/78-EUC-H
+%%DATADIR%%/japanese/CMap/78-EUC-V
+%%DATADIR%%/japanese/CMap/78-H
+%%DATADIR%%/japanese/CMap/78-RKSJ-H
+%%DATADIR%%/japanese/CMap/78-RKSJ-V
+%%DATADIR%%/japanese/CMap/78-V
+%%DATADIR%%/japanese/CMap/78ms-RKSJ-H
+%%DATADIR%%/japanese/CMap/78ms-RKSJ-V
+%%DATADIR%%/japanese/CMap/83pv-RKSJ-H
+%%DATADIR%%/japanese/CMap/90ms-RKSJ-H
+%%DATADIR%%/japanese/CMap/90ms-RKSJ-UCS2
+%%DATADIR%%/japanese/CMap/90ms-RKSJ-V
+%%DATADIR%%/japanese/CMap/90msp-RKSJ-H
+%%DATADIR%%/japanese/CMap/90msp-RKSJ-V
+%%DATADIR%%/japanese/CMap/90pv-RKSJ-H
+%%DATADIR%%/japanese/CMap/90pv-RKSJ-UCS2
+%%DATADIR%%/japanese/CMap/90pv-RKSJ-UCS2C
+%%DATADIR%%/japanese/CMap/90pv-RKSJ-V
+%%DATADIR%%/japanese/CMap/Add-H
+%%DATADIR%%/japanese/CMap/Add-RKSJ-H
+%%DATADIR%%/japanese/CMap/Add-RKSJ-V
+%%DATADIR%%/japanese/CMap/Add-V
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-0
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-1
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-2
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-3
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-4
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-5
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-6
+%%DATADIR%%/japanese/CMap/Adobe-Japan1-UCS2
+%%DATADIR%%/japanese/CMap/Adobe-Japan2-0
+%%DATADIR%%/japanese/CMap/EUC-H
+%%DATADIR%%/japanese/CMap/EUC-V
+%%DATADIR%%/japanese/CMap/Ext-H
+%%DATADIR%%/japanese/CMap/Ext-RKSJ-H
+%%DATADIR%%/japanese/CMap/Ext-RKSJ-V
+%%DATADIR%%/japanese/CMap/Ext-V
+%%DATADIR%%/japanese/CMap/H
+%%DATADIR%%/japanese/CMap/Hankaku
+%%DATADIR%%/japanese/CMap/Hiragana
+%%DATADIR%%/japanese/CMap/Hojo-EUC-H
+%%DATADIR%%/japanese/CMap/Hojo-EUC-V
+%%DATADIR%%/japanese/CMap/Hojo-H
+%%DATADIR%%/japanese/CMap/Hojo-V
+%%DATADIR%%/japanese/CMap/Katakana
+%%DATADIR%%/japanese/CMap/NWP-H
+%%DATADIR%%/japanese/CMap/NWP-V
+%%DATADIR%%/japanese/CMap/RKSJ-H
+%%DATADIR%%/japanese/CMap/RKSJ-V
+%%DATADIR%%/japanese/CMap/Roman
+%%DATADIR%%/japanese/CMap/UniHojo-UCS2-H
+%%DATADIR%%/japanese/CMap/UniHojo-UCS2-V
+%%DATADIR%%/japanese/CMap/UniHojo-UTF16-H
+%%DATADIR%%/japanese/CMap/UniHojo-UTF16-V
+%%DATADIR%%/japanese/CMap/UniHojo-UTF32-H
+%%DATADIR%%/japanese/CMap/UniHojo-UTF32-V
+%%DATADIR%%/japanese/CMap/UniHojo-UTF8-H
+%%DATADIR%%/japanese/CMap/UniHojo-UTF8-V
+%%DATADIR%%/japanese/CMap/UniJIS-UCS2-H
+%%DATADIR%%/japanese/CMap/UniJIS-UCS2-HW-H
+%%DATADIR%%/japanese/CMap/UniJIS-UCS2-HW-V
+%%DATADIR%%/japanese/CMap/UniJIS-UCS2-V
+%%DATADIR%%/japanese/CMap/UniJIS-UTF16-H
+%%DATADIR%%/japanese/CMap/UniJIS-UTF16-V
+%%DATADIR%%/japanese/CMap/UniJIS-UTF32-H
+%%DATADIR%%/japanese/CMap/UniJIS-UTF32-V
+%%DATADIR%%/japanese/CMap/UniJIS-UTF8-H
+%%DATADIR%%/japanese/CMap/UniJIS-UTF8-V
+%%DATADIR%%/japanese/CMap/UniJISPro-UCS2-HW-V
+%%DATADIR%%/japanese/CMap/UniJISPro-UCS2-V
+%%DATADIR%%/japanese/CMap/UniJISPro-UTF8-V
+%%DATADIR%%/japanese/CMap/UniJISX0213-UTF32-H
+%%DATADIR%%/japanese/CMap/UniJISX0213-UTF32-V
+%%DATADIR%%/japanese/CMap/V
+%%DATADIR%%/japanese/CMap/WP-Symbol
+@dirrm %%DATADIR%%/japanese/CMap
 @dirrm %%DATADIR%%/japanese
 @dirrmtry %%DATADIR%%
diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index 7c7bd18f8edd..588f51b2158d 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	ko-xpdf
-# Date created:		Fri Sep 30 21:26:35 EDT 2005
-# Whom:			Jung-uk Kim <jkim@FreeBSD.org>
-#
+# Created by: Jung-uk Kim <jkim@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xpdf
-PORTVERSION=	3.02
-PORTREVISION=	4
+PORTVERSION=	3.03
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-kofont
@@ -25,7 +20,6 @@ SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 		FONTSDIR=${FONTSDIR}
 PLIST_SUB=	EXTRARC=${EXTRARC}
-DATADIR=	${PREFIX}/share/xpdf
 
 FONTSDIR=	${LOCALBASE}/lib/X11/fonts/unfonts-core
 EXTRARC=	${DATADIR}/korean/dot.xpdfrc
@@ -37,6 +31,10 @@ do-install:
 	${MKDIR} ${DATADIR}/korean
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/korean
+	${MKDIR} ${DATADIR}/korean/CMap
+	cd ${DATADIR}/korean/CMap && \
+		${FIND} ${ADOBECMAPDIR}/ak12/CMap \
+			-type f -exec ${LN} -s -f {} . \;
 
 post-install:
 	exec < ${LOCALBASE}/etc/xpdfrc; \
diff --git a/korean/xpdf/distinfo b/korean/xpdf/distinfo
index 446e18ef0617..af4ba54dafb0 100644
--- a/korean/xpdf/distinfo
+++ b/korean/xpdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpdf-korean.tar.gz) = ee8ae069ae613a24c7f500666a1a50cc5783f253feba61ebdbe2ef458232974f
-SIZE (xpdf-korean.tar.gz) = 470455
+SHA256 (xpdf-korean.tar.gz) = 8a10b24faab341a393ec5f6e6c7db3794fc619ee4671c73aacf8cc83a20be892
+SIZE (xpdf-korean.tar.gz) = 518995
diff --git a/korean/xpdf/files/dot.xpdfrc.in b/korean/xpdf/files/dot.xpdfrc.in
index c15fb4dcf701..d360efed1574 100644
--- a/korean/xpdf/files/dot.xpdfrc.in
+++ b/korean/xpdf/files/dot.xpdfrc.in
@@ -2,24 +2,24 @@
 # $FreeBSD$
 cidToUnicode	Adobe-Korea1	%%DATADIR%%/korean/Adobe-Korea1.cidToUnicode
 unicodeMap	ISO-2022-KR	%%DATADIR%%/korean/ISO-2022-KR.unicodeMap
-cMapDir		Adobe-Korea1	%%ADOBECMAPDIR%%
-toUnicodeDir			%%ADOBECMAPDIR%%
-displayNamedCIDFontTT	Batang		"%%FONTSDIR%%/UnBatang.ttf"
-displayNamedCIDFontTT	Batang,Bold	"%%FONTSDIR%%/UnBatangBold.ttf"
-displayNamedCIDFontTT	Dotum		"%%FONTSDIR%%/UnDotum.ttf"
-displayNamedCIDFontTT	Dotum,Bold	"%%FONTSDIR%%/UnDotumBold.ttf"
-displayNamedCIDFontTT	Gulim		"%%FONTSDIR%%/UnGraphic.ttf"
-displayNamedCIDFontTT	Gulim,Bold	"%%FONTSDIR%%/UnGraphicBold.ttf"
-displayNamedCIDFontTT	Gungsuh		"%%FONTSDIR%%/UnGungseo.ttf"
+cMapDir		Adobe-Korea1	%%DATADIR%%/korean/CMap
+toUnicodeDir			%%DATADIR%%/korean/CMap
+fontFile	Batang		"%%FONTSDIR%%/UnBatang.ttf"
+fontFile	Batang,Bold	"%%FONTSDIR%%/UnBatangBold.ttf"
+fontFile	Dotum		"%%FONTSDIR%%/UnDotum.ttf"
+fontFile	Dotum,Bold	"%%FONTSDIR%%/UnDotumBold.ttf"
+fontFile	Gulim		"%%FONTSDIR%%/UnGraphic.ttf"
+fontFile	Gulim,Bold	"%%FONTSDIR%%/UnGraphicBold.ttf"
+fontFile	Gungsuh		"%%FONTSDIR%%/UnGungseo.ttf"
 
-psFont16	Adobe-Korea1	H	Batang-UniKS-UCS2-H		UCS-2
-psFont16	Adobe-Korea1	V	Batang-UniKS-UCS2-V		UCS-2
-psNamedFont16	Batang		H	Batang-UniKS-UCS2-H		UCS-2
-psNamedFont16	Batang		V	Batang-UniKS-UCS2-V		UCS-2
-psNamedFont16	Dotum		H	Dotum-UniKS-UCS2-H		UCS-2
-psNamedFont16	Dotum		V	Dotum-UniKS-UCS2-V		UCS-2
-psNamedFont16	Gulim		H	Gulim-UniKS-UCS2-H		UCS-2
-psNamedFont16	Gulim		V	Gulim-UniKS-UCS2-V		UCS-2
-psNamedFont16	Gungsuh		H	Gungsuh-UniKS-UCS2-H		UCS-2
-psNamedFont16	Gungsuh		V	Gungsuh-UniKS-UCS2-V		UCS-2
+psResidentFontCC	Adobe-Korea1	H	Batang-UniKS-UCS2-H	UCS-2
+psResidentFontCC	Adobe-Korea1	V	Batang-UniKS-UCS2-V	UCS-2
+psResidentFont16	Batang		H	Batang-UniKS-UCS2-H	UCS-2
+psResidentFont16	Batang		V	Batang-UniKS-UCS2-V	UCS-2
+psResidentFont16	Dotum		H	Dotum-UniKS-UCS2-H	UCS-2
+psResidentFont16	Dotum		V	Dotum-UniKS-UCS2-V	UCS-2
+psResidentFont16	Gulim		H	Gulim-UniKS-UCS2-H	UCS-2
+psResidentFont16	Gulim		V	Gulim-UniKS-UCS2-V	UCS-2
+psResidentFont16	Gungsuh		H	Gungsuh-UniKS-UCS2-H	UCS-2
+psResidentFont16	Gungsuh		V	Gungsuh-UniKS-UCS2-V	UCS-2
 #Korean PDF resources
diff --git a/korean/xpdf/pkg-plist b/korean/xpdf/pkg-plist
index a7fb50144e70..b8cf16cc7d6d 100644
--- a/korean/xpdf/pkg-plist
+++ b/korean/xpdf/pkg-plist
@@ -5,5 +5,33 @@
 @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; chmod 0444 %D/etc/xpdfrc
 %%DATADIR%%/korean/dot.xpdfrc
+%%DATADIR%%/korean/CMap/Adobe-Korea1-0
+%%DATADIR%%/korean/CMap/Adobe-Korea1-1
+%%DATADIR%%/korean/CMap/Adobe-Korea1-2
+%%DATADIR%%/korean/CMap/Adobe-Korea1-UCS2
+%%DATADIR%%/korean/CMap/KSC-EUC-H
+%%DATADIR%%/korean/CMap/KSC-EUC-V
+%%DATADIR%%/korean/CMap/KSC-H
+%%DATADIR%%/korean/CMap/KSC-Johab-H
+%%DATADIR%%/korean/CMap/KSC-Johab-V
+%%DATADIR%%/korean/CMap/KSC-V
+%%DATADIR%%/korean/CMap/KSCms-UHC-H
+%%DATADIR%%/korean/CMap/KSCms-UHC-HW-H
+%%DATADIR%%/korean/CMap/KSCms-UHC-HW-V
+%%DATADIR%%/korean/CMap/KSCms-UHC-UCS2
+%%DATADIR%%/korean/CMap/KSCms-UHC-V
+%%DATADIR%%/korean/CMap/KSCpc-EUC-H
+%%DATADIR%%/korean/CMap/KSCpc-EUC-UCS2
+%%DATADIR%%/korean/CMap/KSCpc-EUC-UCS2C
+%%DATADIR%%/korean/CMap/KSCpc-EUC-V
+%%DATADIR%%/korean/CMap/UniKS-UCS2-H
+%%DATADIR%%/korean/CMap/UniKS-UCS2-V
+%%DATADIR%%/korean/CMap/UniKS-UTF16-H
+%%DATADIR%%/korean/CMap/UniKS-UTF16-V
+%%DATADIR%%/korean/CMap/UniKS-UTF32-H
+%%DATADIR%%/korean/CMap/UniKS-UTF32-V
+%%DATADIR%%/korean/CMap/UniKS-UTF8-H
+%%DATADIR%%/korean/CMap/UniKS-UTF8-V
+@dirrm %%DATADIR%%/korean/CMap
 @dirrm %%DATADIR%%/korean
 @dirrmtry %%DATADIR%%