-make sure the NetBSD <soundcard.h> is found instead of the version

 which comes with xmms, and link in -lossaudio
-fix the sun audio configuration dialog to avoid double unlocking of
 mutexes which NetBSD's libpthread gets mad about

7 files changed, 80 insertions, 3 deletions

diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 6019ce4a815..95471ed9d04 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2004/05/06 18:10:20 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/05/12 18:50:21 drochner Exp $
 #
 
 DISTNAME=	xmms-1.2.10
@@ -45,8 +45,8 @@ CONFIGURE_ARGS+=	--with-dev-dsp=${DEVOSSSOUND}		\
 			--with-cdda-dir=/cdrom/
 CPPFLAGS+=		-DHAVE_NANOSLEEP=1
 
-.  if ${MACHINE_ARCH} == "i386"
 post-patch:
+.  if ${MACHINE_ARCH} == "i386"
 .    if ${OBJECT_FMT} == "a.out"
 	${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/Input/mpg123/decode_i586.s
 .    endif
@@ -54,6 +54,7 @@ post-patch:
 	${MV} decode_i586.s decode_i586.s.orig && \
 	${SED} -e 's@^/@#/@g' <decode_i586.s.orig >decode_i586.s
 .  endif
+	${RM} -f ${WRKSRC}/Output/OSS/soundcard.h
 .endif
 
 .if ${OPSYS} == "SunOS"
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index b97d35a59ef..356280ad83c 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.18 2004/05/06 18:10:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.19 2004/05/12 18:50:21 drochner Exp $
 
 SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf
 Size (xmms-1.2.10.tar.bz2) = 2418265 bytes
 SHA1 (patch-aa) = 23eb5917abc23b56275b6ad96f90762531e52cab
+SHA1 (patch-ab) = a85defa7f7861089d5d8bb793de08a4573bfa6e0
+SHA1 (patch-ac) = 3862a4a2787546b0541f81686ead8e7531456a23
+SHA1 (patch-ad) = c1ae34511eced8a7856d517f68ed23611dc0cb0c
+SHA1 (patch-ae) = bc493ca81d6fa0310e795363e97915c8e8fde5d8
+SHA1 (patch-af) = 9b97ab806c497533a0e4d116a072a5d7920a15a6
diff --git a/audio/xmms/patches/patch-ab b/audio/xmms/patches/patch-ab
new file mode 100644
index 00000000000..351afe9c1a2
--- /dev/null
+++ b/audio/xmms/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/OSS/OSS.h.orig	2004-05-12 21:21:08.000000000 +0200
++++ Output/OSS/OSS.h	2004-05-12 21:21:26.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include "soundcard.h"
++#include <soundcard.h>
+ 
+ #include "xmms/plugin.h"
+ #include "libxmms/configfile.h"
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
new file mode 100644
index 00000000000..1ea06079864
--- /dev/null
+++ b/audio/xmms/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/OSS/Makefile.in.orig	2004-05-12 21:38:26.000000000 +0200
++++ Output/OSS/Makefile.in	2004-05-12 21:40:23.000000000 +0200
+@@ -240,7 +240,7 @@
+ lib_LTLIBRARIES = $(ossltlibs)
+ 
+ libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
+-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
+ libOSS_la_SOURCES = $(ossbuildsources)
+ INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ subdir = Output/OSS
diff --git a/audio/xmms/patches/patch-ad b/audio/xmms/patches/patch-ad
new file mode 100644
index 00000000000..5ad5b703ff8
--- /dev/null
+++ b/audio/xmms/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2004/05/12 18:50:21 drochner Exp $
+
+--- Input/cdaudio/cdaudio.h.orig	2004-05-12 21:26:15.000000000 +0200
++++ Input/cdaudio/cdaudio.h	2004-05-12 21:27:13.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "cdinfo.h"
+ 
+ #ifdef HAVE_OSS
+-#include <Output/OSS/soundcard.h>
++#include <soundcard.h>
+ #endif
+ 
+ #ifdef HAVE_MNTENT_H
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
new file mode 100644
index 00000000000..ddc38349fb1
--- /dev/null
+++ b/audio/xmms/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.7 2004/05/12 18:50:21 drochner Exp $
+
+--- Input/cdaudio/Makefile.in.orig	2004-05-12 21:39:31.000000000 +0200
++++ Input/cdaudio/Makefile.in	2004-05-12 21:40:22.000000000 +0200
+@@ -242,7 +242,7 @@
+ 
+ INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
+-libcdaudio_la_LIBADD = @GTK_LIBS@
++libcdaudio_la_LIBADD = @GTK_LIBS@ -lossaudio
+ libcdaudio_la_SOURCES = $(cdaudiobuildsources)
+ subdir = Input/cdaudio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
new file mode 100644
index 00000000000..ad305a407ac
--- /dev/null
+++ b/audio/xmms/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.6 2004/05/12 18:50:21 drochner Exp $
+
+--- Output/sun/configure.c.orig	2004-05-12 22:33:27.000000000 +0200
++++ Output/sun/configure.c	2004-05-12 22:34:11.000000000 +0200
+@@ -75,12 +75,12 @@
+ 	xmms_cfg_write_default_file(cfgfile);
+ 	xmms_cfg_free(cfgfile);
+ 
+-	configure_win_destroy();
++	gtk_widget_destroy(configure_win);
+ }
+ 
+ static void configure_win_cancel_cb(GtkWidget *w, gpointer data)
+ {
+-	configure_win_destroy();
++	gtk_widget_destroy(configure_win);
+ }
+ 
+ static void mixer_cbutton_toggled_cb(GtkWidget *w, int id)