Update to 20040605.

  - The Adobe-Japan-6 Character Collection is added.
  - UTF maps are updated in ac14.tar.Z.
  - Update site of pdfcore.

3 files changed, 101 insertions, 99 deletions

diff --git a/fonts/adobe-cmaps/Makefile b/fonts/adobe-cmaps/Makefile
index 7b443f95887..cc7ae87bfb6 100644
--- a/fonts/adobe-cmaps/Makefile
+++ b/fonts/adobe-cmaps/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/05/01 16:41:55 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/22 15:15:43 hira Exp $
 
-DISTNAME=	adobe-cmaps-20030924
+DISTNAME=	adobe-cmaps-20040605
 CATEGORIES=	fonts print
 MASTER_SITES=	# empty
 
-CMAP_FILES=	ac14 ag14 ai0 aj15 aj20 ak12
+CMAP_FILES=	ac14 ag14 ai0 aj16 aj20 ak12
 RKSJ_FILES=	rksj-cmaps
 CMAP_DISTFILES=	${CMAP_FILES:S/$/.tar.Z/} ${RKSJ_FILES:S/$/.tar.Z/}
 .for FILE in ${CMAP_DISTFILES}
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${CMAP_DISTFILES}
 PDFCORE=	chinese_s chinese_t japanese korean
 PDFCORE_DISTFILES=	${PDFCORE:S/$/.zip/}
 .for FILE in ${PDFCORE_DISTFILES}
-SITES_${FILE}+=	http://partners.adobe.com/asn/acrobat/download/fontinfo/
+SITES_${FILE}+=	http://partners.adobe.com/public/developer/en/pdf/
 .endfor
 DISTFILES+=	${PDFCORE_DISTFILES}
 
diff --git a/fonts/adobe-cmaps/PLIST b/fonts/adobe-cmaps/PLIST
index e56cd98b0a0..b16bbddf423 100644
--- a/fonts/adobe-cmaps/PLIST
+++ b/fonts/adobe-cmaps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/23 18:01:48 sketch Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/22 15:15:43 hira Exp $
 share/Adobe/Resource/CMap/78-EUC-H
 share/Adobe/Resource/CMap/78-EUC-V
 share/Adobe/Resource/CMap/78-H
@@ -39,6 +39,7 @@ share/Adobe/Resource/CMap/Adobe-Japan1-2
 share/Adobe/Resource/CMap/Adobe-Japan1-3
 share/Adobe/Resource/CMap/Adobe-Japan1-4
 share/Adobe/Resource/CMap/Adobe-Japan1-5
+share/Adobe/Resource/CMap/Adobe-Japan1-6
 share/Adobe/Resource/CMap/Adobe-Japan1-UCS2
 share/Adobe/Resource/CMap/Adobe-Japan2-0
 share/Adobe/Resource/CMap/Adobe-Korea1-0
@@ -270,64 +271,65 @@ share/Adobe/Resource/ag14/CMap/UniGB-UTF8-V
 share/Adobe/Resource/ag14/cid2code.txt
 share/Adobe/Resource/ai0/CMap/Identity-H
 share/Adobe/Resource/ai0/CMap/Identity-V
