Upgrade to version 8.15.

4 files changed, 85 insertions, 11 deletions

diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index 0e56519292bc..96e517baa9de 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-GS_VERSION=	8.14
-GS_REVISION=	6
+GS_VERSION=	8.15
+GS_REVISION=	0
 GS_EPOCH=	1
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 89ef9207feab..0b5cf983b1a1 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghostscript/ghostscript-8.14.tar.bz2) = 5f22dbe24b7fc8c8c07e249f8b14f9ce
-SIZE (ghostscript/ghostscript-8.14.tar.bz2) = 5719617
+MD5 (ghostscript/ghostscript-8.15.tar.bz2) = ab8502f30629b730e0c9ca56b88a6b9d
+SIZE (ghostscript/ghostscript-8.15.tar.bz2) = 6931694
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript-afpl/files/patch-lib:pdf_font.ps b/print/ghostscript-afpl/files/patch-lib:pdf_font.ps
index 28e098c7acd9..7bc2569e0704 100644
--- a/print/ghostscript-afpl/files/patch-lib:pdf_font.ps
+++ b/print/ghostscript-afpl/files/patch-lib:pdf_font.ps
@@ -1,14 +1,14 @@
---- lib/pdf_font.ps.orig	Fri Oct 24 02:45:33 2003
-+++ lib/pdf_font.ps	Thu Dec 18 23:11:07 2003
-@@ -1113,10 +1113,12 @@
+--- lib/pdf_font.ps.orig	Mon Aug 30 21:03:30 2004
++++ lib/pdf_font.ps	Wed Dec 29 17:17:19 2004
+@@ -1114,10 +1114,12 @@
  
  /buildCIDType0 {	% <CIDFontType0-font-resource> buildCIDType0 <font>
-   dup /BaseFont get exch 1 index findCIDFont
+   dup /BaseFont get findCIDFont exch pop
 +  addCIDmetrics /CIDFont defineresource
  } bdef
  
  /buildCIDType2 {	% <CIDFontType2-font-resource> buildCIDType2 <font>
-   dup /BaseFont get exch 1 index findCIDFont
+   dup /BaseFont get findCIDFont exch pop
 +  addCIDmetrics /CIDFont defineresource
  } bdef
  
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 0f02d3552a82..1dbaa2ab79d3 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -63,16 +63,49 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2C
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-B5pc
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Mac
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBK-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Mac
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-0
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-1
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90ms-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90pv-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Mac
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCms-UHC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2C
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-H
@@ -86,29 +119,71 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2C
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hankaku
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hiragana
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2C
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Katakana
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Roman
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90ms-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90pv-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-B5pc
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBK-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCms-UHC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCpc-EUC
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
@@ -126,7 +201,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/doc/C-style.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Changes.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Commprod.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Copying.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/DLL.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Develop.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Devices.htm
@@ -149,7 +223,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/doc/Make.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/New-user.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/News.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/PUBLIC
 %%DATADIR%%/%%GS_VERSION%%/doc/Projects.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Ps-style.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Ps2epsi.htm
@@ -225,6 +298,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/errpage.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2c.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2pcl.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/ghostpdf.ppd
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_agl.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_btokn.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_ccfnt.ps