[pkgsrc/trunk]: pkgsrc/audio/xsidplay Fix Xt test.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65df469a2681
branches:  trunk
changeset: 523769:65df469a2681
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 13 11:02:12 2007 +0000

description:
Fix Xt test.

diffstat:

 audio/xsidplay/distinfo         |   4 ++--
 audio/xsidplay/patches/patch-aa |  20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 38fab0b28f20 -r 65df469a2681 audio/xsidplay/distinfo
--- a/audio/xsidplay/distinfo   Sat Jan 13 10:46:34 2007 +0000
+++ b/audio/xsidplay/distinfo   Sat Jan 13 11:02:12 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/12/07 18:59:26 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/01/13 11:02:12 joerg Exp $
 
 SHA1 (xsidplay-1.6.5.1a.tgz) = 60f2262a8dd79b276272d49eff9a07277dc6c9aa
 RMD160 (xsidplay-1.6.5.1a.tgz) = 9a0529c7b76e7659feddc35c04aaf81ae2002984
 Size (xsidplay-1.6.5.1a.tgz) = 355698 bytes
-SHA1 (patch-aa) = f5a6065735aa1b925c6b9f912a85b72741b94a87
+SHA1 (patch-aa) = 9429e87677967e7b34a8fc48655dbdfebbd595ad
 SHA1 (patch-ab) = 188ab597250e8a444d33f0813fba157a3469872e
diff -r 38fab0b28f20 -r 65df469a2681 audio/xsidplay/patches/patch-aa
--- a/audio/xsidplay/patches/patch-aa   Sat Jan 13 10:46:34 2007 +0000
+++ b/audio/xsidplay/patches/patch-aa   Sat Jan 13 11:02:12 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2005/10/03 20:48:42 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2007/01/13 11:02:12 joerg Exp $
 
 --- configure.orig     2003-02-01 20:18:09.000000000 +0000
 +++ configure
@@ -44,7 +44,19 @@
      cat >> confdefs.h <<\EOF
  #define HAVE_FREEBSD 1
  EOF
-@@ -7789,6 +7792,7 @@ fi
+@@ -6946,9 +6949,10 @@ if test "$ac_x_libraries" = NO; then
+ cat > conftest.$ac_ext <<EOF
+ #line 6948 "configure"
+ #include "confdefs.h"
++#include <X11/Intrinsic.h>
+ 
+ int main() {
+-${x_direct_test_function}()
++${x_direct_test_function}(0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -7789,6 +7793,7 @@ fi
      done
  
  my_qt_includes=$qt_incdir
@@ -52,7 +64,7 @@
  
      qt_libdir=""
      for i in $qt_libdirs;
-@@ -7797,6 +7801,8 @@ my_qt_includes=$qt_incdir
+@@ -7797,6 +7802,8 @@ my_qt_includes=$qt_incdir
          do
                if test -r "$i/$j"; then
                        qt_libdir=$i
@@ -61,7 +73,7 @@
                  break 2
              fi
          done
-@@ -7886,7 +7892,7 @@ echo "configure:7879: checking for Qt ve
+@@ -7886,7 +7893,7 @@ echo "configure:7879: checking for Qt ve
      CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
      CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
      LDFLAGS="$LDFLAGS $QT_LDFLAGS"