10 files changed, 51 insertions, 86 deletions
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 3728df88d8e..d08fd434517 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2013/02/16 11:17:57 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2013/03/08 20:45:24 adam Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
-PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/
@@ -22,9 +21,10 @@ CONFLICTS+=		ghostscript-afpl-[0-9]*
 CONFLICTS+=		ghostscript-esp{,-nox11}-[0-9]*
 CONFLICTS+=		ghostscript-gnu{,-nox11,-x11}-[0-9]*
 
-USE_TOOLS+=		gmake perl:run lex pkg-config
 USE_LANGUAGES+=		c c++
+USE_TOOLS+=		gmake perl:run lex pkg-config
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-system-libtiff
 UNLIMIT_RESOURCES+=	datasize	# gsromfs1.c
 
 BUILD_TARGET=		so
@@ -86,12 +86,12 @@ CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
 post-extract:
 	${MKDIR} ${WRKSRC}/bin
 	${MKDIR} ${WRKSRC}/obj
-#	${RM} -rf ${WRKSRC}/jasper
-	${RM} -rf ${WRKSRC}/libpng
-#	${RM} -rf ${WRKSRC}/tiff
-#	${RM} -rf ${WRKSRC}/zlib
 	${RM} -rf ${WRKSRC}/freetype
-#
+	${RM} -rf ${WRKSRC}/jpeg
+#	${RM} -rf ${WRKSRC}/lcms2
+	${RM} -rf ${WRKSRC}/libpng
+	${RM} -rf ${WRKSRC}/zlib
+
 #  To allow outside customization, rename cidfmap
 #	 (if you look at inside of the file, it is logically empty)
 .if !empty(PKG_OPTIONS:Mdisable-compile-inits)
@@ -101,11 +101,10 @@ post-extract:
 post-install:
 	${LN} -sf gsc ${DESTDIR}${PREFIX}/bin/gs
 
-.include "../../print/libpaper/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-# pkgsrc jasper is too new
-#.include "../../graphics/jasper/buildlink3.mk"
+#.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/libpaper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript/Makefile.common b/print/ghostscript/Makefile.common
index cbe5e7d7de1..dde85d4fad7 100644
--- a/print/ghostscript/Makefile.common
+++ b/print/ghostscript/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2012/10/11 03:09:24 mef Exp $
+# $NetBSD: Makefile.common,v 1.3 2013/03/08 20:45:25 adam Exp $
 # used by print/ghostscript/Makefile
 # used by fonts/ghostscript-cidfonts/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.05
+GS_VERSION=	9.07
diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST
index 991a81d73c2..18ee75a80c7 100644
--- a/print/ghostscript/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2012/10/07 14:19:18 mef Exp $
-bin/dumphint
+@comment $NetBSD: PLIST,v 1.18 2013/03/08 20:45:25 adam Exp $
 bin/dvipdf
 bin/eps2eps
 bin/font2c
@@ -15,7 +14,6 @@ bin/gsx
 bin/lprsetup.sh
 bin/pdf2dsc
 bin/pdf2ps
-bin/pdfopt
 bin/pf2afm
 bin/pfbtopfa
 bin/pphs
@@ -371,7 +369,9 @@ ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/GB1-WMode
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Japan1-WMode
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/Resource/SubstCID/Korea1-WMode
 share/ghostscript/${PKGVERSION}/doc/API.htm
+share/ghostscript/${PKGVERSION}/doc/AUTHORS
 share/ghostscript/${PKGVERSION}/doc/C-style.htm
+share/ghostscript/${PKGVERSION}/doc/COPYING
 share/ghostscript/${PKGVERSION}/doc/Changes.htm
 share/ghostscript/${PKGVERSION}/doc/Commprod.htm
 share/ghostscript/${PKGVERSION}/doc/DLL.htm
