update to 8.57

In addition to the usual bug fixes, there are specific performance and
quality improvements in the areas of patterns, shading and image
filtering. Also new in this release is an implementation of the Well
Tempered Screening algorithm in an output device, using Graeme
Gill's IMDI library for efficient color mapping.

pkgsrc change: use the bundled jasper as the pkgsrc one is incompatible

4 files changed, 28 insertions, 35 deletions

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 791ca7dcf25..b343e6c7adc 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2007/07/01 20:56:27 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/07/17 18:53:54 drochner Exp $
 
-DISTNAME=	ghostscript-8.54-gpl
-PKGNAME=	ghostscript-8.54
-PKGREVISION=	4
+DISTNAME=	ghostscript-8.57
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,13 +37,14 @@ SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
 post-extract:
 	${MKDIR} ${WRKSRC}/bin
 	${MKDIR} ${WRKSRC}/obj
-	${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse
+#	${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse
 	${MV} ${WRKSRC}/libpng ${WRKSRC}/libpng.dontuse
-	${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse
+#	${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse
 
 .include "options.mk"
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
+# pkgsrc jasper is too new
+#.include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST
index 53fc4beceb3..eb88de8b5b6 100644
--- a/print/ghostscript/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/12/27 18:18:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/07/17 18:53:54 drochner Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -27,6 +27,7 @@ bin/ps2pdf13
 bin/ps2pdf14
 bin/ps2pdfwr
 bin/ps2ps
+bin/ps2ps2
 bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
@@ -72,7 +73,6 @@ share/doc/ghostscript/API.htm
 share/doc/ghostscript/C-style.htm
 share/doc/ghostscript/Changes.htm
 share/doc/ghostscript/Commprod.htm
-share/doc/ghostscript/Copying.htm
 share/doc/ghostscript/DLL.htm
 share/doc/ghostscript/Deprecated.htm
 share/doc/ghostscript/Details.htm
@@ -105,7 +105,6 @@ share/doc/ghostscript/Ps-style.htm
 share/doc/ghostscript/Ps2epsi.htm
 share/doc/ghostscript/Ps2pdf.htm
 share/doc/ghostscript/Psfiles.htm
-share/doc/ghostscript/Public.htm
 share/doc/ghostscript/README
 share/doc/ghostscript/Readme.htm
 share/doc/ghostscript/Release.htm
@@ -278,6 +277,8 @@ share/ghostscript/${PKGVERSION}/Resource/CMap/Hojo-H
 share/ghostscript/${PKGVERSION}/Resource/CMap/Hojo-RKSJ-H
 share/ghostscript/${PKGVERSION}/Resource/CMap/Hojo-V
 share/ghostscript/${PKGVERSION}/Resource/CMap/Identity-H
+share/ghostscript/${PKGVERSION}/Resource/CMap/Identity-UTF16-H
+share/ghostscript/${PKGVERSION}/Resource/CMap/Identity-UTF16-V
 share/ghostscript/${PKGVERSION}/Resource/CMap/Identity-V
 share/ghostscript/${PKGVERSION}/Resource/CMap/KSC-EUC-H
 share/ghostscript/${PKGVERSION}/Resource/CMap/KSC-EUC-V
@@ -364,14 +365,19 @@ share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultCMYK
 share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultGray
 share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultRGB
 share/ghostscript/${PKGVERSION}/Resource/ColorSpace/TrivialCMYK
+share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Dingbats
+share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Symbol
+share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Unicode
+share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Wingdings
 share/ghostscript/${PKGVERSION}/Resource/Decoding/Latin1
 share/ghostscript/${PKGVERSION}/Resource/Decoding/StandardEncoding
 share/ghostscript/${PKGVERSION}/Resource/Decoding/Unicode
-share/ghostscript/${PKGVERSION}/lib/FAPIcidfmap
-share/ghostscript/${PKGVERSION}/lib/FAPIconfig
-share/ghostscript/${PKGVERSION}/lib/FAPIfontmap
+share/ghostscript/${PKGVERSION}/Resource/Encoding/Wingdings
+share/ghostscript/${PKGVERSION}/lib/FCOfontmap-PCLPS2
 share/ghostscript/${PKGVERSION}/lib/Fontmap
 share/ghostscript/${PKGVERSION}/lib/Fontmap.GS
+share/ghostscript/${PKGVERSION}/lib/PDFA_def.ps
+share/ghostscript/${PKGVERSION}/lib/PDFX_def.ps
 share/ghostscript/${PKGVERSION}/lib/acctest.ps
 share/ghostscript/${PKGVERSION}/lib/addxchar.ps
 share/ghostscript/${PKGVERSION}/lib/align.ps
@@ -419,6 +425,7 @@ share/ghostscript/${PKGVERSION}/lib/gs_agl.ps
 share/ghostscript/${PKGVERSION}/lib/gs_btokn.ps
 share/ghostscript/${PKGVERSION}/lib/gs_ccfnt.ps
 share/ghostscript/${PKGVERSION}/lib/gs_ce_e.ps
+share/ghostscript/${PKGVERSION}/lib/gs_cet.ps
 share/ghostscript/${PKGVERSION}/lib/gs_cff.ps
 share/ghostscript/${PKGVERSION}/lib/gs_cidcm.ps
 share/ghostscript/${PKGVERSION}/lib/gs_ciddc.ps
@@ -509,8 +516,10 @@ share/ghostscript/${PKGVERSION}/lib/level1.ps
 share/ghostscript/${PKGVERSION}/lib/lines.ps
 share/ghostscript/${PKGVERSION}/lib/markhint.ps
 share/ghostscript/${PKGVERSION}/lib/markpath.ps
+share/ghostscript/${PKGVERSION}/lib/mkcidfm.ps
 share/ghostscript/${PKGVERSION}/lib/necp2x.upp
 share/ghostscript/${PKGVERSION}/lib/necp2x6.upp
+share/ghostscript/${PKGVERSION}/lib/opdfread.ps
 share/ghostscript/${PKGVERSION}/lib/packfile.ps
 share/ghostscript/${PKGVERSION}/lib/pcharstr.ps
 share/ghostscript/${PKGVERSION}/lib/pdf2dsc.ps
@@ -526,6 +535,8 @@ share/ghostscript/${PKGVERSION}/lib/pdfwrite.ps
 share/ghostscript/${PKGVERSION}/lib/pf2afm.ps
 share/ghostscript/${PKGVERSION}/lib/pfbtopfa.ps
 share/ghostscript/${PKGVERSION}/lib/ppath.ps
+share/ghostscript/${PKGVERSION}/lib/pphs
+share/ghostscript/${PKGVERSION}/lib/pphs.ps
 share/ghostscript/${PKGVERSION}/lib/prfont.ps
 share/ghostscript/${PKGVERSION}/lib/printafm.ps
 share/ghostscript/${PKGVERSION}/lib/ps2ai.ps
@@ -591,6 +602,7 @@ share/ghostscript/${PKGVERSION}/lib/wrfont.ps
 share/ghostscript/${PKGVERSION}/lib/xlatmap
 share/ghostscript/${PKGVERSION}/lib/zeroline.ps
 @dirrm share/ghostscript/${PKGVERSION}/lib
+@dirrm share/ghostscript/${PKGVERSION}/Resource/Encoding
 @dirrm share/ghostscript/${PKGVERSION}/Resource/Decoding
 @dirrm share/ghostscript/${PKGVERSION}/Resource/ColorSpace
 @dirrm share/ghostscript/${PKGVERSION}/Resource/CMap
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index e4d1633f249..44b634ac770 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2007/06/29 19:24:45 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2007/07/17 18:53:55 drochner Exp $
 
-SHA1 (ghostscript-8.54-gpl.tar.bz2) = 5da69b04ddc8a4660a2c40b0e561a358c737c310
-RMD160 (ghostscript-8.54-gpl.tar.bz2) = f61f6da568ffe440a466cd0d7b5871a3d87d1116
-Size (ghostscript-8.54-gpl.tar.bz2) = 12365361 bytes
+SHA1 (ghostscript-8.57.tar.bz2) = 17975b561a05b036fe06c96e8efdc512b9960062
+RMD160 (ghostscript-8.57.tar.bz2) = 034331d9713cb551e1081c6bd53dbe4c983c2908
+Size (ghostscript-8.57.tar.bz2) = 11934408 bytes
 SHA1 (patch-aa) = 9ac0ae294042e69c41fc8579e71971ad57656a8b
 SHA1 (patch-ab) = 2477242c4c5f6b6feaaa217deb1aa37485f2fac5
-SHA1 (patch-ac) = 64f3f4eb10aa5711122332a4e9c4292a8a3dd265
 SHA1 (patch-ad) = ed75f35c19ae2b19bc8902522b5d4828dfa278fe
diff --git a/print/ghostscript/patches/patch-ac b/print/ghostscript/patches/patch-ac
deleted file mode 100644
index 68a8122a638..00000000000
--- a/print/ghostscript/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/06/29 19:24:46 dmcmahill Exp $
-
-Don't segfault on 64-bit systems.
-
-Patch found in Debian bug 390875 and tested on netbsd-2/alpha.
-
---- src/gxfcopy.c.orig	2006-03-23 12:39:23.000000000 +0000
-+++ src/gxfcopy.c
-@@ -2391,7 +2391,7 @@ order_font_data(gs_copied_font_data_t *c
- 	    a[j++] = &cfdata->names[i];
- 	}
-     }
--    qsort(a, cfdata->num_glyphs, sizeof(int), compare_glyph_names);
-+    qsort(a, cfdata->num_glyphs, sizeof(gs_copied_glyph_name_t *), compare_glyph_names);
-     for (; j >= 0; j--)
- 	cfdata->glyphs[j].order_index = a[j] - cfdata->names;    
-     gs_free_object(memory, a, "order_font_data");