Update to 3.03.

4 files changed, 55 insertions, 29 deletions

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%%