Update to 1.6.0:

This release adds a "simplified API" and removes some features
that have been deprecated since libpng.1.5.x.

Changes to Libpng from version 1.5.x to 1.6.x:

A "simplified API" has been added (see documentation in png.h and a simple
example in contrib/examples/pngtopng.c).  The new publicly visible API
includes the following:

   macros:
     PNG_FORMAT_*
     PNG_IMAGE_*
   structures:
     png_control
     png_image
   read functions
     png_image_begin_read_from_file()
     png_image_begin_read_from_stdio()
     png_image_begin_read_from_memory()
     png_image_finish_read()
     png_image_free()
   write functions
     png_image_write_to_file()
     png_image_write_to_stdio()

Starting with libpng-1.6.0, you can configure libpng to prefix all exported
symbols, using the PNG_PREFIX macro.

We no longer include string.h in png.h.  The include statement has been moved
to pngpriv.h, where it is not accessible by applications.  Applications that
need access to information in string.h must add an '#include "string.h"'
directive.  It does not matter whether this is placed prior to or after
the '"#include png.h"' directive.

The following API are now DEPRECATED:
   png_info_init_3()
   png_convert_to_rfc1123() which has been replaced
     with png_convert_to_rfc1123_buffer()
   png_data_freer()
   png_malloc_default()
   png_free_default()
   png_reset_zstream()

The following has been removed:
   png_get_io_chunk_name(), which has been replaced
     with png_get_io_chunk_type().  The new
     function returns a 32-bit integer instead of
     a string.
   The png_sizeof(), png_strlen(), png_memcpy(), png_memcmp(), and
     png_memset() macros are no longer used in the libpng sources and
     have been removed.  These had already been made invisible to
applications
     (i.e., defined in the private pngpriv.h header file) since
libpng-1.5.0.

The signatures of many exported functions were changed, such that
   png_structp became png_structrp or png_const_structrp
   png_infop became png_inforp or png_const_inforp
where "rp" indicates a "restricted pointer".

Error detection in some chunks has improved; in particular the iCCP chunk
reader now does pretty complete validation of the basic format.  Some bad
profiles that were previously accepted are now rejected, in particular the
very old broken Microsoft/HP sRGB profile.

The library now issues a warning if both background processing and RGB to
gray are used when gamma correction happens. As with previous versions of
the library the results are numerically very incorrect in this case.

There are some minor arithmetic changes in some transforms such as
png_set_background(), that might be detected by certain regression tests.

Unknown chunk handling has been improved internally, without any API change.
This adds more correct option control of the unknown handling, corrects
a pre-existing bug where the per-chunk 'keep' setting is ignored, and makes
it possible to skip IDAT chunks in the sequential reader.

4 files changed, 18 insertions, 17 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index eac28d08a6c..dd4c0867905 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.153 2013/01/24 08:15:50 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2013/02/16 11:16:06 wiz Exp $
 
-DISTNAME=	libpng-1.5.14
+DISTNAME=	libpng-1.6.0
 PKGNAME=	${DISTNAME:S/lib//}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
 		ftp://ftp.fu-berlin.de/unix/graphics/png/src/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.libpng.org/pub/png/libpng.html
diff --git a/graphics/png/PLIST b/graphics/png/PLIST
index 4e3f8c2191c..c211d38c089 100644
--- a/graphics/png/PLIST
+++ b/graphics/png/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.13 2011/01/13 13:27:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2013/02/16 11:16:06 wiz Exp $
 bin/libpng-config
-bin/libpng15-config
-include/libpng15/png.h
-include/libpng15/pngconf.h
-include/libpng15/pnglibconf.h
+bin/libpng16-config
+include/libpng16/png.h
+include/libpng16/pngconf.h
+include/libpng16/pnglibconf.h
 include/png.h
 include/pngconf.h
 include/pnglibconf.h
-lib/libpng15.la
+lib/libpng16.la
 lib/pkgconfig/libpng.pc
-lib/pkgconfig/libpng15.pc
+lib/pkgconfig/libpng16.pc
 man/man3/libpng.3
 man/man3/libpngpf.3
 man/man5/png.5
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 3dc4809c86a..248ce76efe5 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2011/01/24 08:08:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2013/02/16 11:16:06 wiz Exp $
 
 BUILDLINK_TREE+=	png
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	png
 PNG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.png+=	png>=1.2.4
-BUILDLINK_ABI_DEPENDS.png+=	png>=1.5.0
+BUILDLINK_ABI_DEPENDS.png+=	png>=1.6.0nb1
 BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
 # keep this in sync with the same code in Makefile
@@ -19,7 +19,7 @@ CPPFLAGS+=	-DPNG_NO_ASSEMBLER_CODE
 # instead of installing symlinks. Work around this with buildlink
 # magic: packages outside pkgsrc will need to be converted to
 # one of the proper methods or fail.
-BUILDLINK_TRANSFORM+=	l:png:png15
+BUILDLINK_TRANSFORM+=	l:png:png16
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # PNG_BUILDLINK3_MK
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index f773edadd95..577a2b47e88 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.99 2013/01/24 08:15:50 wiz Exp $
+$NetBSD: distinfo,v 1.100 2013/02/16 11:16:06 wiz Exp $
 
-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 (libpng-1.6.0.tar.xz) = 830123507d845d4783e81e46e912a23db3a4f13b
+RMD160 (libpng-1.6.0.tar.xz) = 919d743bb265f76bbec04e10e0565db1df10b233
+Size (libpng-1.6.0.tar.xz) = 825232 bytes
 SHA1 (patch-aa) = 080c890ee48923db959fcdeeb12e4a5a27845138