[pkgsrc/trunk]: pkgsrc/print/cups Fix build with png-1.2.9nb2. Bump PKGREVISI...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3da244ba8558
branches:  trunk
changeset: 511694:3da244ba8558
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 19 17:01:34 2006 +0000

description:
Fix build with png-1.2.9nb2. Bump PKGREVISION since different functions
are used. The patch is already integrated in the 1.2rc2 release.

diffstat:

 print/cups/Makefile         |   4 ++--
 print/cups/distinfo         |   3 ++-
 print/cups/patches/patch-ai |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r 5562da9be317 -r 3da244ba8558 print/cups/Makefile
--- a/print/cups/Makefile       Wed Apr 19 17:00:12 2006 +0000
+++ b/print/cups/Makefile       Wed Apr 19 17:01:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/19 17:01:34 wiz Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,7 +6,7 @@
 
 DISTNAME=      cups-${DIST_VERS}-source
 PKGNAME=       cups-${VERS}
-PKGREVISION=   9
+PKGREVISION=   10
 BASE_VERS=     1.1.23
 DIST_VERS=     ${BASE_VERS}
 VERS=          ${DIST_VERS:S/-/./g}
diff -r 5562da9be317 -r 3da244ba8558 print/cups/distinfo
--- a/print/cups/distinfo       Wed Apr 19 17:00:12 2006 +0000
+++ b/print/cups/distinfo       Wed Apr 19 17:01:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2006/03/29 17:22:46 joerg Exp $
+$NetBSD: distinfo,v 1.40 2006/04/19 17:01:34 wiz Exp $
 
 SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
 RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
@@ -11,6 +11,7 @@
 SHA1 (patch-af) = 04e5bf3b73083eb2457a20b0f5238f017fe4aaab
 SHA1 (patch-ag) = 47a5c7a9ad7c604fa3253aebbaa62f576fb477d0
 SHA1 (patch-ah) = 1ef58b7e1dfcbd8aabb9e822d30f995b3d653ea4
+SHA1 (patch-ai) = 4b335e3b33ff1d3421ae03729fbe57ef7aa0e22f
 SHA1 (patch-an) = 8eb0f80067839d3d112d93e08cb8ad6854fa2b4c
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
 SHA1 (patch-ap) = 2351844f81a561d69cd02a1e83e30f3c9ee33f5f
diff -r 5562da9be317 -r 3da244ba8558 print/cups/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-ai       Wed Apr 19 17:01:34 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.14 2006/04/19 17:01:34 wiz Exp $
+
+--- filter/image-png.c.orig    2005-01-03 20:29:57.000000000 +0100
++++ filter/image-png.c
+@@ -82,7 +82,7 @@ ImageReadPNG(image_t    *img,                /* IO - I
+ 
+   png_read_info(pp, info);
+ 
+   fprintf(stderr, "DEBUG: PNG image: %dx%dx%d, color_type=%x (%s%s%s)\n",
+-          info->width, info->height, info->bit_depth, info->color_type,
++          (int)info->width, (int)info->height, info->bit_depth, info->color_type,
+         (info->color_type & PNG_COLOR_MASK_COLOR) ? "RGB" : "GRAYSCALE",
+         (info->color_type & PNG_COLOR_MASK_ALPHA) ? "+ALPHA" : "",
+@@ -252,7 +252,7 @@ ImageReadPNG(image_t    *img,              /* IO - I
+     }
+ 
+   png_read_end(pp, info);
+-  png_read_destroy(pp, info, NULL);
++  png_destroy_read_struct(&pp, &info, NULL);
+ 
+   fclose(fp);
+   free(in);