From a43a62123a8970efed3aa081e99888a3d7b77198 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 14 Jan 2011 11:22:37 +0000
Subject: Fix build with png-1.5.

---
 graphics/plotutils/distinfo         |  3 ++-
 graphics/plotutils/patches/patch-aa | 39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 graphics/plotutils/patches/patch-aa

(limited to 'graphics/plotutils')

diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index d11ff643748..21e51fbb913 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/05/02 13:28:43 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/01/14 11:30:36 wiz Exp $
 
 SHA1 (plotutils-2.6.tar.gz) = 7921301d9dfe8991e3df2829bd733df6b2a70838
 RMD160 (plotutils-2.6.tar.gz) = 2a32244eb20e00b82a0742dde7b690f688e82774
 Size (plotutils-2.6.tar.gz) = 3657562 bytes
+SHA1 (patch-aa) = 953805bbe32d8e049cdd4de79cd8b4a77a49fc04
diff --git a/graphics/plotutils/patches/patch-aa b/graphics/plotutils/patches/patch-aa
new file mode 100644
index 00000000000..6123223d255
--- /dev/null
+++ b/graphics/plotutils/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $
+
+Fix build with png-1.5.
+
+--- libplot/z_write.c.orig	2008-07-16 00:54:10.000000000 +0000
++++ libplot/z_write.c
+@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
+     }
+ 
+   /* cleanup after libpng errors (error handler does a longjmp) */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf (png_ptr)))
+     {
+       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
+       return -1;
+@@ -444,7 +444,11 @@ _our_error_fn_stdio (png_struct *png_ptr
+ #endif
+     }
+ 
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp (png_ptr->jmpbuf, 1);
++#else
++  png_longjmp (png_ptr, 1);
++#endif
+ }
+ 
+ static void 
+@@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
+ #endif
+     }
+ 
++#if (PNG_LIBPNG_VER < 10500)
+   longjmp (png_ptr->jmpbuf, 1);
++#else
++  png_longjmp (png_ptr, 1);
++#endif
+ }
+ 
+ static void 
-- 
cgit v1.2.3