Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

4 files changed, 64 insertions, 14 deletions

diff --git a/graphics/unicap/Makefile b/graphics/unicap/Makefile
index 6d597f4e76e..bd2d60a0579 100644
--- a/graphics/unicap/Makefile
+++ b/graphics/unicap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:51 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:45 wiz Exp $
 
 DISTNAME=	unicap-0.9.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://unicap-imaging.org/downloads/
 
diff --git a/graphics/unicap/distinfo b/graphics/unicap/distinfo
index 83cf0853373..42f1e9d3d80 100644
--- a/graphics/unicap/distinfo
+++ b/graphics/unicap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/11/26 15:04:03 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/06/13 22:44:45 wiz Exp $
 
 SHA1 (unicap-0.9.3.tar.gz) = b9d1580a9e10d15a8ab86400a0200b72e582dc4d
 RMD160 (unicap-0.9.3.tar.gz) = dd2b687197ac81534d2adbc5db8dcc2bdc3e3aad
@@ -16,7 +16,8 @@ SHA1 (patch-aj) = c04fa9aeb3c6fc93524019b1d69f6b3da6b62bc6
 SHA1 (patch-ak) = 41025b0d650d8e06a2f4950b5113414f5a4d6ec1
 SHA1 (patch-al) = cc6b286f54b902907e49028797e644af9eaff132
 SHA1 (patch-am) = 32c85d4c7353a9f2130a7105067f555365fcc883
-SHA1 (patch-ap) = f80854eb8708e950384e18cad0d04fda66ca5267
+SHA1 (patch-an) = 8167ed1f1f3a7882f3c07feaddaf429a90bf1902
+SHA1 (patch-ap) = 29cb7f81e4e56c0178c453fe80f2c576eefeb6c6
 SHA1 (patch-aq) = 396dae0f7695bd816479117b50f577d67aa6efbc
 SHA1 (patch-ar) = d0a2b4411ca9df52b0041cd532779ccb9fc1efdf
 SHA1 (patch-as) = 56db81f3a643f3c15d1c7572c63af23728c4b4eb
diff --git a/graphics/unicap/patches/patch-an b/graphics/unicap/patches/patch-an
new file mode 100644
index 00000000000..1bf5d27ae39
--- /dev/null
+++ b/graphics/unicap/patches/patch-an
@@ -0,0 +1,58 @@
+$NetBSD: patch-an,v 1.3 2010/06/13 22:44:45 wiz Exp $
+
+--- libucil/ucil_png.c.orig	2008-06-12 15:25:11.000000000 +0000
++++ libucil/ucil_png.c
+@@ -77,7 +77,7 @@ static int read_png(FILE *fp, unsigned i
+    if (info_ptr == NULL)
+    {
+       fclose(fp);
+-      png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++      png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return( -1 );
+    }
+ 
+@@ -89,7 +89,7 @@ static int read_png(FILE *fp, unsigned i
+    if (setjmp(png_jmpbuf(png_ptr)))
+    {
+       /* Free all of the memory associated with the png_ptr and info_ptr */
+-      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++      png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       fclose(fp);
+       /* If we get here, we had a problem reading the file */
+       return( -1 );
+@@ -109,7 +109,7 @@ static int read_png(FILE *fp, unsigned i
+     * adjustment), then you can read the entire image (including
+     * pixels) into the info structure with this call:
+     */
+-   png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL);
++   png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ 
+    /* At this point you have read the entire image */
+    
+@@ -174,7 +174,7 @@ static int read_png(FILE *fp, unsigned i
+    }
+ 
+    /* clean up after the read, and free any memory allocated - REQUIRED */
+-   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 
+    /* close the file */
+    fclose(fp);
+@@ -230,7 +230,7 @@ static int read_png(FILE *fp, unsigned i
+ /*    if (info_ptr == NULL) */
+ /*    { */
+ /*       fclose(fp); */
+-/*       png_destroy_write_struct(&png_ptr,  png_infopp_NULL); */
++/*       png_destroy_write_struct(&png_ptr,  NULL); */
+ /*       return( -1 ); */
+ /*    } */
+ 
+@@ -252,7 +252,7 @@ static int read_png(FILE *fp, unsigned i
+ /*     * image info living info in the structure.  You could "|" many */
+ /*     * PNG_TRANSFORM flags into the png_transforms integer here. */
+ /*     *\/ */
+-/*    png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL ); */
++/*    png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL ); */
+ 
+ /*    /\* If you png_malloced a palette, free it here (don't free info_ptr->palette, */
+ /*       as recommended in versions 1.0.5m and earlier of this example; if */
diff --git a/graphics/unicap/patches/patch-ap b/graphics/unicap/patches/patch-ap
index 2619d1640ec..8f88ec3a8e5 100644
--- a/graphics/unicap/patches/patch-ap
+++ b/graphics/unicap/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $
+$NetBSD: patch-ap,v 1.3 2010/06/13 22:44:45 wiz Exp $
 
 
 --- configure.orig	2008-10-01 12:15:58.000000000 -0400
@@ -138,15 +138,6 @@ $NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define UNICAP_THREADS 1
-@@ -26728,6 +26728,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;
 @@ -27969,7 +27971,7 @@ if test x$VID21394_VISCA = xyes; then
  	VID21394="$VID21394 with visca support"
  fi