[pkgsrc/trunk]: pkgsrc/graphics/pngcrush Make this compile with png-1.2.6

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f8201fd4185
branches:  trunk
changeset: 480075:0f8201fd4185
user:      kim <kim%pkgsrc.org@localhost>
date:      Sun Aug 29 16:44:48 2004 +0000

description:
Make this compile with png-1.2.6

diffstat:

 graphics/pngcrush/distinfo         |   4 ++--
 graphics/pngcrush/patches/patch-aa |  21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 1931ef4d7df3 -r 0f8201fd4185 graphics/pngcrush/distinfo
--- a/graphics/pngcrush/distinfo        Sun Aug 29 16:34:09 2004 +0000
+++ b/graphics/pngcrush/distinfo        Sun Aug 29 16:44:48 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/01/12 21:23:05 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/08/29 16:44:48 kim Exp $
 
 SHA1 (pngcrush-1.5.10.tar.gz) = 469e41c2fdf5fefd307119643616d8d2c86e35b4
 Size (pngcrush-1.5.10.tar.gz) = 313220 bytes
-SHA1 (patch-aa) = f3451b97ae974df79e786faba5dc588901e21d15
+SHA1 (patch-aa) = e0c26f3cb2eb01c7f11f7cfb1b575d3c5ab71361
diff -r 1931ef4d7df3 -r 0f8201fd4185 graphics/pngcrush/patches/patch-aa
--- a/graphics/pngcrush/patches/patch-aa        Sun Aug 29 16:34:09 2004 +0000
+++ b/graphics/pngcrush/patches/patch-aa        Sun Aug 29 16:44:48 2004 +0000
@@ -1,13 +1,26 @@
-$NetBSD: patch-aa,v 1.1 2004/01/12 21:23:05 adam Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/29 16:44:48 kim Exp $
 
---- pngcrush.c.orig    2004-01-12 21:40:44.000000000 +0000
-+++ pngcrush.c
-@@ -416,7 +416,7 @@
+--- pngcrush.c.orig    2002-07-20 23:51:20.000000000 -0400
++++ pngcrush.c 2004-08-29 12:43:38.000000000 -0400
+@@ -416,7 +416,20 @@
   */
  
  #define PNG_INTERNAL
 -#include "png.h"
 +#include <png.h>
++
++#ifndef HANDLE_CHUNK_AS_DEFAULT
++#define HANDLE_CHUNK_AS_DEFAULT       PNG_HANDLE_CHUNK_AS_DEFAULT
++#endif
++#ifndef HANDLE_CHUNK_NEVER
++#define HANDLE_CHUNK_NEVER    PNG_HANDLE_CHUNK_NEVER
++#endif
++#ifndef HANDLE_CHUNK_IF_SAFE
++#define HANDLE_CHUNK_IF_SAFE  PNG_HANDLE_CHUNK_IF_SAFE
++#endif
++#ifndef HANDLE_CHUNK_ALWAYS
++#define HANDLE_CHUNK_ALWAYS   PNG_HANDLE_CHUNK_ALWAYS
++#endif
  
  /* we don't need the some of the extra libpng transformations
   * so they are ifdef'ed out in a special version of pngconf.h, which