LTCONFIG_OVERRIDE -> minus two patches.

Correct linking with libossaudio: plus two patches.
Still doesn't work, though.

6 files changed, 31 insertions, 62 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 654888dcdc2..692a7c7d895 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/08/14 13:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/14 14:20:55 wiz Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
 DISTNAME=	xmms-1.0.1
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --without-gnome
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		XML_CONFIG="${LOCALBASE}/bin/xml-config"
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/audio/xmms/files/patch-sum b/audio/xmms/files/patch-sum
index c07a56c82d1..c9e622b6970 100644
--- a/audio/xmms/files/patch-sum
+++ b/audio/xmms/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.4 2000/05/02 18:48:36 danw Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/14 14:20:58 wiz Exp $
 
 MD5 (patch-aa) = 6baf24a23b13f5d17300258c06b8eb7c
 MD5 (patch-ab) = 4030687175bf4bab9bb098150e15323a
 MD5 (patch-ac) = ff78dda0c8c7de0e796a04dd6ba6991c
 MD5 (patch-ad) = 0980675c9c1896eca7188bffd02d7cbd
-MD5 (patch-ae) = aa574bde74698dab9e3644e26aae9ba7
-MD5 (patch-af) = 0cb7493fcd03dc2e213a0c4cc0d1e63e
 MD5 (patch-ag) = ff4bbfada5d95d0a083cf60fdf2568bb
 MD5 (patch-ah) = 27624c39b2779ef2b2aaa024510c3bc0
 MD5 (patch-ai) = 0c0312b432eed6555ceb0c05edf6af90
 MD5 (patch-aj) = 190080be81a0f7b36ce304b399fdab2c
 MD5 (patch-ak) = 4ed10d3832db5d4442e7724924196993
 MD5 (patch-al) = 5b05406aae258ddb06b34ad63783457a
+MD5 (patch-am) = df66ea9f662507f8ea9082c62b0ddbce
+MD5 (patch-an) = e5d8ac3e05b31b9ff0d62c7d3d4d9c5f
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
deleted file mode 100644
index 44c53eae305..00000000000
--- a/audio/xmms/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/05/02 18:48:36 danw Exp $
-
---- configure.orig	Mon Jan 31 19:43:50 2000
-+++ configure	Sun Mar 12 21:20:08 2000
-@@ -1339,6 +1339,7 @@
- fi
- 
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1492,6 +1493,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3017,7 +3019,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lxml -lz $LIBS"
-+LIBS="`$XML_CONFIG --libs` -lz $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3023 "configure"
- #include "confdefs.h"
-@@ -3295,7 +3297,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lesd  $LIBS"
-+LIBS="`$ESD_CONFIG --libs`  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3301 "configure"
- #include "confdefs.h"
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
deleted file mode 100644
index 1ce29893526..00000000000
--- a/audio/xmms/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/03/07 23:03:13 tron Exp $
-
---- libxmms/configure.orig	Tue Mar  7 23:25:18 2000
-+++ libxmms/configure	Tue Mar  7 23:28:07 2000
-@@ -1473,6 +1473,7 @@
- 
- 
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1626,6 +1627,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
new file mode 100644
index 00000000000..3be697a5c72
--- /dev/null
+++ b/audio/xmms/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2000/08/14 14:20:59 wiz Exp $
+
+--- Output/OSS/Makefile.in.orig	Mon Jan 31 19:44:33 2000
++++ Output/OSS/Makefile.in	Mon Aug 14 16:01:15 2000
+@@ -136,7 +136,7 @@
+ libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+ 
+ libOSS_la_LDFLAGS = $(ossldflags)
+-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
+ libOSS_la_SOURCES = $(osssources)
+ INCLUDES = @GTK_CFLAGS@ @OSS_CFLAGS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
new file mode 100644
index 00000000000..7b2f0ab2105
--- /dev/null
+++ b/audio/xmms/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2000/08/14 14:20:59 wiz Exp $
+
+--- Input/cdaudio/Makefile.in.orig	Mon Jan 31 19:44:37 2000
++++ Input/cdaudio/Makefile.in	Mon Aug 14 16:00:37 2000
+@@ -139,7 +139,7 @@
+ 
+ INCLUDES = @GTK_CFLAGS@
+ libcdaudio_la_LDFLAGS = $(cdaudioldflags)
+-libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@
++libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ -lossaudio
+ libcdaudio_la_SOURCES = $(cdaudiosources)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h