From b0d55b53a7dc9ae215c78ffc06da73d4e35aa20e Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Thu, 7 Dec 2006 10:50:27 +0000
Subject: Whoops, I clobbered rillig's previous commit with my last one, put
 his changes back.  Spotted by wiz.

---
 multimedia/gnash/distinfo         |  4 ++--
 multimedia/gnash/patches/patch-aa | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 0e560e18bc3..ef7c611cdc3 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/12/07 10:07:10 markd Exp $
+$NetBSD: distinfo,v 1.6 2006/12/07 10:50:27 markd Exp $
 
 SHA1 (gnash-0.7.2.tar.bz2) = e2bbd71d61665c435ed22339078070af196ea31a
 RMD160 (gnash-0.7.2.tar.bz2) = 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198
 Size (gnash-0.7.2.tar.bz2) = 1599810 bytes
-SHA1 (patch-aa) = 703a62d4044644ba544432e90037e347fb5f9283
+SHA1 (patch-aa) = 037a38567052fc3ea3c6f2cef6e4dbe31e64c823
 SHA1 (patch-ab) = 1ad18261886442e6cec44bc0f3db09ec2ced1e15
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index d48a36e357c..2dd41525cff 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2006/12/07 10:07:10 markd Exp $
+$NetBSD: patch-aa,v 1.6 2006/12/07 10:50:28 markd Exp $
+
+* Fixed "test ==".
+* Fixed an invalid use of backticks (line 26598).
 
 --- configure.orig	2006-11-17 20:09:10.000000000 +0100
-+++ configure	2006-12-06 00:22:10.000000000 +0100
++++ configure	2006-12-07 01:23:40.000000000 +0100
 @@ -4303,13 +4303,13 @@
    LIBPRE="lib"
  
@@ -18,6 +21,15 @@ $NetBSD: patch-aa,v 1.5 2006/12/07 10:07:10 markd Exp $
  	   LIBEXT="dll"
  	fi
    fi
+@@ -26598,7 +26598,7 @@
+     if test x"${with_atk_lib}" != x ; then
+       libname=atkatk-x11-${gnash_atk_version}
+       if test -f ${with_atk_lib}/lib${libname}.a -o -f ${with_atk_lib}/lib${libname}.so; then
+-        ac_cv_path_atk_lib="`-L(cd ${with_atk_lib}; pwd)` -l${libname}"
++        ac_cv_path_atk_lib="-L`cd ${with_atk_lib}; pwd` -l${libname}"
+       else
+         { { echo "$as_me:$LINENO: error: ${with_atk_lib} directory doesn't contain libatkatk." >&5
+ echo "$as_me: error: ${with_atk_lib} directory doesn't contain libatkatk." >&2;}
 @@ -45388,7 +45388,7 @@
  
  
-- 
cgit v1.2.3