Announce the release of GPL Ghostscript. This release is based on

the AFPL Ghostscript 8.00 release of 14 months ago. The most
significant new feature since 7.0x is support for DeviceN
colorspaces, up to 8 colorants total at 8 bits per component. Also,
pdfwrite has seen considerable improvement in font handling, and
many other bug fixes.

PR:		ports/72326
Submitted by:	Ports Fury

20 files changed, 199 insertions, 53 deletions

diff --git a/print/Makefile b/print/Makefile
index c26a926..73e1d9a 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -75,6 +75,8 @@
     SUBDIR += ghostscript-gnu
     SUBDIR += ghostscript-gnu-commfont
     SUBDIR += ghostscript-gnu-nox11
+    SUBDIR += ghostscript-gpl
+    SUBDIR += ghostscript-gpl-nox11
     SUBDIR += ghostview
     SUBDIR += gimp-print
     SUBDIR += gl2ps
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 56f8d09..3b4255a 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -55,7 +55,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print
 
 NO_CDROM=	"Can only be distributed for free"
 
-CONFLICTS=	ghostscript-gnu*
+CONFLICTS=	ghostscript-gnu* ghostscript-gpl*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index e376967..a79424d 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -59,7 +59,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-CONFLICTS=	ghostscript-afpl*
+CONFLICTS=	ghostscript-afpl* ghostscript-gpl*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/ghostscript-gpl-nox11/Makefile b/print/ghostscript-gpl-nox11/Makefile
index 0e12861..bbf7efa 100644
--- a/print/ghostscript-gpl-nox11/Makefile
+++ b/print/ghostscript-gpl-nox11/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   ghostscript-afpl-nox11
+# New ports collection makefile for:   ghostscript-gpl-nox11
 # Date created:		23 February 2001
 # Whom:			nik
 #
@@ -7,6 +7,6 @@
 
 WITHOUT_X11=	yes
 
-MASTERDIR=	${.CURDIR}/../ghostscript-afpl
+MASTERDIR=	${.CURDIR}/../ghostscript-gpl
 
 .include        "${MASTERDIR}/Makefile"
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 56f8d09..4d11529 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -22,11 +22,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
 			./:ports_jp
-PKGNAMESUFFIX=	-afpl
+PKGNAMESUFFIX=	-gpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
@@ -47,15 +47,13 @@ DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	AFPL Postscript interpreter
+COMMENT=	GPL Postscript interpreter
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-NO_CDROM=	"Can only be distributed for free"
-
-CONFLICTS=	ghostscript-gnu*
+CONFLICTS=	ghostscript-afpl* ghostscript-gnu*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 0e56519..1740763 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-GS_VERSION=	8.14
-GS_REVISION=	6
-GS_EPOCH=	1
+GS_VERSION=	8.15
+GS_REVISION=	0
+GS_EPOCH=	0
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 89ef920..0b5cf98 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/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-gpl/files/patch-lib:pdf_font.ps b/print/ghostscript-gpl/files/patch-lib:pdf_font.ps
index 28e098c..98f38d2 100644
--- a/print/ghostscript-gpl/files/patch-lib:pdf_font.ps
+++ b/print/ghostscript-gpl/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	Tue Aug 31 13:03:30 2004
++++ lib/pdf_font.ps	Wed Sep 15 19:15:00 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-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index 60c6e9e..3e6b523 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -2,9 +2,9 @@ Ghostscript is the well-known PostScript interpreter which is available for
 all common and most esoteric platforms and supports many different printers
 and some displays.
 
