3 files changed, 66 insertions, 57 deletions

diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index dd8723b8e8fb..5cad8f577667 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	adobe-cmaps
 PORTVERSION=	20051217
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-DISTFILES=	ac15.tar.Z ag15.tar.Z \
-		ai0.tar.Z aj16.tar.Z \
-		aj20.tar.Z ak12.tar.Z rksj-cmaps.tar.Z \
-		tounicode.tar.Z
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	hrs/adobe
+DISTFILES=	ac15.tar.gz ag15.tar.gz \
+		ai0.tar.gz aj16.tar.gz \
+		aj20.tar.gz ak12.tar.gz rksj-cmaps.tar.gz
 DIST_SUBDIR=	adobe
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -21,7 +22,7 @@ COMMENT=	Adobe CMap collection
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_SUB=	CMAPDIR=${CMAPDIR}
-INSTDIRS=	ac15 ag15 ai0 aj16 aj20 ak12 rksj-cmaps tounicode
+INSTDIRS=	ac15 ag15 ai0 aj16 aj20 ak12 rksj-cmaps
 CMAPDIR=	share/fonts/${PORTNAME}
 
 post-extract:
diff --git a/print/adobe-cmaps/distinfo b/print/adobe-cmaps/distinfo
index 6dfe64c93f02..a925bf829d22 100644
--- a/print/adobe-cmaps/distinfo
+++ b/print/adobe-cmaps/distinfo
@@ -1,24 +1,21 @@
-MD5 (adobe/ac15.tar.Z) = a9d876f28dde1d4a0a6571eb0e281761
-SHA256 (adobe/ac15.tar.Z) = a6b01e04e2f4b3481915301bfb7ab3a304027b4ea4740a108f177c57ff49ced4
-SIZE (adobe/ac15.tar.Z) = 1391205
-MD5 (adobe/ag15.tar.Z) = 13231ab4429e9059fc4cd91e6e0ce679
-SHA256 (adobe/ag15.tar.Z) = 0fd7a2e7cbb065a0167d197677157bf778ba90cc0826c36dbf35bd7c6a8c3437
-SIZE (adobe/ag15.tar.Z) = 2076450
-MD5 (adobe/ai0.tar.Z) = c33ae7f8e909f149e0ffdd55c58aa2b5
-SHA256 (adobe/ai0.tar.Z) = ac6112be4d792d1f8f458f15e00dbcc487de00262eae1b6c160a52164afb23c2
-SIZE (adobe/ai0.tar.Z) = 4037
-MD5 (adobe/aj16.tar.Z) = 1d17e5f53d20ba8b8abcaeae3300aa26
-SHA256 (adobe/aj16.tar.Z) = 79a6bf7dc6a4d6f1990fe2ce60accec073ce02156b506cbd849ed8c5acf59388
-SIZE (adobe/aj16.tar.Z) = 1135237
-MD5 (adobe/aj20.tar.Z) = 4066b4da3b30106964e5fb3312acaff7
-SHA256 (adobe/aj20.tar.Z) = 1f9e687e792558162aa675637f6303f9837a8db31c72f24bf60b1eb6c61dbbb0
-SIZE (adobe/aj20.tar.Z) = 258583
-MD5 (adobe/ak12.tar.Z) = ef1d6470cd9bdfed1399b922f12432da
-SHA256 (adobe/ak12.tar.Z) = cd4d42cbae513989bd9cb5198ecba191a58c544d03fceadc97de8d7fd795dd7b
-SIZE (adobe/ak12.tar.Z) = 789739
-MD5 (adobe/rksj-cmaps.tar.Z) = 98b26cb513014491ed401dd2bb03535a
-SHA256 (adobe/rksj-cmaps.tar.Z) = 5bf8e30c95c899f6ee4dff08c934f38b510cc79930124b85117255d926d9029d
-SIZE (adobe/rksj-cmaps.tar.Z) = 40873
-MD5 (adobe/tounicode.tar.Z) = aa6817065bb0a799219f9bd452c91622
-SHA256 (adobe/tounicode.tar.Z) = 408ef3e2d64f80e0f60174b48c012c1135061b9ca480afc091ccd4e3704ca6f1
-SIZE (adobe/tounicode.tar.Z) = 358897
+MD5 (adobe/ac15.tar.gz) = 05e4d01118393fc5faaf094d32daac33
+SHA256 (adobe/ac15.tar.gz) = ea3b54a34335580712cb2337e3184809efb105b8a8bf8110e4bf44fd45438250
+SIZE (adobe/ac15.tar.gz) = 1274621
+MD5 (adobe/ag15.tar.gz) = dd7bd90100c67c3996969800e2d28b75
+SHA256 (adobe/ag15.tar.gz) = 6f7f7292c3198bd090b257ff479fe33fce2fea1a10340f86114d0c2501480cd5
+SIZE (adobe/ag15.tar.gz) = 1781899
+MD5 (adobe/ai0.tar.gz) = b9e3e5ad900d1f0de7215878582b919b
+SHA256 (adobe/ai0.tar.gz) = 2fc38c13cff2b40719605afd4ae944bfa1fed65f14cba6e2fc2596d9c1119f6a
+SIZE (adobe/ai0.tar.gz) = 2763
+MD5 (adobe/aj16.tar.gz) = 834d5456fd65c01059dbc43d4436d63d
+SHA256 (adobe/aj16.tar.gz) = 3732294d7830bd5abec6a485bad4afea134b3c43c2d757a14d531e8576e33aaf
+SIZE (adobe/aj16.tar.gz) = 916598
+MD5 (adobe/aj20.tar.gz) = fde22c8dcde2d277bfa6cca19e9581d4
+SHA256 (adobe/aj20.tar.gz) = 6f5ee26f43bd5b84516982c239051d53cf48bba2af7e3b05af1cadad111b916b
+SIZE (adobe/aj20.tar.gz) = 218407
+MD5 (adobe/ak12.tar.gz) = 07d345547e031c5103caa37c17afa2ca
+SHA256 (adobe/ak12.tar.gz) = 7f07bed5eb75896fda401e45c165d583829e78cb9435b6fee3f3d097a80feee3
+SIZE (adobe/ak12.tar.gz) = 791828
+MD5 (adobe/rksj-cmaps.tar.gz) = 1fc7c996c7be7e194a4e5d3a26603100
+SHA256 (adobe/rksj-cmaps.tar.gz) = a0bf0986a7d445f9b41907acf5fee0eb6c015f363fd6bfc95b0fd95de37a7f99
+SIZE (adobe/rksj-cmaps.tar.gz) = 29772
diff --git a/print/adobe-cmaps/pkg-plist b/print/adobe-cmaps/pkg-plist
index c7a995747a3e..f7431ebfab50 100644
--- a/print/adobe-cmaps/pkg-plist
+++ b/print/adobe-cmaps/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%CMAPDIR%%/ac15/cid2code.txt
 %%CMAPDIR%%/ac15/CMap/Adobe-CNS1-0
 %%CMAPDIR%%/ac15/CMap/Adobe-CNS1-1
 %%CMAPDIR%%/ac15/CMap/Adobe-CNS1-2
