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.

5 files changed, 120 insertions, 4 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 2e488a3fcb5..2d017eab5aa 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2010/02/19 18:25:44 drochner Exp $
+# $NetBSD: Makefile,v 1.166 2010/06/13 22:44:39 wiz Exp $
 
 DISTNAME=	netpbm-10.35.73
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 8dd54927b9c..472c259b087 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:39 wiz Exp $
 
 BUILDLINK_TREE+=	netpbm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	netpbm
 NETPBM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.netpbm+=	netpbm>=10.11.6
-BUILDLINK_ABI_DEPENDS.netpbm+=	netpbm>=10.34nb4
+BUILDLINK_ABI_DEPENDS.netpbm+=	netpbm>=10.35.73nb1
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index f90e3c6f74e..86be28b372c 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.74 2010/03/28 12:36:35 drochner Exp $
+$NetBSD: distinfo,v 1.75 2010/06/13 22:44:39 wiz Exp $
 
 SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e
 RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8
 Size (netpbm-10.35.73.tgz) = 2548185 bytes
 SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977
 SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57
+SHA1 (patch-ac) = d7e23b2b905c6f9c6114e17b16fcce3eadb29b56
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
+SHA1 (patch-af) = 7ac8b5a431cd007ccc23ea337194a5c542ff0a54
 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
 SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3
 SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
new file mode 100644
index 00000000000..1946546c99a
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.19 2010/06/13 22:44:39 wiz Exp $
+
+--- converter/other/pnmtopng.c.orig	2009-09-03 15:34:36.000000000 +0000
++++ converter/other/pnmtopng.c
+@@ -69,11 +69,6 @@
+ #include "nstring.h"
+ #include "version.h"
+ 
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.48)
+-#endif
+ 
+ 
+ struct zlibCompression {
+@@ -2611,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl
+     info_ptr->num_palette = palette_size;
+     if (trans_size > 0) {
+         info_ptr->valid |= PNG_INFO_tRNS;
+-        info_ptr->trans = trans;
++        info_ptr->trans_alpha = trans;
+         info_ptr->num_trans = trans_size;   /* omit opaque values */
+     }
+     /* creating hIST chunk */
+@@ -2648,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl
+         info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
+         if (transparent > 0) {
+             info_ptr->valid |= PNG_INFO_tRNS;
+-            info_ptr->trans_values = 
++            info_ptr->trans_color = 
+                 xelToPngColor_16(transcolor, maxval, png_maxval);
+         }
+     } else {
+@@ -2660,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl
+         if (info_ptr->valid && PNG_INFO_tRNS) 
+             pm_message("Transparent color {gray, red, green, blue} = "
+                        "{%d, %d, %d, %d}",
+-                       info_ptr->trans_values.gray,
+-                       info_ptr->trans_values.red,
+-                       info_ptr->trans_values.green,
+-                       info_ptr->trans_values.blue);
++                       info_ptr->trans_color.gray,
++                       info_ptr->trans_color.red,
++                       info_ptr->trans_color.green,
++                       info_ptr->trans_color.blue);
+         else
+             pm_message("No transparent color");
+     }
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
new file mode 100644
index 00000000000..0e9969ce69a
--- /dev/null
+++ b/graphics/netpbm/patches/patch-af
@@ -0,0 +1,64 @@
+$NetBSD: patch-af,v 1.14 2010/06/13 22:44:39 wiz Exp $
+
+--- converter/other/pngtopnm.c.orig	2009-09-03 15:34:36.000000000 +0000
++++ converter/other/pngtopnm.c
+@@ -44,12 +44,6 @@
+ #include "nstring.h"
+ #include "shhopt.h"
+ 
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.48)
+-#endif
+-
+ typedef struct _jmpbuf_wrapper {
+   jmp_buf jmpbuf;
+ } jmpbuf_wrapper;
+@@ -482,7 +476,7 @@ isTransparentColor(pngcolor   const colo
+     bool retval;
+ 
+     if (info_ptr->valid & PNG_INFO_tRNS) {
+-        const png_color_16 * const transColorP = &info_ptr->trans_values;
++        const png_color_16 * const transColorP = &info_ptr->trans_color;
+     
+ 
+         /* There seems to be a problem here: you can't compare real
+@@ -575,8 +569,8 @@ paletteHasPartialTransparency(png_info *
+             for (i = 0, foundGray = FALSE;
+                  i < info_ptr->num_trans && !foundGray;
+                  ++i) {
+-                if (info_ptr->trans[i] != 0 &&
+-                    info_ptr->trans[i] != maxval) {
++                if (info_ptr->trans_alpha[i] != 0 &&
++                    info_ptr->trans_alpha[i] != maxval) {
+                     foundGray = TRUE;
+                 }
+             }
+@@ -647,7 +641,7 @@ setupSignificantBits(png_struct *       
+                 unsigned int i;
+                 trans_mix = TRUE;
+                 for (i = 0; i < info_ptr->num_trans; ++i)
+-                    if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
++                    if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
+                         trans_mix = FALSE;
+                         break;
+                     }
+@@ -885,7 +879,7 @@ writePnm(FILE *              const ofP,
+                 setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
+                        ((info_ptr->valid & PNG_INFO_tRNS) &&
+                         (fgColor.r == 
+-                         gamma_correct(info_ptr->trans_values.gray,
++                         gamma_correct(info_ptr->trans_color.gray,
+                                        totalgamma))) ?
+                        0 : maxval);
+             }
+@@ -914,7 +908,7 @@ writePnm(FILE *              const ofP,
+                 setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
+                        (info_ptr->valid & PNG_INFO_tRNS) &&
+                        index < info_ptr->num_trans ?
+-                       info_ptr->trans[index] : maxval);
++                       info_ptr->trans_alpha[index] : maxval);
+             }
+             break;
+