From 8d87b385056f170c8ce224a2bde45bd29a2cdee5 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 9 Apr 2010 19:39:06 +0000
Subject: 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.
 bump PKGREVISION

---
 print/ghostscript/Makefile         |  4 ++--
 print/ghostscript/distinfo         |  3 ++-
 print/ghostscript/patches/patch-an | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 print/ghostscript/patches/patch-an

(limited to 'print/ghostscript')

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index e7052630af0..1e0e8dba54a 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2010/03/11 12:53:52 drochner Exp $
+# $NetBSD: Makefile,v 1.77 2010/04/09 19:39:06 drochner Exp $
 
 DISTNAME=	ghostscript-8.71
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index f86af68528f..6f07e09ab06 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2010/03/11 12:53:52 drochner Exp $
+$NetBSD: distinfo,v 1.32 2010/04/09 19:39:06 drochner Exp $
 
 SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555
 RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
 SHA1 (patch-am) = 47a994e902d565f2a06b054766d6fa93c7534d21
+SHA1 (patch-an) = 875360319e486f4606627d8cfa3dbffd48d76130
diff --git a/print/ghostscript/patches/patch-an b/print/ghostscript/patches/patch-an
new file mode 100644
index 00000000000..daae9289d37
--- /dev/null
+++ b/print/ghostscript/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.3 2010/04/09 19:39:06 drochner Exp $
+
+--- psi/imainarg.c.orig	2009-12-08 06:31:51.000000000 +0000
++++ psi/imainarg.c
+@@ -194,6 +194,11 @@ gs_main_init_with_args(gs_main_instance 
+ 		return e_Fatal;
+ 	}
+     }
++
++    code = gs_main_init1(minst);
++    if (code < 0)
++	return code;
++
+     while ((arg = arg_next(&args, &code)) != 0) {
+ 	switch (*arg) {
+ 	    case '-':
-- 
cgit v1.2.3