Update to 1.5.2:

Version 1.5.2beta01 [February 13, 2011]
  More -Wshadow fixes for older gcc compilers.  Older gcc versions apparently
    check formal parameters names in function declarations (as well as
    definitions) to see if they match a name in the global namespace.
  Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the
    old VisualC++ preprocessor.
  Turned on interlace handling in png_read_png().
  Fixed gcc pendantic warnings.
  Handle longjmp in Cygwin.
  Fixed png_get_current_row_number() in the interlaced case.
  Cleaned up ALPHA flags and transformations.
  Implemented expansion to 16 bits.

Version 1.5.2beta02 [February 19, 2011]
  Fixed mistake in the descriptions of user read_transform and write_transform
    function prototypes in the manual.  The row_info struct is png_row_infop.
  Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior.
  Corrected png_get_current_row_number documentation
  Fixed the read/write row callback documentation.
    This documents the current behavior, where the callback is called after
    every row with information pertaining to the next row.

Version 1.5.2beta03 [March 3, 2011]
  Fixed scripts/makefile.vcwin32
  Updated contrib/pngsuite/README to add the word "modify".
  Define PNG_ALLOCATED to blank when _MSC_VER<1300.

Version 1.5.2rc01 [March 19, 2011]
  Define remaining attributes to blank when MSC_VER<1300.
  ifdef out mask arrays in pngread.c when interlacing is not supported.

Version 1.5.2rc02 [March 22, 2011]
  Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak
    and in contrib/pngminim/*/makefile, eg., on SunOS 5.10, and removed "strip"
    from the makefiles.
  Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail
    to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill)

Version 1.5.2rc03 [March 24, 2011]
  Don't include standard header files in png.h while building the symbol table,
    to avoid cpp failure on SunOS (introduced PNG_BUILDING_SYMBOL_TABLE macro).

Version 1.5.2 [March 31, 2011]

3 files changed, 6 insertions, 29 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 022c7378965..b56b43091c2 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.131 2011/02/03 09:20:58 wiz Exp $
+# $NetBSD: Makefile,v 1.132 2011/04/05 12:47:56 wiz Exp $
 
-DISTNAME=	libpng-1.5.1
+DISTNAME=	libpng-1.5.2
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 99d5e4dc2af..12568614df1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.77 2011/02/04 23:35:29 adam Exp $
+$NetBSD: distinfo,v 1.78 2011/04/05 12:47:56 wiz Exp $
 
-SHA1 (libpng-1.5.1.tar.bz2) = 750361f1cd693da53ef66624d5a8a6a431c40cd5
-RMD160 (libpng-1.5.1.tar.bz2) = 62ab2800b760ca642db094017f798590465bc5a3
-Size (libpng-1.5.1.tar.bz2) = 773560 bytes
+SHA1 (libpng-1.5.2.tar.bz2) = db9658b1c7fcf65769bb01e773a703ce56389be5
+RMD160 (libpng-1.5.2.tar.bz2) = 8cf3f2add769bbb1170af7ad6ba5c6bd9a3efec8
+Size (libpng-1.5.2.tar.bz2) = 790523 bytes
 SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
-SHA1 (patch-pngconf.h) = 407106790dccb265d6d1e17d1c263b1f7c82eb68
diff --git a/graphics/png/patches/patch-pngconf.h b/graphics/png/patches/patch-pngconf.h
deleted file mode 100644
index b4b1035f4ac..00000000000
--- a/graphics/png/patches/patch-pngconf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-pngconf.h,v 1.1 2011/02/04 23:35:29 adam Exp $
-
---- pngconf.h.orig	2011-02-04 23:31:35.000000000 +0000
-+++ pngconf.h
-@@ -287,7 +287,7 @@
-  * PNG_EXPORT function for every compiler.
-  */
- #ifndef PNG_FUNCTION
--#  ifdef __GNUC__
-+#  if defined(__GNUC__) && !defined(__clang__)
- #     define PNG_FUNCTION(type, name, args, attributes)\
-          attributes type name args
- #  else /* !GNUC */
-@@ -347,7 +347,7 @@
-    * functions in png.h will generate compiler warnings.  Added at libpng
-    * version 1.2.41.
-    */
--#  ifdef __GNUC__
-+#  if defined(__GNUC__) && !defined(__clang__)
- #    ifndef PNG_USE_RESULT
- #      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
- #    endif