-Versions entitled "AFPL Ghostscript" are distributed with a licence different
-from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in
-${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
+Versions entitled "GPL Ghostscript" are distributed with the GNU General
+Public License, which allows free use, and free copying and redistribution
+under certain conditions (including, in some cases, commercial distribution).
 
 This port includes add-on packages (not part of the official gs release)
 	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
@@ -16,4 +16,4 @@ This port includes add-on packages (not part of the official gs release)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
-WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.htm
+WWW: http://www.cs.wisc.edu/~ghost/doc/gnu/index.htm
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 0f02d35..1dbaa2a 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/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
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index a6d2cf4..96efeb1 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -86,7 +86,7 @@ for i; do
 done
 
 if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "AFPL Ghostscript driver configuration" --clear \
+	/usr/bin/dialog --title "GPL Ghostscript driver configuration" --clear \
 		--checklist "\n\
 This new ghostscript driver configuration dialog allows you to choose \n\
 only those gs drivers, you really need. Don't think too economical, since \n\
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index e376967..a79424d 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -59,7 +59,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-CONFLICTS=	ghostscript-afpl*
+CONFLICTS=	ghostscript-afpl* ghostscript-gpl*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/ghostscript8-nox11/Makefile b/print/ghostscript8-nox11/Makefile
index 0e12861..bbf7efa 100644
--- a/print/ghostscript8-nox11/Makefile
+++ b/print/ghostscript8-nox11/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   ghostscript-afpl-nox11
+# New ports collection makefile for:   ghostscript-gpl-nox11
 # Date created:		23 February 2001
 # Whom:			nik
 #
@@ -7,6 +7,6 @@
 
 WITHOUT_X11=	yes
 
-MASTERDIR=	${.CURDIR}/../ghostscript-afpl
+MASTERDIR=	${.CURDIR}/../ghostscript-gpl
 
 .include        "${MASTERDIR}/Makefile"
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 56f8d09..4d11529 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -22,11 +22,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
 			./:ports_jp
-PKGNAMESUFFIX=	-afpl
+PKGNAMESUFFIX=	-gpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
 		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
@@ -47,15 +47,13 @@ DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	AFPL Postscript interpreter
+COMMENT=	GPL Postscript interpreter
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-NO_CDROM=	"Can only be distributed for free"
-
-CONFLICTS=	ghostscript-gnu*
+CONFLICTS=	ghostscript-afpl* ghostscript-gnu*
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 0e56519..1740763 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-GS_VERSION=	8.14
-GS_REVISION=	6
-GS_EPOCH=	1
+GS_VERSION=	8.15
+GS_REVISION=	0
+GS_EPOCH=	0
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 89ef920..0b5cf98 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/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/ghostscript8/files/patch-lib:pdf_font.ps b/print/ghostscript8/files/patch-lib:pdf_font.ps
index 28e098c..98f38d2 100644
--- a/print/ghostscript8/files/patch-lib:pdf_font.ps
+++ b/print/ghostscript8/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	Tue Aug 31 13:03:30 2004
++++ lib/pdf_font.ps	Wed Sep 15 19:15:00 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/ghostscript8/pkg-descr b/print/ghostscript8/pkg-descr
index 60c6e9e..3e6b523 100644
--- a/print/ghostscript8/pkg-descr
+++ b/print/ghostscript8/pkg-descr
@@ -2,9 +2,9 @@ Ghostscript is the well-known PostScript interpreter which is available for
 all common and most esoteric platforms and supports many different printers
 and some displays.
 
-Versions entitled "AFPL Ghostscript" are distributed with a licence different
-from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in
-${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details !
+Versions entitled "GPL Ghostscript" are distributed with the GNU General
+Public License, which allows free use, and free copying and redistribution
+under certain conditions (including, in some cases, commercial distribution).
 
 This port includes add-on packages (not part of the official gs release)
 	o HP2200 driver for HP DeskJet 8xx and Business Inkjet 2200
@@ -16,4 +16,4 @@ This port includes add-on packages (not part of the official gs release)
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
-WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.htm
+WWW: http://www.cs.wisc.edu/~ghost/doc/gnu/index.htm
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 0f02d35..1dbaa2a 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/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
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index a6d2cf4..96efeb1 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -86,7 +86,7 @@ for i; do
 done
 
 if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "AFPL Ghostscript driver configuration" --clear \
+	/usr/bin/dialog --title "GPL Ghostscript driver configuration" --clear \
 		--checklist "\n\
 This new ghostscript driver configuration dialog allows you to choose \n\
 only those gs drivers, you really need. Don't think too economical, since \n\