- Upgrade to 20040727

- Change PORTVERSION convention. The xpdf language
  packages don't share version numbers with the main
  xpdf package. I didn't bump PORTEPOCH science
  20040727 is bigger than 3.00
- add chinese/arphicttf depends for PDF files without
  embedded fonts
- tabify Makefile
- fix pkg-plist for multi language users
- take maintainership. Thanks the previous maintainers!

PR:		69862
Submitted by:	Dryice Liu <dryice@hotpop.com> (new maintainer)

4 files changed, 16 insertions, 21 deletions

diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 4a9eb49ec417..6af2d0aedd56 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	3.00
-PORTREVISION=	0
+PORTVERSION=	20040727
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
-                ${MASTER_SITE_TEX_CTAN}
+		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/xpdf
-DISTFILES=	xpdf-chinese-simplified-2004-jan-16.tar.gz \
-		xpdf-chinese-traditional-2004-jan-16.tar.gz
+DISTFILES=	xpdf-chinese-simplified-2004-jul-27.tar.gz \
+		xpdf-chinese-traditional-2004-jul-27.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Chinese-traditional xpdf font support
+MAINTAINER=	dryice@liu.com.cn
+COMMENT=	Chinese xpdf font support
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf\
-		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-CNS1-0:${PORTSDIR}/print/adobe-cmaps
+		${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-CNS1-0:${PORTSDIR}/print/adobe-cmaps \
+		${LOCALBASE}/share/fonts/TrueType/arphic/logo.gif:${PORTSDIR}/chinese/arphicttf
 
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
diff --git a/chinese/xpdf/distinfo b/chinese/xpdf/distinfo
index 6bcba844126f..00ecf4bb2524 100644
--- a/chinese/xpdf/distinfo
+++ b/chinese/xpdf/distinfo
@@ -1,4 +1,4 @@
-MD5 (xpdf-chinese-simplified-2004-jan-16.tar.gz) = 7a92500278d4aa8089024d5d7266f4ac
-SIZE (xpdf-chinese-simplified-2004-jan-16.tar.gz) = 835807
-MD5 (xpdf-chinese-traditional-2004-jan-16.tar.gz) = 1dd68bc924273e30534031d66f8a37c7
-SIZE (xpdf-chinese-traditional-2004-jan-16.tar.gz) = 794568
+MD5 (xpdf-chinese-simplified-2004-jul-27.tar.gz) = 6c3b04008000948e62530b8582e7f37c
+SIZE (xpdf-chinese-simplified-2004-jul-27.tar.gz) = 835960
+MD5 (xpdf-chinese-traditional-2004-jul-27.tar.gz) = b7fa7f1850f7cfa28498701507079abb
+SIZE (xpdf-chinese-traditional-2004-jul-27.tar.gz) = 794604
diff --git a/chinese/xpdf/files/dot.xpdfrc b/chinese/xpdf/files/dot.xpdfrc
index cb8633b4ae18..cd0492d67338 100644
--- a/chinese/xpdf/files/dot.xpdfrc
+++ b/chinese/xpdf/files/dot.xpdfrc
@@ -1,21 +1,17 @@
-#----- begin Chinese Traditional support package (2002-apr-14)
+#----- begin Chinese Traditional support package (2004-jul-27)
 cidToUnicode	Adobe-CNS1	/usr/X11R6/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
 unicodeMap	Big5		/usr/X11R6/share/xpdf/chinese-traditional/Big5.unicodeMap
 unicodeMap	Big5ascii	/usr/X11R6/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
 cMapDir		Adobe-CNS1	/usr/local/share/ghostscript/Resource/CMap
 toUnicodeDir			/usr/local/share/ghostscript/Resource/CMap
-displayCIDFontX	Adobe-CNS1	"-*-fixed-medium-r-normal-*-%s-*-*-*-*-*-big5-0" Big5
-# If you have the Arhpic fonts, you may want to use this instead:
-# displayCIDFontX Adobe-CNS1	"-arphic-ar pl kaitim big5-medium-r-normal--%s-*-*-*-c-*-iso10646-1" UCS-2
+displayCIDFontTT	Adobe-CNS1	/usr/local/share/fonts/TrueType/bkai00mp.ttf
 #----- end Chinese Traditional support package
-#----- begin Chinese Simplified support package (2002-apr-18)
+#----- begin Chinese Simplified support package (2004-jul-27)
 cidToUnicode	Adobe-GB1	/usr/X11R6/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
 unicodeMap	ISO-2022-CN	/usr/X11R6/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
 unicodeMap	EUC-CN		/usr/X11R6/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
 unicodeMap	GBK		/usr/X11R6/share/xpdf/chinese-simplified/GBK.unicodeMap
 cMapDir		Adobe-GB1	/usr/local/share/ghostscript/Resource/CMap
 toUnicodeDir			/usr/local/share/ghostscript/Resource/CMap
-displayCIDFontX	Adobe-GB1	"-*-fangsong ti-medium-r-normal-*-%s-*-*-*-*-*-gb2312.1980-0" ISO-2022-CN
-# If you have the Arhpic fonts, you may want to use this instead:
-# displayCIDFontX Adobe-GB1	"-arphic-ar pl sungtil gb-medium-r-normal--%s-*-*-*-c-*-iso10646-1" UCS-2
+displayCIDFontTT	Adobe-GB1	/usr/local/share/fonts/TrueType/gkai00mp.ttf
 #----- end Chinese Simplified support package
diff --git a/chinese/xpdf/pkg-plist b/chinese/xpdf/pkg-plist
index a4e710383277..833a446dea2f 100644
--- a/chinese/xpdf/pkg-plist
+++ b/chinese/xpdf/pkg-plist
@@ -13,4 +13,3 @@ share/xpdf/chinese-traditional/dot.xpdfrc
 @unexec rm -f %D/etc/xpdfrc.chinese-traditional
 @dirrm share/xpdf/chinese-simplified
 @dirrm share/xpdf/chinese-traditional
-@dirrm share/xpdf