@@ -383,6 +383,8 @@ share/ghostscript/${PKGVERSION}/doc/Develop.htm
 share/ghostscript/${PKGVERSION}/doc/Devices.htm
 share/ghostscript/${PKGVERSION}/doc/Drivers.htm
 share/ghostscript/${PKGVERSION}/doc/Fonts.htm
+share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.pdf
+share/ghostscript/${PKGVERSION}/doc/GS9_Color_Management.tex
 share/ghostscript/${PKGVERSION}/doc/Helpers.htm
 share/ghostscript/${PKGVERSION}/doc/Hershey.htm
 share/ghostscript/${PKGVERSION}/doc/History1.htm
@@ -404,15 +406,21 @@ share/ghostscript/${PKGVERSION}/doc/Projects.htm
 share/ghostscript/${PKGVERSION}/doc/Ps-style.htm
 share/ghostscript/${PKGVERSION}/doc/Ps2epsi.htm
 share/ghostscript/${PKGVERSION}/doc/Ps2pdf.htm
+share/ghostscript/${PKGVERSION}/doc/Ps2ps2.htm
 share/ghostscript/${PKGVERSION}/doc/Psfiles.htm
 share/ghostscript/${PKGVERSION}/doc/Readme.htm
 share/ghostscript/${PKGVERSION}/doc/Release.htm
 share/ghostscript/${PKGVERSION}/doc/Source.htm
 share/ghostscript/${PKGVERSION}/doc/Unix-lpr.htm
 share/ghostscript/${PKGVERSION}/doc/Use.htm
+share/ghostscript/${PKGVERSION}/doc/WhatIsGS.htm
 share/ghostscript/${PKGVERSION}/doc/Xfonts.htm
+share/ghostscript/${PKGVERSION}/doc/gs-vms.hlp
 share/ghostscript/${PKGVERSION}/doc/gs.css
+share/ghostscript/${PKGVERSION}/doc/gsdoc.el
 share/ghostscript/${PKGVERSION}/doc/index.html
+share/ghostscript/${PKGVERSION}/doc/pscet_status.txt
+share/ghostscript/${PKGVERSION}/doc/thirdparty.htm
 share/ghostscript/${PKGVERSION}/examples/alphabet.ps
 share/ghostscript/${PKGVERSION}/examples/annots.pdf
 share/ghostscript/${PKGVERSION}/examples/chess.ps
@@ -435,7 +443,10 @@ share/ghostscript/${PKGVERSION}/examples/golfer.eps
 share/ghostscript/${PKGVERSION}/examples/grayalph.ps
 share/ghostscript/${PKGVERSION}/examples/ridt91.eps
 share/ghostscript/${PKGVERSION}/examples/snowflak.ps
+share/ghostscript/${PKGVERSION}/examples/text_graph_image_cmyk_rgb.pdf
+share/ghostscript/${PKGVERSION}/examples/text_graphic_image.pdf
 share/ghostscript/${PKGVERSION}/examples/tiger.eps
+share/ghostscript/${PKGVERSION}/examples/transparency_example.ps
 share/ghostscript/${PKGVERSION}/examples/vasarely.ps
 share/ghostscript/${PKGVERSION}/examples/waterfal.ps
 ${PLIST.no_cidfmap}share/ghostscript/${PKGVERSION}/iccprofiles/default_cmyk.icc
@@ -509,7 +520,6 @@ share/ghostscript/${PKGVERSION}/lib/dmp_site.ps
 share/ghostscript/${PKGVERSION}/lib/dnj750c.upp
 share/ghostscript/${PKGVERSION}/lib/dnj750m.upp
 share/ghostscript/${PKGVERSION}/lib/docie.ps
-share/ghostscript/${PKGVERSION}/lib/dumphint.ps
 share/ghostscript/${PKGVERSION}/lib/escp_24.src
 share/ghostscript/${PKGVERSION}/lib/font2c.ps
 share/ghostscript/${PKGVERSION}/lib/font2pcl.ps