@@ -15,10 +16,10 @@
 %%CMAPDIR%%/ac15/CMap/CNS1-V
 %%CMAPDIR%%/ac15/CMap/CNS2-H
 %%CMAPDIR%%/ac15/CMap/CNS2-V
-%%CMAPDIR%%/ac15/CMap/ETHK-B5-H
-%%CMAPDIR%%/ac15/CMap/ETHK-B5-V
 %%CMAPDIR%%/ac15/CMap/ETen-B5-H
 %%CMAPDIR%%/ac15/CMap/ETen-B5-V
+%%CMAPDIR%%/ac15/CMap/ETHK-B5-H
+%%CMAPDIR%%/ac15/CMap/ETHK-B5-V
 %%CMAPDIR%%/ac15/CMap/HKdla-B5-H
 %%CMAPDIR%%/ac15/CMap/HKdla-B5-V
 %%CMAPDIR%%/ac15/CMap/HKdlb-B5-H
@@ -39,13 +40,16 @@
 %%CMAPDIR%%/ac15/CMap/UniCNS-UTF32-V
 %%CMAPDIR%%/ac15/CMap/UniCNS-UTF8-H
 %%CMAPDIR%%/ac15/CMap/UniCNS-UTF8-V
-%%CMAPDIR%%/ac15/cid2code.txt
+%%CMAPDIR%%/ac15/CMap/ETen-B5-UCS2
+%%CMAPDIR%%/ac15/CMap/B5pc-UCS2
+%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-UCS2
+%%CMAPDIR%%/ac15/CMap/B5pc-UCS2C
+%%CMAPDIR%%/ag15/cid2code.txt
 %%CMAPDIR%%/ag15/CMap/Adobe-GB1-0
 %%CMAPDIR%%/ag15/CMap/Adobe-GB1-1
 %%CMAPDIR%%/ag15/CMap/Adobe-GB1-2
 %%CMAPDIR%%/ag15/CMap/Adobe-GB1-3
 %%CMAPDIR%%/ag15/CMap/Adobe-GB1-4
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-5
 %%CMAPDIR%%/ag15/CMap/GB-EUC-H
 %%CMAPDIR%%/ag15/CMap/GB-EUC-V
 %%CMAPDIR%%/ag15/CMap/GB-H
