summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/png/distinfo4
-rw-r--r--graphics/png/patches/patch-aa13
2 files changed, 14 insertions, 3 deletions
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 8a3b9cc7aee..ec579d46528 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86 2011/09/28 05:34:08 wiz Exp $
+$NetBSD: distinfo,v 1.87 2011/10/05 16:23:39 hans Exp $
SHA1 (libpng-1.5.5.tar.bz2) = be63517aa20e8539f0be07706326f5cb53c42e13
RMD160 (libpng-1.5.5.tar.bz2) = 9dcacbf5038c444289d03fb66436168c07298c45
Size (libpng-1.5.5.tar.bz2) = 836444 bytes
-SHA1 (patch-aa) = 0c4f4e594798384079a0ce2ee5d7a45e16366b12
+SHA1 (patch-aa) = ede62be2f7df4e17162520156c66ac1a9c537e4e
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index 5f12ab83017..cfecac9359d 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.30 2011/01/13 13:27:22 wiz Exp $
+$NetBSD: patch-aa,v 1.31 2011/10/05 16:23:39 hans Exp $
+
+It's -Wl, not Wl.
Don't install compat links to libpng. Programs should use
the pkg-config or libpng-config scripts to get the correct png library
@@ -6,6 +8,15 @@ name.
--- Makefile.in.orig 2011-01-06 13:02:45.000000000 +0000
+++ Makefile.in
+@@ -43,7 +43,7 @@ host_triplet = @host@
+ check_PROGRAMS = pngtest$(EXEEXT) pngvalid$(EXEEXT)
+
+ # Versioned symbols and restricted exports
+-@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_TRUE@am__append_1 = -Wl,-M Wl,libpng.vers
++@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_TRUE@am__append_1 = -Wl,-M -Wl,libpng.vers
+ @HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_FALSE@am__append_2 = -Wl,--version-script=libpng.vers
+ # Only restricted exports when possible
+ @HAVE_LD_VERSION_SCRIPT_FALSE@am__append_3 = -export-symbols libpng.sym
@@ -1342,14 +1342,6 @@ install-data-hook:
install-exec-hook:
cd $(DESTDIR)$(bindir); rm -f libpng-config