summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/png/Makefile4
-rw-r--r--graphics/png/distinfo9
-rw-r--r--graphics/png/patches/patch-pngconf.h22
3 files changed, 6 insertions, 29 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 022c7378965..b56b43091c2 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.131 2011/02/03 09:20:58 wiz Exp $
+# $NetBSD: Makefile,v 1.132 2011/04/05 12:47:56 wiz Exp $
-DISTNAME= libpng-1.5.1
+DISTNAME= libpng-1.5.2
PKGNAME= ${DISTNAME:S/lib//}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 99d5e4dc2af..12568614df1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.77 2011/02/04 23:35:29 adam Exp $
+$NetBSD: distinfo,v 1.78 2011/04/05 12:47:56 wiz Exp $
-SHA1 (libpng-1.5.1.tar.bz2) = 750361f1cd693da53ef66624d5a8a6a431c40cd5
-RMD160 (libpng-1.5.1.tar.bz2) = 62ab2800b760ca642db094017f798590465bc5a3
-Size (libpng-1.5.1.tar.bz2) = 773560 bytes
+SHA1 (libpng-1.5.2.tar.bz2) = db9658b1c7fcf65769bb01e773a703ce56389be5
+RMD160 (libpng-1.5.2.tar.bz2) = 8cf3f2add769bbb1170af7ad6ba5c6bd9a3efec8
+Size (libpng-1.5.2.tar.bz2) = 790523 bytes
SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
-SHA1 (patch-pngconf.h) = 407106790dccb265d6d1e17d1c263b1f7c82eb68
diff --git a/graphics/png/patches/patch-pngconf.h b/graphics/png/patches/patch-pngconf.h
deleted file mode 100644
index b4b1035f4ac..00000000000
--- a/graphics/png/patches/patch-pngconf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-pngconf.h,v 1.1 2011/02/04 23:35:29 adam Exp $
-
---- pngconf.h.orig 2011-02-04 23:31:35.000000000 +0000
-+++ pngconf.h
-@@ -287,7 +287,7 @@
- * PNG_EXPORT function for every compiler.
- */
- #ifndef PNG_FUNCTION
--# ifdef __GNUC__
-+# if defined(__GNUC__) && !defined(__clang__)
- # define PNG_FUNCTION(type, name, args, attributes)\
- attributes type name args
- # else /* !GNUC */
-@@ -347,7 +347,7 @@
- * functions in png.h will generate compiler warnings. Added at libpng
- * version 1.2.41.
- */
--# ifdef __GNUC__
-+# if defined(__GNUC__) && !defined(__clang__)
- # ifndef PNG_USE_RESULT
- # define PNG_USE_RESULT __attribute__((__warn_unused_result__))
- # endif