@@ -56,14 +60,14 @@
 %%CMAPDIR%%/ag15/CMap/GBK2K-V
 %%CMAPDIR%%/ag15/CMap/GBKp-EUC-H
 %%CMAPDIR%%/ag15/CMap/GBKp-EUC-V
+%%CMAPDIR%%/ag15/CMap/GBpc-EUC-H
+%%CMAPDIR%%/ag15/CMap/GBpc-EUC-V
 %%CMAPDIR%%/ag15/CMap/GBT-EUC-H
 %%CMAPDIR%%/ag15/CMap/GBT-EUC-V
 %%CMAPDIR%%/ag15/CMap/GBT-H
 %%CMAPDIR%%/ag15/CMap/GBT-V
 %%CMAPDIR%%/ag15/CMap/GBTpc-EUC-H
 %%CMAPDIR%%/ag15/CMap/GBTpc-EUC-V
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-V
 %%CMAPDIR%%/ag15/CMap/UniGB-UCS2-H
 %%CMAPDIR%%/ag15/CMap/UniGB-UCS2-V
 %%CMAPDIR%%/ag15/CMap/UniGB-UTF16-H
@@ -72,9 +76,14 @@
 %%CMAPDIR%%/ag15/CMap/UniGB-UTF32-V
 %%CMAPDIR%%/ag15/CMap/UniGB-UTF8-H
 %%CMAPDIR%%/ag15/CMap/UniGB-UTF8-V
-%%CMAPDIR%%/ag15/cid2code.txt
+%%CMAPDIR%%/ag15/CMap/Adobe-GB1-5
+%%CMAPDIR%%/ag15/CMap/GBpc-EUC-UCS2
+%%CMAPDIR%%/ag15/CMap/GBK-EUC-UCS2
+%%CMAPDIR%%/ag15/CMap/Adobe-GB1-UCS2
+%%CMAPDIR%%/ag15/CMap/GBpc-EUC-UCS2C
 %%CMAPDIR%%/ai0/CMap/Identity-H
 %%CMAPDIR%%/ai0/CMap/Identity-V
+%%CMAPDIR%%/aj16/cid2code.txt
 %%CMAPDIR%%/aj16/CMap/78-EUC-H
 %%CMAPDIR%%/aj16/CMap/78-EUC-V
 %%CMAPDIR%%/aj16/CMap/78-H
@@ -98,10 +107,10 @@
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-1
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-2
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-3
+%%CMAPDIR%%/aj16/CMap/EUC-H
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-4
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-5
 %%CMAPDIR%%/aj16/CMap/Adobe-Japan1-6
-%%CMAPDIR%%/aj16/CMap/EUC-H
 %%CMAPDIR%%/aj16/CMap/EUC-V
 %%CMAPDIR%%/aj16/CMap/Ext-H
 %%CMAPDIR%%/aj16/CMap/Ext-RKSJ-H
@@ -133,7 +142,11 @@
 %%CMAPDIR%%/aj16/CMap/UniJISX0213-UTF32-V
 %%CMAPDIR%%/aj16/CMap/V
 %%CMAPDIR%%/aj16/CMap/WP-Symbol
