[pkgsrc/trunk]: pkgsrc/audio/xsidplay Fix libtool usage.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e3e82e19142
branches:  trunk
changeset: 568290:8e3e82e19142
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 09 21:19:59 2009 +0000

description:
Fix libtool usage.

diffstat:

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

diffs (78 lines):

diff -r 3d77c66d6e59 -r 8e3e82e19142 audio/xsidplay/distinfo
--- a/audio/xsidplay/distinfo   Wed Dec 09 20:35:53 2009 +0000
+++ b/audio/xsidplay/distinfo   Wed Dec 09 21:19:59 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2007/09/29 11:47:03 rillig Exp $
+$NetBSD: distinfo,v 1.11 2009/12/09 21:19:59 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) = 9429e87677967e7b34a8fc48655dbdfebbd595ad
+SHA1 (patch-aa) = ca8ce2db592937d2f5328aae885d9be0074e156e
 SHA1 (patch-ab) = 188ab597250e8a444d33f0813fba157a3469872e
 SHA1 (patch-ac) = ec7d71b9cc3be97601c842d22887d147933853e3
diff -r 3d77c66d6e59 -r 8e3e82e19142 audio/xsidplay/patches/patch-aa
--- a/audio/xsidplay/patches/patch-aa   Wed Dec 09 20:35:53 2009 +0000
+++ b/audio/xsidplay/patches/patch-aa   Wed Dec 09 21:19:59 2009 +0000
@@ -1,7 +1,43 @@
-$NetBSD: patch-aa,v 1.11 2007/01/13 11:02:12 joerg Exp $
+$NetBSD: patch-aa,v 1.12 2009/12/09 21:19:59 joerg Exp $
 
---- configure.orig     2003-02-01 20:18:09.000000000 +0000
+--- configure.orig     2003-02-01 21:18:09.000000000 +0100
 +++ configure
+@@ -5541,7 +5541,7 @@ fi
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -6016,7 +6016,7 @@ else
+     my_libs_save="$LIBS"
+ 
+ 
+-    CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
++    CXX="libtool --mode=link $CXX"
+     CXXFLAGS="$CXXFLAGS $my_sidplay2_cxxflags -DHAVE_UNIX"
+     LDFLAGS="$LDFLAGS $my_sidplay2_ldadd"
+ 
+@@ -6123,7 +6123,7 @@ rm -f conftest*
+     my_libs_save="$LIBS"
+ 
+ 
+-    CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
++    CXX="libtool --mode=link $CXX"
+     CXXFLAGS="$CXXFLAGS $my_sidplay2_cxxflags -DHAVE_UNIX"
+     LDFLAGS="$LDFLAGS $my_sidplay2_ldadd"
+ 
+@@ -6251,7 +6251,7 @@ echo "configure:6247: checking for reSID
+     my_libs_save="$LIBS"
+ 
+     
+-    CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
++    CXX="libtool --mode=link $CXX"
+     CXXFLAGS="$CXXFLAGS $BUILDERS_INCLUDES"
+     LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS"
+     LIBS="$LIBS -lresid-builder"
 @@ -6577,6 +6577,7 @@ else
  fi
   
@@ -73,8 +109,12 @@
                  break 2
              fi
          done
-@@ -7886,7 +7893,7 @@ echo "configure:7879: checking for Qt ve
-     CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
+@@ -7883,10 +7890,10 @@ echo "configure:7879: checking for Qt ve
+     my_libs_save="$LIBS"
+ 
+     
+-    CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
++    CXX="libtool --mode=link $CXX"
      CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
      LDFLAGS="$LDFLAGS $QT_LDFLAGS"
 -    LIBS="$LIBS -lqt"