Update to 3.03.

4 files changed, 105 insertions, 21 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%%