-%%CMAPDIR%%/aj16/cid2code.txt
+%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-UCS2C
+%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-UCS2
+%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-UCS2
+%%CMAPDIR%%/aj16/CMap/90ms-RKSJ-UCS2
+%%CMAPDIR%%/aj20/cid2code.txt
 %%CMAPDIR%%/aj20/CMap/Adobe-Japan2-0
 %%CMAPDIR%%/aj20/CMap/Hojo-EUC-H
 %%CMAPDIR%%/aj20/CMap/Hojo-EUC-V
@@ -147,7 +160,7 @@
 %%CMAPDIR%%/aj20/CMap/UniHojo-UTF32-V
 %%CMAPDIR%%/aj20/CMap/UniHojo-UTF8-H
 %%CMAPDIR%%/aj20/CMap/UniHojo-UTF8-V
-%%CMAPDIR%%/aj20/cid2code.txt
+%%CMAPDIR%%/ak12/cid2code.txt
 %%CMAPDIR%%/ak12/CMap/Adobe-Korea1-0
 %%CMAPDIR%%/ak12/CMap/Adobe-Korea1-1
 %%CMAPDIR%%/ak12/CMap/Adobe-Korea1-2
@@ -171,7 +184,10 @@
 %%CMAPDIR%%/ak12/CMap/UniKS-UTF32-V
 %%CMAPDIR%%/ak12/CMap/UniKS-UTF8-H
 %%CMAPDIR%%/ak12/CMap/UniKS-UTF8-V
-%%CMAPDIR%%/ak12/cid2code.txt
+%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-UCS2
+%%CMAPDIR%%/ak12/CMap/KSCms-UHC-UCS2
+%%CMAPDIR%%/ak12/CMap/Adobe-Korea1-UCS2
+%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-UCS2C
 %%CMAPDIR%%/rksj-cmaps/CNS01-RKSJ-H
 %%CMAPDIR%%/rksj-cmaps/CNS02-RKSJ-H
 %%CMAPDIR%%/rksj-cmaps/CNS03-RKSJ-H
@@ -187,23 +203,18 @@
 %%CMAPDIR%%/rksj-cmaps/KSC-RKSJ-H
 %%CMAPDIR%%/rksj-cmaps/KSC2-RKSJ-H
 %%CMAPDIR%%/rksj-cmaps/TCVN-RKSJ-H
-%%CMAPDIR%%/tounicode/Adobe-CNS1-UCS2
-%%CMAPDIR%%/tounicode/Adobe-GB1-UCS2
-%%CMAPDIR%%/tounicode/Adobe-Japan1-UCS2
-%%CMAPDIR%%/tounicode/Adobe-Korea1-UCS2
-@dirrm %%CMAPDIR%%/ac15/CMap
-@dirrm %%CMAPDIR%%/ac15
-@dirrm %%CMAPDIR%%/ag15/CMap
-@dirrm %%CMAPDIR%%/ag15
-@dirrm %%CMAPDIR%%/ai0/CMap
-@dirrm %%CMAPDIR%%/ai0
-@dirrm %%CMAPDIR%%/aj16/CMap
-@dirrm %%CMAPDIR%%/aj16
-@dirrm %%CMAPDIR%%/aj20/CMap
-@dirrm %%CMAPDIR%%/aj20
+@dirrm %%CMAPDIR%%/rksj-cmaps
 @dirrm %%CMAPDIR%%/ak12/CMap
 @dirrm %%CMAPDIR%%/ak12
-@dirrm %%CMAPDIR%%/rksj-cmaps
-@dirrm %%CMAPDIR%%/tounicode
+@dirrm %%CMAPDIR%%/aj20/CMap
+@dirrm %%CMAPDIR%%/aj20
+@dirrm %%CMAPDIR%%/aj16/CMap
+@dirrm %%CMAPDIR%%/aj16
+@dirrm %%CMAPDIR%%/ai0/CMap
+@dirrm %%CMAPDIR%%/ai0
+@dirrm %%CMAPDIR%%/ag15/CMap
+@dirrm %%CMAPDIR%%/ag15
+@dirrm %%CMAPDIR%%/ac15/CMap
+@dirrm %%CMAPDIR%%/ac15
 @dirrmtry %%CMAPDIR%%
 @dirrmtry share/fonts