Update to 1.6.9, getting rid of the final two patches after discussion

with very helpful upstream.

Changes:

Version 1.6.9beta01 [December 26, 2013]
  Bookkeeping: Moved functions around (no changes). Moved transform
    function definitions before the place where they are called so that
    they can be masde static. Move the intrapixel functions and the
    grayscale palette builder out of the png?tran.c files. The latter
    isn't a transform function and is no longer used internally, and the
    former MNG specific functions are better placed in pngread/pngwrite.c
  Made transform implementation functions static. This makes the internal
    functions called by png_do_{read|write}_transformations static. On an
    x86-64 DLL build (Gentoo Linux) this reduces the size of the text
    segment of the DLL by 1208 bytes, about 0.6%. It also simplifies
    maintenance by removing the declarations from pngpriv.h and allowing
    easier changes to the internal interfaces.
  Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69
    in the tar distributions.

Version 1.6.9beta02 [January 1, 2014]
  Added checks for libpng 1.5 to pngvalid.c.  This supports the use of
    this version of pngvalid in libpng 1.5
  Merged with pngvalid.c from libpng-1.7 changes to create a single
    pngvalid.c
  Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner).
  Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0
  Merged libpng-1.7.0 changes to make no-interlace configurations work
    with test programs.
  Revised pngvalid.c to support libpng 1.5, which does not support the
    PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
    pngvalid.c
  Allow unversioned links created on install to be disabled in configure.
    In configure builds 'make install' changes/adds links like png.h
    and libpng.a to point to the newly installed, versioned, files (e.g.
    libpng17/png.h and libpng17.a). Three new configure options and some
    rearrangement of Makefile.am allow creation of these links to be disabled.

Version 1.6.9beta03 [January 10, 2014]
  Removed potentially misleading warning from png_check_IHDR().

Version 1.6.9beta04 [January 20, 2014]
  Updated scripts/makefile.* to use CPPFLAGS (Cosmin).
  Added clang attribute support (Cosmin).

Version 1.6.9rc01 [January 28, 2014]
  No changes.

Version 1.6.9rc02 [January 30, 2014]
  Quiet an uninitialized memory warning from VC2013 in png_get_png().

Version 1.6.9 [February 6, 2014]

4 files changed, 12 insertions, 46 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 4c22e9adb15..df9247db304 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.166 2013/12/31 17:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.167 2014/02/06 18:24:11 wiz Exp $
 
-DISTNAME=	libpng-1.6.8
+DISTNAME=	libpng-1.6.9
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
@@ -15,6 +15,12 @@ LICENSE=	zlib
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
+# do not create libpng.la
+CONFIGURE_ARGS+=	--disable-unversioned-links
+# but do install png.h outside include/libpng$VERSION for now
+# until pkgsrc is fixed to use libpng-config or the pc file everywhere
+INSTALL_TARGET=	install install-header-links
+
 PKGCONFIG_OVERRIDE=	scripts/libpng.pc.in libpng.pc.in
 TEST_TARGET=	check
 USE_LIBTOOL=	yes
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 40d6df9f98c..0005878fcf7 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.111 2013/12/31 17:27:48 wiz Exp $
+$NetBSD: distinfo,v 1.112 2014/02/06 18:24:11 wiz Exp $
 
-SHA1 (libpng-1.6.8.tar.xz) = acdb0a45d80c90b39b56a41075003d4726f3558c
-RMD160 (libpng-1.6.8.tar.xz) = 691ade61deb47f19c88998795b1c3e3489716c4e
-Size (libpng-1.6.8.tar.xz) = 876172 bytes
-SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138
-SHA1 (patch-contrib_tools_pngfix.c) = 76d84ef9db87cb3e04e33c94a442110b2ab115da
+SHA1 (libpng-1.6.9.tar.xz) = fe5b37a01a2a056a26f1a6661dc45e026ad86c88
+RMD160 (libpng-1.6.9.tar.xz) = 04d6049f1d2705fe53fdeb333d80c68d87412c2f
+Size (libpng-1.6.9.tar.xz) = 885824 bytes
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
deleted file mode 100644
index d5fdb04ac06..00000000000
--- a/graphics/png/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.33 2013/01/24 08:15:51 wiz Exp $
-
-Don't install compat links to libpng. Programs should use
-the pkg-config or libpng-config scripts to get the correct png library
-name.
-
---- Makefile.in.orig	2013-01-24 02:59:12.000000000 +0000
-+++ Makefile.in
-@@ -1526,15 +1526,6 @@ install-exec-hook:
- 	cd '$(DESTDIR)$(bindir)'; rm -f libpng-config
- 	cd '$(DESTDIR)$(bindir)';\
- 	   $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
--	@set -x;\
--	cd '$(DESTDIR)$(libdir)';\
--	for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\
--	   sl dylib dll.a; do\
--		rm -f libpng.$$ext;\
--                if test -f $(PNGLIB_BASENAME).$$ext; then\
--                       $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
--                fi;\
--	done
- 
- uninstall-hook:
- 	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
diff --git a/graphics/png/patches/patch-contrib_tools_pngfix.c b/graphics/png/patches/patch-contrib_tools_pngfix.c
deleted file mode 100644
index 3d508340cb1..00000000000
--- a/graphics/png/patches/patch-contrib_tools_pngfix.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-contrib_tools_pngfix.c,v 1.1 2013/12/26 15:59:20 tron Exp $
-
-Fix build with C compilers other than GCC.
-
---- contrib/tools/pngfix.c.orig	2013-11-14 19:03:02.000000000 +0000
-+++ contrib/tools/pngfix.c	2013-12-26 15:44:27.000000000 +0000
-@@ -32,7 +32,6 @@
- #  define FIX_GCC volatile
- #else
- #  define FIX_GCC
--#  error not tested
- #endif
- 
- #define PROGRAM_NAME "pngfix"