@@ -556,7 +566,6 @@ share/ghostscript/${PKGVERSION}/lib/necp2x6.upp
 share/ghostscript/${PKGVERSION}/lib/packfile.ps
 share/ghostscript/${PKGVERSION}/lib/pcharstr.ps
 share/ghostscript/${PKGVERSION}/lib/pdf2dsc.ps
-share/ghostscript/${PKGVERSION}/lib/pdfopt.ps
 share/ghostscript/${PKGVERSION}/lib/pdfwrite.ps
 share/ghostscript/${PKGVERSION}/lib/pf2afm.ps
 share/ghostscript/${PKGVERSION}/lib/pfbtopfa.ps
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index bd5c3ea15ad..247b5f040f7 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.41 2012/12/12 16:37:08 bsiegert Exp $
+$NetBSD: distinfo,v 1.42 2013/03/08 20:45:25 adam Exp $
 
-SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
-RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
-Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
-SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
+SHA1 (ghostscript-9.07.tar.bz2) = 550a85e73b7213d8ae41ea06523661638b4bc1a2
+RMD160 (ghostscript-9.07.tar.bz2) = 704750aa367650b74135dc4f8a3caeccb8d1b0d6
+Size (ghostscript-9.07.tar.bz2) = 27776111 bytes
 SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
 SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
-SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
 SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
-SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
-SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
-SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 4be081d6c4c9bc632ef8d9685fe4167ea3c51484
+SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
+SHA1 (patch-configure.ac) = 20733b52f41353bad47a0ce55f16eaab769e2b27
+SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 207a22833f6e7026feea0bfc3f7411d228f03e6e
diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk
index 9dc1d2658b2..47d61786e74 100644
--- a/print/ghostscript/options.mk
+++ b/print/ghostscript/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2012/10/07 14:19:18 mef Exp $
+# $NetBSD: options.mk,v 1.13 2013/03/08 20:45:25 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+=	--with-x
 .include "../../x11/libXext/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ARGS+=	--disable-freetype
 .endif
 
 PLIST_VARS+=		cups
@@ -50,7 +49,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .include "../../fonts/fontconfig/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-fontconfig
-CONFIGURE_ARGS+=	--disable-freetype
 .endif
 
 # Please note the same if condition is in post-extract: target in Makefile