-share/Adobe/Resource/aj15/CMap/78-EUC-H
-share/Adobe/Resource/aj15/CMap/78-EUC-V
-share/Adobe/Resource/aj15/CMap/78-H
-share/Adobe/Resource/aj15/CMap/78-RKSJ-H
-share/Adobe/Resource/aj15/CMap/78-RKSJ-V
-share/Adobe/Resource/aj15/CMap/78-V
-share/Adobe/Resource/aj15/CMap/78ms-RKSJ-H
-share/Adobe/Resource/aj15/CMap/78ms-RKSJ-V
-share/Adobe/Resource/aj15/CMap/83pv-RKSJ-H
-share/Adobe/Resource/aj15/CMap/90ms-RKSJ-H
-share/Adobe/Resource/aj15/CMap/90ms-RKSJ-V
-share/Adobe/Resource/aj15/CMap/90msp-RKSJ-H
-share/Adobe/Resource/aj15/CMap/90msp-RKSJ-V
-share/Adobe/Resource/aj15/CMap/90pv-RKSJ-H
-share/Adobe/Resource/aj15/CMap/90pv-RKSJ-V
-share/Adobe/Resource/aj15/CMap/Add-H
-share/Adobe/Resource/aj15/CMap/Add-RKSJ-H
-share/Adobe/Resource/aj15/CMap/Add-RKSJ-V
-share/Adobe/Resource/aj15/CMap/Add-V
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-0
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-1
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-2
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-3
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-4
-share/Adobe/Resource/aj15/CMap/Adobe-Japan1-5
-share/Adobe/Resource/aj15/CMap/EUC-H
-share/Adobe/Resource/aj15/CMap/EUC-V
-share/Adobe/Resource/aj15/CMap/Ext-H
-share/Adobe/Resource/aj15/CMap/Ext-RKSJ-H
-share/Adobe/Resource/aj15/CMap/Ext-RKSJ-V
-share/Adobe/Resource/aj15/CMap/Ext-V
-share/Adobe/Resource/aj15/CMap/H
-share/Adobe/Resource/aj15/CMap/Hankaku
-share/Adobe/Resource/aj15/CMap/Hiragana
-share/Adobe/Resource/aj15/CMap/Katakana
-share/Adobe/Resource/aj15/CMap/NWP-H
-share/Adobe/Resource/aj15/CMap/NWP-V
-share/Adobe/Resource/aj15/CMap/RKSJ-H
-share/Adobe/Resource/aj15/CMap/RKSJ-V
-share/Adobe/Resource/aj15/CMap/Roman
-share/Adobe/Resource/aj15/CMap/UniJIS-UCS2-H
-share/Adobe/Resource/aj15/CMap/UniJIS-UCS2-HW-H
-share/Adobe/Resource/aj15/CMap/UniJIS-UCS2-HW-V
-share/Adobe/Resource/aj15/CMap/UniJIS-UCS2-V
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF16-H
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF16-V
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF32-H
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF32-V
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF8-H
-share/Adobe/Resource/aj15/CMap/UniJIS-UTF8-V
-share/Adobe/Resource/aj15/CMap/UniJISPro-UCS2-HW-V
-share/Adobe/Resource/aj15/CMap/UniJISPro-UCS2-V
-share/Adobe/Resource/aj15/CMap/UniJISPro-UTF8-V
-share/Adobe/Resource/aj15/CMap/UniJISX0213-UTF32-H
-share/Adobe/Resource/aj15/CMap/UniJISX0213-UTF32-V
-share/Adobe/Resource/aj15/CMap/V
-share/Adobe/Resource/aj15/CMap/WP-Symbol
-share/Adobe/Resource/aj15/cid2code.txt
+share/Adobe/Resource/aj16/CMap/78-EUC-H
+share/Adobe/Resource/aj16/CMap/78-EUC-V
+share/Adobe/Resource/aj16/CMap/78-H
+share/Adobe/Resource/aj16/CMap/78-RKSJ-H
+share/Adobe/Resource/aj16/CMap/78-RKSJ-V
+share/Adobe/Resource/aj16/CMap/78-V
+share/Adobe/Resource/aj16/CMap/78ms-RKSJ-H
+share/Adobe/Resource/aj16/CMap/78ms-RKSJ-V
+share/Adobe/Resource/aj16/CMap/83pv-RKSJ-H
+share/Adobe/Resource/aj16/CMap/90ms-RKSJ-H
+share/Adobe/Resource/aj16/CMap/90ms-RKSJ-V
+share/Adobe/Resource/aj16/CMap/90msp-RKSJ-H
+share/Adobe/Resource/aj16/CMap/90msp-RKSJ-V
+share/Adobe/Resource/aj16/CMap/90pv-RKSJ-H
+share/Adobe/Resource/aj16/CMap/90pv-RKSJ-V
+share/Adobe/Resource/aj16/CMap/Add-H
+share/Adobe/Resource/aj16/CMap/Add-RKSJ-H
+share/Adobe/Resource/aj16/CMap/Add-RKSJ-V
+share/Adobe/Resource/aj16/CMap/Add-V
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-0
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-1
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-2
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-3
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-4
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-5
+share/Adobe/Resource/aj16/CMap/Adobe-Japan1-6
+share/Adobe/Resource/aj16/CMap/EUC-H
+share/Adobe/Resource/aj16/CMap/EUC-V
+share/Adobe/Resource/aj16/CMap/Ext-H
+share/Adobe/Resource/aj16/CMap/Ext-RKSJ-H
+share/Adobe/Resource/aj16/CMap/Ext-RKSJ-V
+share/Adobe/Resource/aj16/CMap/Ext-V
+share/Adobe/Resource/aj16/CMap/H
+share/Adobe/Resource/aj16/CMap/Hankaku
+share/Adobe/Resource/aj16/CMap/Hiragana
+share/Adobe/Resource/aj16/CMap/Katakana
+share/Adobe/Resource/aj16/CMap/NWP-H
+share/Adobe/Resource/aj16/CMap/NWP-V
+share/Adobe/Resource/aj16/CMap/RKSJ-H
+share/Adobe/Resource/aj16/CMap/RKSJ-V
+share/Adobe/Resource/aj16/CMap/Roman
+share/Adobe/Resource/aj16/CMap/UniJIS-UCS2-H
+share/Adobe/Resource/aj16/CMap/UniJIS-UCS2-HW-H
+share/Adobe/Resource/aj16/CMap/UniJIS-UCS2-HW-V
+share/Adobe/Resource/aj16/CMap/UniJIS-UCS2-V
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF16-H
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF16-V
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF32-H
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF32-V
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF8-H
+share/Adobe/Resource/aj16/CMap/UniJIS-UTF8-V
+share/Adobe/Resource/aj16/CMap/UniJISPro-UCS2-HW-V
+share/Adobe/Resource/aj16/CMap/UniJISPro-UCS2-V
+share/Adobe/Resource/aj16/CMap/UniJISPro-UTF8-V
+share/Adobe/Resource/aj16/CMap/UniJISX0213-UTF32-H
+share/Adobe/Resource/aj16/CMap/UniJISX0213-UTF32-V
+share/Adobe/Resource/aj16/CMap/V
+share/Adobe/Resource/aj16/CMap/WP-Symbol
+share/Adobe/Resource/aj16/cid2code.txt
 share/Adobe/Resource/aj20/CMap/Adobe-Japan2-0
 share/Adobe/Resource/aj20/CMap/Hojo-EUC-H
 share/Adobe/Resource/aj20/CMap/Hojo-EUC-V
