Update to 3.03.

3 files changed, 106 insertions, 32 deletions

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