Update to 1.2.36:

version 1.2.36beta01 [February 28, 2009]
  Revised comments in png_set_read_fn() and png_set_write_fn().
  Revised order of #ifdef's and indentation in png_debug definitions of png.h
    bug introduced in libpng-1.2.34.

version 1.2.36beta02 [March 21, 2009]
  Use png_memset() after png_malloc() of big_row_buf when reading an
    interlaced file, to avoid a possible UMR.
  Undid recent revision of PNG_NO_STDIO version of png_write_flush().  Users
    having trouble with fflush() can build with PNG_NO_WRITE_FLUSH defined.
  Revised libpng*.txt documentation about use of png_write_flush().
  Removed fflush() from pngtest.c.
  Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h

version 1.2.36beta03 [March 27, 2009]
  Relocated misplaced PNG_1_0_X define in png.h that caused the prototype
    for png_set_strip_error_numbers() to be omitted from PNG_NO_ASSEMBLER_CODE
    builds.  This bug was introduced in libpng-1.2.15beta4.
  Added a section on differences between 1.0.x and 1.2.x to libpng.3/libpng.txt

version 1.2.36beta04 [April 5, 2009]
  Fixed potential memory leak of "new_name" in png_write_iCCP() (Ralph Giles)

version 1.2.36beta05 [April 24, 2009]
  Added "ifndef PNG_SKIP_SETJMP_CHECK" block in pngconf.h to allow
    application code writers to bypass the check for multiple inclusion
    of setjmp.h when they know that it is safe to ignore the situation.
  Made some cosmetic changes to whitespace in pngtest output.
  Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress
    "shadowed declaration" warning from gcc-4.3.3.
  Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"
    warning about a global "gamma" variable in math.h on some platforms.

version 1.2.36rc01 [April 30, 2009]
  No changes.

version 1.0.44 and 1.2.36 [May 7, 2009]
  No changes.

3 files changed, 20 insertions, 20 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 61fa76bde82..9ad5d9a9d55 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2009/02/19 13:13:53 drochner Exp $
+# $NetBSD: Makefile,v 1.113 2009/05/13 09:56:05 wiz Exp $
 
-DISTNAME=	libpng-1.2.35
+DISTNAME=	libpng-1.2.36
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 4e2815c36e0..92b4dd77264 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.56 2009/02/19 13:13:53 drochner Exp $
+$NetBSD: distinfo,v 1.57 2009/05/13 09:56:05 wiz Exp $
 
-SHA1 (libpng-1.2.35.tar.bz2) = aad4faf21a1fc5853a55a2ff51351707bde3f6ac
-RMD160 (libpng-1.2.35.tar.bz2) = 56d3540f2c86297fe84a7a9bca8ee54be8e50c82
-Size (libpng-1.2.35.tar.bz2) = 650154 bytes
+SHA1 (libpng-1.2.36.tar.bz2) = 76723755a1fe95b6a955ac65b25f17d3204782d5
+RMD160 (libpng-1.2.36.tar.bz2) = afe0776c90b077de12ce26b0be8bac6a513a9822
+Size (libpng-1.2.36.tar.bz2) = 661190 bytes
 SHA1 (patch-aa) = 27df7893fc54f7e87790850eb9f047155c73f7d3
 SHA1 (patch-ac) = aaafc963c85b72e37fbbeed3e76f0c2ce9ebe9b2
-SHA1 (patch-ae) = 8c06a09817d414ffffbfd39bdd7d1f4336538bf3
+SHA1 (patch-ae) = e9700e7d3dd536d80e47cffa20b412a6c69660be
diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae
index 550ff9245b5..7a671120a76 100644
--- a/graphics/png/patches/patch-ae
+++ b/graphics/png/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.8 2008/01/13 15:40:13 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2009/05/13 09:56:05 wiz Exp $
 
---- pngconf.h.orig	2006-04-23 18:45:34.000000000 +0000
+--- pngconf.h.orig	2009-05-07 16:05:28.000000000 +0000
 +++ pngconf.h
-@@ -314,8 +314,8 @@
-      /* If you encounter a compiler error here, see the explanation
-       * near the end of INSTALL.
-       */
--         __pngconf.h__ already includes setjmp.h;
--         __dont__ include it again.;
-+#warning         __pngconf.h__ already includes setjmp.h;
-+#warning         __dont__ include it again.;
- #    endif
- #  endif /* __linux__ */
- 
+@@ -332,8 +332,8 @@
+        /* If you encounter a compiler error here, see the explanation
+         * near the end of INSTALL.
+         */
+-           __pngconf.h__ in libpng already includes setjmp.h;
+-           __dont__ include it again.;
++#warning           __pngconf.h__ in libpng already includes setjmp.h;
++#warning           __dont__ include it again.;
+ #      endif
+ #    endif /* __linux__ */
+ #  endif /* PNG_SKIP_SETJMP_CHECK */