update to 1.2.6 (first official release after the recent

 security fixes)
changes:
version 1.2.6rc3 [August 9, 2004]
  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid
  trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.
  Revised documentation of png_set_keep_unknown_chunks().
  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h
  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
version 1.2.6rc4 [August 10, 2004]
  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
  "pinfo" was out of place).
version 1.2.6rc5 [August 10, 2004]
  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED
  section of png.h where they were inadvertently placed in version rc3.
version 1.2.6rc6 [August 15, 2004]
  Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.

4 files changed, 20 insertions, 31 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 85bda267e7e..ecdc3b90e72 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2004/08/09 07:37:35 recht Exp $
+# $NetBSD: Makefile,v 1.65 2004/08/17 09:54:30 drochner Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
-DISTNAME=	libpng-1.2.6rc2
+DISTNAME=	libpng-1.2.6
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index e4cca3c355d..9b926fc50ee 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2004/08/09 10:49:00 kristerw Exp $
+$NetBSD: distinfo,v 1.22 2004/08/17 09:54:30 drochner Exp $
 
-SHA1 (libpng-1.2.6rc2.tar.bz2) = c149c61a2595c9c5ddf4d60d45ed529c47de5c75
-Size (libpng-1.2.6rc2.tar.bz2) = 377856 bytes
+SHA1 (libpng-1.2.6.tar.bz2) = 55ec46c0d21a23052e9bc618bb4fd8c58c4ab3c1
+Size (libpng-1.2.6.tar.bz2) = 378644 bytes
 SHA1 (patch-aa) = 0b3d28e526f8d1530e82c30be46aea19e5a32d6a
-SHA1 (patch-ab) = e43e77be19c1677e7039d4e0fa91128d9f2f1602
-SHA1 (patch-ad) = 5b880c6d47682349bd994eaea8aeac6c51d264e5
+SHA1 (patch-ab) = 95de0ebcb6ac2a381291b91623388ff9907d939f
+SHA1 (patch-ad) = 934b9f394c768d74888964943a60c3c45f252740
 SHA1 (patch-ae) = d5be0cdcfdd6c30a17b9633e28afb868911195aa
diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab
index 67cc707f8f6..a1db36c6d16 100644
--- a/graphics/png/patches/patch-ab
+++ b/graphics/png/patches/patch-ab
@@ -1,19 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/08/09 10:49:00 kristerw Exp $
+$NetBSD: patch-ab,v 1.9 2004/08/17 09:54:30 drochner Exp $
 
---- pngtest.c.orig	Sun Aug  8 04:42:44 2004
-+++ pngtest.c	Mon Aug  9 12:44:34 2004
-@@ -511,8 +511,9 @@
-       buffer and once to get a new free list entry. */
-    {
-       /* Disable malloc_fn and free_fn */
-+      memory_infop pinfo;
-       png_set_mem_fn(png_ptr, NULL, NULL, NULL);
--      memory_infop pinfo = (memory_infop)png_malloc(png_ptr,
-+      pinfo = (memory_infop)png_malloc(png_ptr,
-          (png_uint_32)png_sizeof (*pinfo));
-       pinfo->size = size;
-       current_allocation += size;
-@@ -579,7 +580,7 @@
+--- pngtest.c.orig	2004-08-17 11:24:59.000000000 +0200
++++ pngtest.c
+@@ -578,7 +578,7 @@ png_debug_free(png_structp png_ptr, png_
           }
           if (pinfo->next == NULL)
           {
@@ -22,7 +11,7 @@ $NetBSD: patch-ab,v 1.8 2004/08/09 10:49:00 kristerw Exp $
              break;
           }
           ppinfo = &pinfo->next;
-@@ -1438,8 +1439,8 @@
+@@ -1435,8 +1435,8 @@ main(int argc, char *argv[])
                 current_allocation);
              while (pinfo != NULL)
              {
@@ -33,14 +22,14 @@ $NetBSD: patch-ab,v 1.8 2004/08/09 10:49:00 kristerw Exp $
                 pinfo = pinfo->next;
              }
           }
-@@ -1513,8 +1514,8 @@
+@@ -1510,8 +1510,8 @@ main(int argc, char *argv[])
                  current_allocation);
               while (pinfo != NULL)
               {
 -                fprintf(STDERR," %lu bytes at %x\n",
 -                   pinfo->size, (unsigned int)pinfo->pointer);
-+                fprintf(STDERR," %lu bytes at %p\n", pinfo->size,
-+		  pinfo->pointer);
++                fprintf(STDERR," %lu bytes at %p\n",
++                   pinfo->size, pinfo->pointer);
                  pinfo = pinfo->next;
               }
            }
diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ad
index 494addbe736..4cb07d2190f 100644
--- a/graphics/png/patches/patch-ad
+++ b/graphics/png/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.3 2004/08/09 07:37:35 recht Exp $
+$NetBSD: patch-ad,v 1.4 2004/08/17 09:54:30 drochner Exp $
 
---- scripts/libpng.pc.in.orig	2004-08-08 04:42:48.000000000 +0200
-+++ scripts/libpng.pc.in	2004-08-08 12:29:46.000000000 +0200
-@@ -7,5 +7,5 @@
+--- scripts/libpng.pc.in.orig	2004-08-15 14:15:22.000000000 +0200
++++ scripts/libpng.pc.in
+@@ -7,5 +7,5 @@ includedir=${exec_prefix}/include
  Name: libpng12
  Description: Loads and saves PNG files
- Version: 1.2.6rc2
+ Version: 1.2.6
 -Libs: -L${libdir} -lpng12 -lz -lm
 -Cflags: -I${includedir}/libpng12
 +Libs: -L${libdir} -lpng -lz -lm