Update to ghostscript-8.60:

The major milestone of this release is a merge from the ESP Ghostscript
fork, used to support the CUPS printing system. This means that free
operating systems can now ship a single copy of upstream Ghostscript with
their releases. Thanks to Till Kamppeter and Mike Sweet for making this
possible.

This release also includes numerous important bug fixes over the previous
stable versions, as well as improvements to performance, memory footprint,
shading and image handling. We recommend this upgrade to all free users.

While here, add DESTDIR support.

4 files changed, 35 insertions, 20 deletions

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 87d31d3f680..97bd14004c4 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2007/07/18 02:48:35 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2007/08/08 17:32:06 joerg Exp $
 
-DISTNAME=	ghostscript-8.57
+DISTNAME=	ghostscript-8.60
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ghostscript.sourceforge.net/
 COMMENT=	Postscript interpreter
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		ghostscript-afpl-[0-9]*
 CONFLICTS+=		ghostscript-esp{,-nox11}-[0-9]*
 CONFLICTS+=		ghostscript-gnu{,-nox11,-x11}-[0-9]*
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 2cf0c91eb1b..479da6632be 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2007/08/03 20:02:30 joerg Exp $
+$NetBSD: distinfo,v 1.11 2007/08/08 17:32:07 joerg Exp $
 
-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 (ghostscript-8.60.tar.bz2) = f0045b5055d7f83bf34b205976f73a7dafdac863
+RMD160 (ghostscript-8.60.tar.bz2) = 208168fcd6bc5fd931d15b288ce9324f59ba07a3
+Size (ghostscript-8.60.tar.bz2) = 12942029 bytes
+SHA1 (patch-aa) = b12a8c2fb03ac12b65f986b4c7d6ef81a29d3685
 SHA1 (patch-ab) = 2477242c4c5f6b6feaaa217deb1aa37485f2fac5
 SHA1 (patch-ac) = f13cea6787a848b637a44d1e8e15507236d0d659
-SHA1 (patch-ad) = ed75f35c19ae2b19bc8902522b5d4828dfa278fe
+SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401
diff --git a/print/ghostscript/patches/patch-aa b/print/ghostscript/patches/patch-aa
index 79a9b00b33a..c4bc7922100 100644
--- a/print/ghostscript/patches/patch-aa
+++ b/print/ghostscript/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2006/12/27 18:18:22 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2007/08/08 17:32:07 joerg Exp $
 
---- src/Makefile.in.orig	2006-05-15 19:35:26.000000000 +0200
+--- src/Makefile.in.orig	2007-07-25 00:23:34.000000000 +0200
 +++ src/Makefile.in
-@@ -60,8 +60,8 @@ datadir = @datadir@
- gsdir = $(datadir)/ghostscript
+@@ -68,8 +68,8 @@ gsdir = @datadir@/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+ gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION)
  
 -docdir=$(gsdatadir)/doc
 -exdir=$(gsdatadir)/examples
diff --git a/print/ghostscript/patches/patch-ad b/print/ghostscript/patches/patch-ad
index d0e33a74d7c..a636862ca57 100644
--- a/print/ghostscript/patches/patch-ad
+++ b/print/ghostscript/patches/patch-ad
@@ -1,18 +1,31 @@
-$NetBSD: patch-ad,v 1.2 2006/12/27 18:18:22 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2007/08/08 17:32:07 joerg Exp $
 
---- lib/pv.sh.orig	2004-08-04 01:55:46.000000000 +0100
+--- lib/pv.sh.orig	2007-07-05 12:41:52.000000000 +0200
 +++ lib/pv.sh
-@@ -34,9 +34,10 @@ TEMPDIR=.
+@@ -30,21 +30,13 @@ fi
+ # executable name set in the makefile
+ GS_EXECUTABLE=gs
+ 
+-TEMPDIR=.
  PAGE=$1
  shift
- FILE=$1
+ FILE="$1"
 +TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
  shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
+-if test -z "$TEMPDIR"; then
+-	TEMPDIR=/tmp
+-fi
+-if which mktemp >/dev/null 2>/dev/null; then
+-	tmpfile="`mktemp $TEMPDIR/\"$FILE\".pv.XXXXXX`"
+-else
+-	tmpfile="$TEMPDIR/$FILE.$$.pv"
+-fi
+-trap "rm -rf $tmpfile" 0 1 2 15
+-#dvips -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
+-dvips -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
+-$GS_EXECUTABLE $tmpfile
 +trap "rm -rf $TEMPFILE" 0 1 2 15
- #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--$GS_EXECUTABLE $FILE.$$.pv
++#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $TEMPFILE
 +dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
 +gs $TEMPFILE
  exit 0