diff options
| -rw-r--r-- | graphics/png/Makefile | 4 | ||||
| -rw-r--r-- | graphics/png/distinfo | 14 | ||||
| -rw-r--r-- | graphics/png/patches/patch-aa | 12 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ac | 10 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ae | 5 |
5 files changed, 26 insertions, 19 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 10d7933d95e..d1e6892ec2a 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.124 2010/06/26 19:11:32 wiz Exp $ +# $NetBSD: Makefile,v 1.125 2010/09/24 08:58:40 wiz Exp $ -DISTNAME= libpng-1.4.3 +DISTNAME= libpng-1.4.4 PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 445781269b0..dc650ea1b59 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.69 2010/06/26 19:11:33 wiz Exp $ +$NetBSD: distinfo,v 1.70 2010/09/24 08:58:40 wiz Exp $ -SHA1 (libpng-1.4.3.tar.bz2) = 82eda95439daaef6ed564b1532cf805b01759557 -RMD160 (libpng-1.4.3.tar.bz2) = ad0abc000e0a338d94ff7f8fe2b862d5944ec7bb -Size (libpng-1.4.3.tar.bz2) = 658335 bytes -SHA1 (patch-aa) = fc7f010f347cb77d8b478395a59ba4c4c1abd4b9 -SHA1 (patch-ac) = 44b167433e066556022d9b43fa33a7f887f83617 -SHA1 (patch-ae) = e9700e7d3dd536d80e47cffa20b412a6c69660be +SHA1 (libpng-1.4.4.tar.bz2) = 638c5e184b569167148b0cb0f0f2a799660ea44f +RMD160 (libpng-1.4.4.tar.bz2) = bfe4d0c3e7fbf5d815f33a094de2d6927c6dca57 +Size (libpng-1.4.4.tar.bz2) = 635027 bytes +SHA1 (patch-aa) = 35c0fc773bb04ba097e87d89c7f8eb960e7f509a +SHA1 (patch-ac) = 0cb275bda71dcd72d5cf0986ac488bccf40ad2c5 +SHA1 (patch-ae) = cdf43d98edbed290e0b0333c18483158648f5451 diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index 87dd1cd6bd7..bc03a5d4e8c 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,14 +1,18 @@ -$NetBSD: patch-aa,v 1.28 2010/06/13 22:42:10 wiz Exp $ +$NetBSD: patch-aa,v 1.29 2010/09/24 08:58:41 wiz Exp $ ---- Makefile.in.orig 2010-05-06 10:30:19.000000000 +0000 +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 -@@ -1243,14 +1243,6 @@ install-data-hook: +@@ -1242,14 +1242,6 @@ install-data-hook: 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; do\ +- 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;\ diff --git a/graphics/png/patches/patch-ac b/graphics/png/patches/patch-ac index 1f1455cc90c..b7b72383627 100644 --- a/graphics/png/patches/patch-ac +++ b/graphics/png/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.8 2009/08/15 17:29:18 wiz Exp $ +$NetBSD: patch-ac,v 1.9 2010/09/24 08:58:41 wiz Exp $ ---- configure.orig 2009-08-13 11:13:36.000000000 +0000 +--- configure.orig 2010-09-23 12:18:42.000000000 +0000 +++ configure -@@ -11424,7 +11424,7 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5 - $as_echo_n "checking if libraries can be versioned... " >&6; } +@@ -11567,7 +11567,7 @@ $as_echo "no" >&6; } + ;; + * ) GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` -if test "$GLD"; then +if test "$GLD" && test "`uname -s`" != "Interix"; then diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae index 7a671120a76..d8fe379ab95 100644 --- a/graphics/png/patches/patch-ae +++ b/graphics/png/patches/patch-ae @@ -1,4 +1,7 @@ -$NetBSD: patch-ae,v 1.9 2009/05/13 09:56:05 wiz Exp $ +$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 |