Fix build with png-1.4.x.

5 files changed, 109 insertions, 1 deletions

diff --git a/comms/pilot-link/distinfo b/comms/pilot-link/distinfo
index db73380d397..98f6481a682 100644
--- a/comms/pilot-link/distinfo
+++ b/comms/pilot-link/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.23 2010/03/15 12:34:32 wiz Exp $
+$NetBSD: distinfo,v 1.24 2010/06/19 13:29:23 wiz Exp $
 
 SHA1 (pilot-link-0.12.5.tar.bz2) = b822466333ba58bbb32d7cfe5c547f4e7a78bdee
 RMD160 (pilot-link-0.12.5.tar.bz2) = 806c87b9849d37fc5f88b453fb0842504be71a76
 Size (pilot-link-0.12.5.tar.bz2) = 1578735 bytes
 SHA1 (patch-aa) = dbed32343c5750f0278ba9a43050ead38574503a
 SHA1 (patch-ab) = add1156600a681cc0ae30c5d9095b4f1bb6739c3
+SHA1 (patch-ad) = 7ba7abed09cfff3687184d380bdff0ffd07ebd6f
+SHA1 (patch-ae) = 6877da137820152b8e3dfa883a0d5ba85396dee4
+SHA1 (patch-ag) = e9f9b3fe47502f35c1087007455c98f0eb8fb843
+SHA1 (patch-ah) = 1badec208c42e1b1569ffc3c2fc4cba4270be67b
diff --git a/comms/pilot-link/patches/patch-ad b/comms/pilot-link/patches/patch-ad
new file mode 100644
index 00000000000..5f908f9244a
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.4 2010/06/19 13:29:23 wiz Exp $
+
+--- src/pilot-read-palmpix.c.orig	2009-06-04 13:26:19.000000000 +0000
++++ src/pilot-read-palmpix.c
+@@ -42,10 +42,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -223,8 +219,8 @@ void write_png( FILE *f, const struct Pa
+ 	png_infop info_ptr;
+ 
+ 	png_ptr = png_create_write_struct
+-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		( PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if(!png_ptr)
+ 		return;
diff --git a/comms/pilot-link/patches/patch-ae b/comms/pilot-link/patches/patch-ae
new file mode 100644
index 00000000000..a8818bf5a15
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ae
@@ -0,0 +1,26 @@
+$NetBSD: patch-ae,v 1.7 2010/06/19 13:29:23 wiz Exp $
+
+--- src/pilot-read-notepad.c.orig	2009-06-04 13:26:19.000000000 +0000
++++ src/pilot-read-notepad.c
+@@ -39,10 +39,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -166,8 +162,8 @@ void write_png( FILE *f, struct NotePad 
+    width = n->body.width + 8;
+ 
+    png_ptr = png_create_write_struct
+-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-       png_error_ptr_NULL, png_error_ptr_NULL);
++     ( PNG_LIBPNG_VER_STRING, NULL,
++       NULL, NULL);
+ 
+    if(!png_ptr)
+      return;
diff --git a/comms/pilot-link/patches/patch-ag b/comms/pilot-link/patches/patch-ag
new file mode 100644
index 00000000000..d3bf7020b77
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 2010/06/19 13:29:24 wiz Exp $
+
+--- src/pilot-read-screenshot.c.orig	2009-06-04 13:26:19.000000000 +0000
++++ src/pilot-read-screenshot.c
+@@ -40,10 +40,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -87,8 +83,8 @@ void write_png ( char *fname, struct ss_
+ 		gray_buf = malloc( state->w );
+ 
+ 	png_ptr = png_create_write_struct
+-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-		png_error_ptr_NULL, png_error_ptr_NULL);
++		(PNG_LIBPNG_VER_STRING, NULL,
++		NULL, NULL);
+ 
+ 	if (!png_ptr)
+ 		return;
diff --git a/comms/pilot-link/patches/patch-ah b/comms/pilot-link/patches/patch-ah
new file mode 100644
index 00000000000..6fe4137c590
--- /dev/null
+++ b/comms/pilot-link/patches/patch-ah
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.1 2010/06/19 13:29:24 wiz Exp $
+
+--- src/pilot-read-veo.c.orig	2009-06-04 13:26:19.000000000 +0000
++++ src/pilot-read-veo.c
+@@ -41,10 +41,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -856,8 +852,8 @@ void write_png (FILE * f, struct Veo *v,
+    png_infop info_ptr;
+ 
+    png_ptr = png_create_write_struct
+-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-	  png_error_ptr_NULL, png_error_ptr_NULL);
++	 (PNG_LIBPNG_VER_STRING, NULL,
++	  NULL, NULL);
+ 
+    if (!png_ptr)
+ 	 return;