diff --git a/print/ghostscript/patches/patch-CVE-2012-4405 b/print/ghostscript/patches/patch-CVE-2012-4405
deleted file mode 100644
index 356d69f1b6f..00000000000
--- a/print/ghostscript/patches/patch-CVE-2012-4405
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-CVE-2012-4405,v 1.2 2012/10/07 14:19:18 mef Exp $
-
-from RedHat bug #854227
-
---- icclib/icc.c.orig	2009-07-28 07:48:19.000000000 +0000
-+++ icclib/icc.c
-@@ -4996,6 +4996,11 @@
-         p->clutPoints = read_UInt8Number(bp+10);
- 
-         /* Sanity check */
-+	if (p->inputChan < 1) {
-+		sprintf(icp->err,"icmLut_read: No input channels!");
-+		return icp->errc = 1;
-+	}
-+
-         if (p->inputChan > MAX_CHAN) {
-                 sprintf(icp->err,"icmLut_read: Can't handle > %d input channels\n",MAX_CHAN);
-                 return icp->errc = 1;
diff --git a/print/ghostscript/patches/patch-an b/print/ghostscript/patches/patch-an
deleted file mode 100644
index bdd19fcf5f4..00000000000
--- a/print/ghostscript/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.4 2012/10/07 14:19:18 mef Exp $
-
-Do some initialization of global stuff earlier, in particular before
-"@file" args get processed, fixes PR pkg/42984 from T. M. Pederson.
-I'm not 100% sure that this has no side effects (the initialization
-order in gs is messy and undocumented) but I haven't found any within
-some weeks of testing.
-
---- psi/imainarg.c.orig	2011-01-13 23:37:33.000000000 +0900
-+++ psi/imainarg.c	2011-03-30 16:22:08.000000000 +0900
-@@ -194,6 +194,11 @@
-                 return e_Fatal;
-         }
-     }
-+
-+    code = gs_main_init1(minst);
-+    if (code < 0)
-+      return code;
-+
-     while ((arg = arg_next(&args, &code)) != 0) {
-         switch (*arg) {
-             case '-':
diff --git a/print/ghostscript/patches/patch-base_gserrors_h b/print/ghostscript/patches/patch-base_gserrors_h
index 0e5449c3341..b6bd1d3343e 100644
--- a/print/ghostscript/patches/patch-base_gserrors_h
+++ b/print/ghostscript/patches/patch-base_gserrors_h
@@ -1,10 +1,11 @@
-$NetBSD: patch-base_gserrors_h,v 1.1 2012/10/07 14:19:18 mef Exp $
-# This suppresses the noisy warning that __func__ redefined
+$NetBSD: patch-base_gserrors_h,v 1.2 2013/03/08 20:45:25 adam Exp $
 
---- base/gserrors.h.orig	2012-02-08 17:48:48.000000000 +0900
-+++ base/gserrors.h	2012-03-24 07:26:35.000000000 +0900
-@@ -53,6 +53,9 @@
- #define return_error(err) return gs_note_error(err)
+This suppresses the noisy warning that __func__ redefined.
+
+--- base/gserrors.h.orig	2013-02-14 07:58:13.000000000 +0000
++++ base/gserrors.h
+@@ -60,6 +60,9 @@ int gs_log_error(int, const char *, int)
+ #endif
  
  #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
 +#  if (defined(__func__))
diff --git a/print/ghostscript/patches/patch-configure.ac b/print/ghostscript/patches/patch-configure.ac
index b28325d70f3..dff06463828 100644
--- a/print/ghostscript/patches/patch-configure.ac
+++ b/print/ghostscript/patches/patch-configure.ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.1 2012/10/07 14:19:18 mef Exp $
+$NetBSD: patch-configure.ac,v 1.2 2013/03/08 20:45:25 adam Exp $
 
 See patch-ah (configure)
 
 --- base/configure.ac.orig	2011-08-05 20:12:20.000000000 +0900
 +++ base/configure.ac	2011-08-22 19:10:30.000000000 +0900
-@@ -404,7 +404,7 @@
+@@ -514,7 +514,7 @@
  fi
  
  if test x$with_libpaper != xno; then
diff --git a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
index 573b853483a..a688ba5820b 100644
--- a/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
+++ b/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2012/12/12 16:37:09 bsiegert Exp $
+$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.3 2013/03/08 20:45:25 adam Exp $
 
 To avoid following problem:
 | gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
@@ -6,14 +6,14 @@ To avoid following problem:
 | ./sobin/libgs.so: undefined reference to `memalign'
 | gmake[2]: *** [sobin/gsc] Error 1
 
---- openjpeg/libopenjpeg/opj_malloc.h.orig	2012-04-18 22:36:57.000000000 +0900
-+++ openjpeg/libopenjpeg/opj_malloc.h	2012-04-18 22:54:13.000000000 +0900
-@@ -84,7 +84,7 @@
+--- openjpeg/libopenjpeg/opj_malloc.h.orig	2013-02-14 07:58:13.000000000 +0000
++++ openjpeg/libopenjpeg/opj_malloc.h
+@@ -84,7 +84,7 @@ Allocate memory aligned to a 16 byte bou
  	#if defined(__sun)
  		#define HAVE_MEMALIGN
  	/* Linux x86_64 and OSX always align allocations to 16 bytes */
--	#elif !defined(__amd64__) && !defined(__APPLE__)	
-+	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
+-	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)
++	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
  		#define HAVE_MEMALIGN
  		#include <malloc.h>			
  	#endif