Update to 1.5.1beta01:

1.5.1beta01 contains a security fix for 1.5.0.

The current public release, libpng 1.5.0, continues the evolution
of the libpng API, finally hiding the contents of the venerable
and hoary png_struct and png_info data structures inside private
(i.e., non-installed) header files. (Apps that compiled with libpng
1.4 without warnings about deprecated features should happily
compile with 1.5, too.) It also includes a new, more thorough test
program (pngvalid.c), a new pnglibconf.h header file that tracks
what features were enabled or disabled when libpng was built, and
huge thanks to John Bowler, who did most of the work. Complete
differences relative to libpng 1.4.x are detailed at
http://www.libpng.org/pub/png/src/libpng-1.4.x-to-1.5.x-summary.txt .

Since the shlib name changed, next up: PKGREVISION++ all across pkgsrc.

6 files changed, 23 insertions, 39 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 715c8aa8b0b..d668d28e4f1 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.126 2010/12/10 12:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2011/01/13 13:27:21 wiz Exp $
 
-DISTNAME=	libpng-1.4.5
+DISTNAME=	libpng-1.5.1beta01
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.libpng.org/pub/png/libpng.html
 COMMENT=	Library for manipulating PNG images
+LICENSE=	png-license
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/graphics/png/PLIST b/graphics/png/PLIST
index 91008096236..4e3f8c2191c 100644
--- a/graphics/png/PLIST
+++ b/graphics/png/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.12 2010/06/13 22:42:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2011/01/13 13:27:21 wiz Exp $
 bin/libpng-config
-bin/libpng14-config
-include/libpng14/png.h
-include/libpng14/pngconf.h
+bin/libpng15-config
+include/libpng15/png.h
+include/libpng15/pngconf.h
+include/libpng15/pnglibconf.h
 include/png.h
 include/pngconf.h
-lib/libpng14.la
+include/pnglibconf.h
+lib/libpng15.la
 lib/pkgconfig/libpng.pc
-lib/pkgconfig/libpng14.pc
+lib/pkgconfig/libpng15.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 62ab8d70afd..310194d928d 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:42:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2011/01/13 13:27:21 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.4.2
+BUILDLINK_ABI_DEPENDS.png+=	png>=1.5.0
 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:png14
+BUILDLINK_TRANSFORM+=	l:png:png15
 
 .include "../../devel/zlib/buildlink3.mk"
 .endif # PNG_BUILDLINK3_MK
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index e8e4ed3da75..2942376abd1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.71 2010/12/10 12:37:26 wiz Exp $
+$NetBSD: distinfo,v 1.72 2011/01/13 13:27:22 wiz Exp $
 
-SHA1 (libpng-1.4.5.tar.bz2) = 58005bee4a3452f2a3406b07910912f1266cde59
-RMD160 (libpng-1.4.5.tar.bz2) = 4a498d6949a956031677b1cca95dc89dae7aedcf
-Size (libpng-1.4.5.tar.bz2) = 680469 bytes
-SHA1 (patch-aa) = 35c0fc773bb04ba097e87d89c7f8eb960e7f509a
+SHA1 (libpng-1.5.1beta01.tar.bz2) = 3edd379cfae7240c93022347b4dbdef9744443f7
+RMD160 (libpng-1.5.1beta01.tar.bz2) = 68d0ee37a70426a5caf35172f97f6aec846d3ef3
+Size (libpng-1.5.1beta01.tar.bz2) = 763444 bytes
+SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
 SHA1 (patch-ac) = 0cb275bda71dcd72d5cf0986ac488bccf40ad2c5
-SHA1 (patch-ae) = cdf43d98edbed290e0b0333c18483158648f5451
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index bc03a5d4e8c..5f12ab83017 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $
+$NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 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	2010-09-23 12:18:43.000000000 +0000
+--- Makefile.in.orig	2011-01-06 13:02:45.000000000 +0000
 +++ Makefile.in
-@@ -1242,14 +1242,6 @@ install-data-hook:
+@@ -1342,14 +1342,6 @@ install-data-hook:
  install-exec-hook:
  	cd $(DESTDIR)$(bindir); rm -f libpng-config
  	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
@@ -20,4 +20,4 @@ name.
 -	done
  
  uninstall-hook:
- 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
+ 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae
deleted file mode 100644
index d8fe379ab95..00000000000
--- a/graphics/png/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2010/09/24 08:58:41 wiz Exp $
-
-Instead of random text that may or may not make compilers error
-out, use #warning.
-
---- pngconf.h.orig	2009-05-07 16:05:28.000000000 +0000
-+++ pngconf.h
-@@ -332,8 +332,8 @@
-        /* If you encounter a compiler error here, see the explanation
-         * near the end of INSTALL.
-         */
--           __pngconf.h__ in libpng already includes setjmp.h;
--           __dont__ include it again.;
-+#warning           __pngconf.h__ in libpng already includes setjmp.h;
-+#warning           __dont__ include it again.;
- #      endif
- #    endif /* __linux__ */
- #  endif /* PNG_SKIP_SETJMP_CHECK */