Update to 1.2.20:

version 1.2.20beta01 [August 19, 2007]
  Fixed problem with compiling pnggccrd.c on Intel-Apple platforms.
  Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim
  Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */
    because it caused some trouble.

version 1.2.20beta02 [August 20, 2007]
  Avoid compiling pnggccrd.c on Intel-Apple platforms.

version 1.2.20beta03 [August 20, 2007]
  Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6
    and visualc71.

version 1.2.20beta04 [August 21, 2007]
  Revised pngvcrd.c for improved efficiency (Steve Snyder).

version 1.2.20rc1 [August 23, 2007]
  Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers.

version 1.2.20rc2 [August 27, 2007]
  Revised scripts/CMakeLists.txt
  Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c,
    or part of pngrutil.c is selected.

version 1.2.20rc3 [August 30, 2007]
  Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected.
  Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects.
  Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined.
  Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c,
    breaking the png_mmx_support() function.

version 1.2.20rc4 [September 1, 2007]
  Removed Intel contributions (MMX, Optimized C).

version 1.2.20rc5 [September 2, 2007]
  Restored configure and Makefile.in to rc3 and put a snippet of code in
    pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection

version 1.2.20rc6 [September 2, 2007]
  Fixed bugs in scripts/CMakeLists.txt
  Removed pngvcrd.c references from msvc projects.

version 1.0.28 and 1.2.20 [September 8, 2007]
  Removed "(NO READ SUPPORT)" from png_get_header_version() string.

3 files changed, 6 insertions, 22 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index d6d7be8c254..1df30c55fb0 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2007/08/29 20:58:26 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2007/09/09 10:29:19 wiz Exp $
 
-DISTNAME=	libpng-1.2.19
+DISTNAME=	libpng-1.2.20
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index d4e7ba2cb38..e0052027df1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.40 2007/08/31 15:35:08 minskim Exp $
+$NetBSD: distinfo,v 1.41 2007/09/09 10:29:19 wiz Exp $
 
-SHA1 (libpng-1.2.19.tar.bz2) = 681e94e43d2799715b7888fb495200f9b204849a
-RMD160 (libpng-1.2.19.tar.bz2) = f0e4facbc037f9259dedfe6eafc1f58f8cedc6a5
-Size (libpng-1.2.19.tar.bz2) = 650966 bytes
+SHA1 (libpng-1.2.20.tar.bz2) = 3fc27faf224ea31a43771c214f2f903ea2e98b0d
+RMD160 (libpng-1.2.20.tar.bz2) = 0934f9f304756e011c4f0d73ad95506e8663ccee
+Size (libpng-1.2.20.tar.bz2) = 613683 bytes
 SHA1 (patch-aa) = 27df7893fc54f7e87790850eb9f047155c73f7d3
-SHA1 (patch-ab) = 957e022f4d7864d8097df539e7ee8d2dfc6959aa
 SHA1 (patch-ac) = 87850d6ac555f1d8863a96d287a1ccccfa89230b
 SHA1 (patch-ae) = b9bf9de3caa32ac78a17685cdd5df5b80d1ccbbf
diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab
deleted file mode 100644
index 4a0c259089e..00000000000
--- a/graphics/png/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2007/08/31 15:35:08 minskim Exp $
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=1777158&group_id=5624&atid=105624
-
---- pnggccrd.c.orig	2007-08-18 03:33:42.000000000 -0700
-+++ pnggccrd.c
-@@ -465,7 +465,7 @@ static PNG_CONST int FARDATA png_pass_wi
- /* djgpp, Win32, Cygwin, and OS2 add their own underscores to global variables,
-  * so define them without: */
- #if defined(__DJGPP__) || defined(WIN32) || defined(__CYGWIN__) || \
--    defined(__OS2__)
-+    defined(__OS2__) || defined(__APPLE__)
- #  define _mmx_supported  mmx_supported
- #  define _mask8_0        mask8_0
- #  define _mask16_1       mask16_1