Update to 1.5.14:

Changes since the last public release (1.5.13):
  Added -DZ_SOLO to contrib/pngminim/*/makefile to work with zlib-1.2.7
  Warn about the incorrect runtime library setting for VS2010 debug DLL builds.
  Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
    pngrtran.c (Domani Hannes).
  Check for png_ptr==NULL earlier in png_zalloc().
  Ignore, with a warning, out-of-range value of num_trans in png_set_tRNS().
  Rearranged building of ARM NEON optimizations. The ARM specific code is
    split out entirely to the arm subdirectory and changes to configure.acand
    Makefile.am to add new stuff are reduced.  Now material code changes,
    although for build test purposes, --enable-arm-neon now builds on non-ARM
    systems.
  Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.12.5.
  Fixed cases of unquoted DESTDIR in Makefile.am
  Fixed a minor bug in types to malloc and major bug in handling compressed
    iTXt. Compressed iTXt could not be handled.
  Cleaned up whitespace in the synopsis portion of the manpage "libpng.3"
  Disassembled the version number in scripts/options.awk (necessary for
    building on SunOs).
  Fixed Windows build issues, enabled ARM compilation. Various warnings issued
    by earlier versions of GCC fixed for Cygwin and Min/GW (which both use old
    GCCs.) ARM support is enabled by default in zlib.props (unsupported by
    Microsoft) and ARM compilation is made possible by deleting the check for
    x86. The test programs cannot be run because they are not signed.
  Fixed 'make distcheck' on SUN OS - libpng.so was not being removed
  Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h])
    in configure.ac
  De-configured build fixes to make a range of deconfiguration options (such
    as switching off read or write support) work in more cases.  Also upgraded
    pngtest and pngvalid to the libpng 1.6 versions (with some modifications)
    which provide more extensive testing.  Replaced pngtest.png because pngtest
    writes the ancillary chunks in a different order.
  Check validity of "num_unknowns" parameter of png_set_unknown_chunks()
    (Bug report from yuris).
  Check the validity of the "nentries" parameter of png_set_sPLT() and the
  "num_text" parameter of png_set_text_2().

3 files changed, 17 insertions, 16 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index ca41f4e6552..eac28d08a6c 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2012/10/06 14:11:14 asau Exp $
+# $NetBSD: Makefile,v 1.153 2013/01/24 08:15:50 wiz Exp $
 
-DISTNAME=	libpng-1.5.13
+DISTNAME=	libpng-1.5.14
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index f9ba9b6b669..f773edadd95 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.98 2012/10/02 16:58:46 wiz Exp $
+$NetBSD: distinfo,v 1.99 2013/01/24 08:15:50 wiz Exp $
 
-SHA1 (libpng-1.5.13.tar.bz2) = dfca34fa8281299a13cad87099f613ba639626e1
-RMD160 (libpng-1.5.13.tar.bz2) = 4238fb1aff1ac0b2da40d27223ecde0a578d07a9
-Size (libpng-1.5.13.tar.bz2) = 823681 bytes
-SHA1 (patch-aa) = aaf79ebb8a18448c096c17ae9b02da02bc537db2
+SHA1 (libpng-1.5.14.tar.bz2) = b634cbd51698a3ddb495fa6decd074ae523c8fbf
+RMD160 (libpng-1.5.14.tar.bz2) = a9af95e17070fe05bcb79012721f0848e00a3b7c
+Size (libpng-1.5.14.tar.bz2) = 869823 bytes
+SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index a164d3271dd..d5fdb04ac06 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,18 +1,19 @@
-$NetBSD: patch-aa,v 1.32 2011/11/06 23:53:46 wiz Exp $
+$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	2011-11-03 03:43:00.000000000 +0000
+--- Makefile.in.orig	2013-01-24 02:59:12.000000000 +0000
 +++ Makefile.in
-@@ -1356,14 +1356,6 @@ install-data-hook:
- install-exec-hook:
- 	cd $(DESTDIR)$(bindir); rm -f libpng-config
- 	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
+@@ -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\
+-	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;\
@@ -20,4 +21,4 @@ name.
 -	done
  
  uninstall-hook:
- 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
+ 	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h