@@ -466,8 +468,8 @@ share/Adobe/Resource/rksj-cmaps/TCVN-RKSJ-H
 @dirrm share/Adobe/Resource/ak12
 @dirrm share/Adobe/Resource/aj20/CMap
 @dirrm share/Adobe/Resource/aj20
-@dirrm share/Adobe/Resource/aj15/CMap
-@dirrm share/Adobe/Resource/aj15
+@dirrm share/Adobe/Resource/aj16/CMap
+@dirrm share/Adobe/Resource/aj16
 @dirrm share/Adobe/Resource/ai0/CMap
 @dirrm share/Adobe/Resource/ai0
 @dirrm share/Adobe/Resource/ag14/CMap
diff --git a/fonts/adobe-cmaps/distinfo b/fonts/adobe-cmaps/distinfo
index f392a613f95..f0bfe8679f1 100644
--- a/fonts/adobe-cmaps/distinfo
+++ b/fonts/adobe-cmaps/distinfo
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 19:18:26 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/08/22 15:15:43 hira Exp $
 
-SHA1 (adobe-cmaps-20030924/ac14.tar.Z) = 5f95e93442e4aa8b7d14c064b4e33623753671b1
-RMD160 (adobe-cmaps-20030924/ac14.tar.Z) = 35e1cfc4332531a69a993b39f80c7a7a2a4fc729
-Size (adobe-cmaps-20030924/ac14.tar.Z) = 1388945 bytes
-SHA1 (adobe-cmaps-20030924/ag14.tar.Z) = 4d38a49b589186f7432eacc41bfb6b321ba65b06
-RMD160 (adobe-cmaps-20030924/ag14.tar.Z) = 2b7ba5ec42b6e03e0eb3512678c175720726d1bc
-Size (adobe-cmaps-20030924/ag14.tar.Z) = 2057991 bytes
-SHA1 (adobe-cmaps-20030924/ai0.tar.Z) = df90b2e71bcc045524dcc4683c1b084713e645ea
-RMD160 (adobe-cmaps-20030924/ai0.tar.Z) = 8b2c1f40aa3d3ce71c9beafc24300fa73f1ac703
-Size (adobe-cmaps-20030924/ai0.tar.Z) = 4037 bytes
-SHA1 (adobe-cmaps-20030924/aj15.tar.Z) = be206ecf0c8e05f9c91ca4533b6b58099a4f9d60
-RMD160 (adobe-cmaps-20030924/aj15.tar.Z) = fd2002c13efbf49cd1f4938a2d84bb4fa0bc3c64
-Size (adobe-cmaps-20030924/aj15.tar.Z) = 1048901 bytes
-SHA1 (adobe-cmaps-20030924/aj20.tar.Z) = 45e7ebb82fa18eb3f2dc989949e0f673e00c4141
-RMD160 (adobe-cmaps-20030924/aj20.tar.Z) = 7915552a2f2a0f719879858d8326ce278b05c092
-Size (adobe-cmaps-20030924/aj20.tar.Z) = 258583 bytes
-SHA1 (adobe-cmaps-20030924/ak12.tar.Z) = c4c91f6baedee44b8e38c2b8cd8e572dfa4f007c
-RMD160 (adobe-cmaps-20030924/ak12.tar.Z) = ea8824fe1655b095f9e6d4ae4f8426be27f956fb
-Size (adobe-cmaps-20030924/ak12.tar.Z) = 792646 bytes
-SHA1 (adobe-cmaps-20030924/rksj-cmaps.tar.Z) = 48e7831f299ed01b3cb6d26f0bf1b6bee8bc3a5a
-RMD160 (adobe-cmaps-20030924/rksj-cmaps.tar.Z) = ea2fcbdd1a4229a2577be2cc2944dec76db4f306
-Size (adobe-cmaps-20030924/rksj-cmaps.tar.Z) = 40873 bytes
-SHA1 (adobe-cmaps-20030924/chinese_s.zip) = 220425be74ba6aebeada7e9e7970d640a8617b09
-RMD160 (adobe-cmaps-20030924/chinese_s.zip) = abf2d85c054ffcb0abf38e2c50c1ae4ca56d642f
-Size (adobe-cmaps-20030924/chinese_s.zip) = 427910 bytes
-SHA1 (adobe-cmaps-20030924/chinese_t.zip) = 8eecb56627e6971194e4d20d7308c3faa24cd85c
-RMD160 (adobe-cmaps-20030924/chinese_t.zip) = ae8867b632044393556aff40fe1dbe97a7566b68
-Size (adobe-cmaps-20030924/chinese_t.zip) = 399452 bytes
-SHA1 (adobe-cmaps-20030924/japanese.zip) = 9114cf1f1dc8e00494d5b37079aa95fd55583376
-RMD160 (adobe-cmaps-20030924/japanese.zip) = d5cc98a9f46323073f8c9c104bcf8d7a0ae3f975
-Size (adobe-cmaps-20030924/japanese.zip) = 236664 bytes
-SHA1 (adobe-cmaps-20030924/korean.zip) = 817d8dd57d8bb8f23a6439c5a548f0975573d7d1
-RMD160 (adobe-cmaps-20030924/korean.zip) = 95fc2e413ad519863c2678ee6f71da3f846f9290
-Size (adobe-cmaps-20030924/korean.zip) = 258946 bytes
+SHA1 (adobe-cmaps-20040605/ac14.tar.Z) = ea2592f3f5aca6767c057ae2e806fdeeaf9a48df
+RMD160 (adobe-cmaps-20040605/ac14.tar.Z) = 168582478024a5e3ea517ad2b679275224f1a3d8
+Size (adobe-cmaps-20040605/ac14.tar.Z) = 1390191 bytes
+SHA1 (adobe-cmaps-20040605/ag14.tar.Z) = 4d38a49b589186f7432eacc41bfb6b321ba65b06
+RMD160 (adobe-cmaps-20040605/ag14.tar.Z) = 2b7ba5ec42b6e03e0eb3512678c175720726d1bc
+Size (adobe-cmaps-20040605/ag14.tar.Z) = 2057991 bytes
+SHA1 (adobe-cmaps-20040605/ai0.tar.Z) = df90b2e71bcc045524dcc4683c1b084713e645ea
+RMD160 (adobe-cmaps-20040605/ai0.tar.Z) = 8b2c1f40aa3d3ce71c9beafc24300fa73f1ac703
+Size (adobe-cmaps-20040605/ai0.tar.Z) = 4037 bytes
+SHA1 (adobe-cmaps-20040605/aj16.tar.Z) = 9412b44df2b6bdba39bbb196cdd4e5877e992d78
+RMD160 (adobe-cmaps-20040605/aj16.tar.Z) = 7f3cfdc4c815abd41e3f57ef742567b0b900d7b2
+Size (adobe-cmaps-20040605/aj16.tar.Z) = 1129751 bytes
+SHA1 (adobe-cmaps-20040605/aj20.tar.Z) = 45e7ebb82fa18eb3f2dc989949e0f673e00c4141
+RMD160 (adobe-cmaps-20040605/aj20.tar.Z) = 7915552a2f2a0f719879858d8326ce278b05c092
+Size (adobe-cmaps-20040605/aj20.tar.Z) = 258583 bytes
+SHA1 (adobe-cmaps-20040605/ak12.tar.Z) = c4c91f6baedee44b8e38c2b8cd8e572dfa4f007c
+RMD160 (adobe-cmaps-20040605/ak12.tar.Z) = ea8824fe1655b095f9e6d4ae4f8426be27f956fb
+Size (adobe-cmaps-20040605/ak12.tar.Z) = 792646 bytes
+SHA1 (adobe-cmaps-20040605/rksj-cmaps.tar.Z) = 48e7831f299ed01b3cb6d26f0bf1b6bee8bc3a5a
+RMD160 (adobe-cmaps-20040605/rksj-cmaps.tar.Z) = ea2fcbdd1a4229a2577be2cc2944dec76db4f306
+Size (adobe-cmaps-20040605/rksj-cmaps.tar.Z) = 40873 bytes
+SHA1 (adobe-cmaps-20040605/chinese_s.zip) = 220425be74ba6aebeada7e9e7970d640a8617b09
+RMD160 (adobe-cmaps-20040605/chinese_s.zip) = abf2d85c054ffcb0abf38e2c50c1ae4ca56d642f
+Size (adobe-cmaps-20040605/chinese_s.zip) = 427910 bytes
+SHA1 (adobe-cmaps-20040605/chinese_t.zip) = 8eecb56627e6971194e4d20d7308c3faa24cd85c
+RMD160 (adobe-cmaps-20040605/chinese_t.zip) = ae8867b632044393556aff40fe1dbe97a7566b68
+Size (adobe-cmaps-20040605/chinese_t.zip) = 399452 bytes
+SHA1 (adobe-cmaps-20040605/japanese.zip) = 9114cf1f1dc8e00494d5b37079aa95fd55583376
+RMD160 (adobe-cmaps-20040605/japanese.zip) = d5cc98a9f46323073f8c9c104bcf8d7a0ae3f975
+Size (adobe-cmaps-20040605/japanese.zip) = 236664 bytes
+SHA1 (adobe-cmaps-20040605/korean.zip) = 817d8dd57d8bb8f23a6439c5a548f0975573d7d1
+RMD160 (adobe-cmaps-20040605/korean.zip) = 95fc2e413ad519863c2678ee6f71da3f846f9290
+Size (adobe-cmaps-20040605/korean.zip) = 258946 bytes