4 files changed, 50 insertions, 30 deletions
diff --git a/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab
index a9842709cd22..a4895b94c00e 100644
--- a/audio/xmms/files/patch-ab
+++ b/audio/xmms/files/patch-ab
@@ -1,19 +1,11 @@
-*** Visualization/Makefile.in.org	Wed Jun 14 13:21:50 2000
---- Visualization/Makefile.in	Wed Jun 14 13:22:09 2000
-***************
-*** 148,154 ****
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = blur_scope sanalyzer opengl_spectrum
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
---- 148,154 ----
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = blur_scope sanalyzer
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
+--- Visualization/Makefile.in.orig	Mon Jan 31 10:44:44 2000
++++ Visualization/Makefile.in	Sun Feb 27 01:37:39 2000
+@@ -125,7 +125,7 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+ 
+-SUBDIRS = blur_scope sanalyzer opengl_spectrum
++SUBDIRS = blur_scope sanalyzer
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad
index 69fc08dace8d..0b26a5e0f80b 100644
--- a/audio/xmms/files/patch-ad
+++ b/audio/xmms/files/patch-ad
@@ -5,7 +5,7 @@
  fi
  
 -
-+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then
++if [ x"${HAVE_ESOUND}" != x"yes" ]; then
 +  have_esd=no
 +fi
  
@@ -16,21 +16,12 @@
    rm -f conf.mikmodtest
  
 -
-+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then
++if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
 +  have_mikmod=no
 +fi
  
  if test "x$have_mikmod" = xyes; then
    HAVE_MIKMOD_TRUE=
-@@ -5549,7 +5553,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -7171,14 +7175,14 @@
  
  if test -n "$GCC"
@@ -48,3 +39,14 @@
  		ARCH_DEFINES="-DI386_ASSEM"
  		arch_type=ix86
  	;;
+@@ -7885,10 +7889,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae
index 6494be16d0a2..8eea92cf33e2 100644
--- a/audio/xmms/files/patch-ae
+++ b/audio/xmms/files/patch-ae
@@ -1,5 +1,17 @@
 --- Makefile.in.orig	Mon Jul 31 10:27:32 2000
 +++ Makefile.in	Mon Jul 31 10:27:49 2000
+@@ -147,7 +147,10 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+ 
+-SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po
++SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
++.ifdef HAVE_GNOME
++SUBDIRS += gnomexmms
++.endif 
+ 
+ bin_SCRIPTS = xmms-config
+ 
 @@ -205,9 +205,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
diff --git a/audio/xmms/files/patch-af b/audio/xmms/files/patch-af
new file mode 100644
index 000000000000..014ca1b56704
--- /dev/null
+++ b/audio/xmms/files/patch-af
@@ -0,0 +1,14 @@
+--- Output/Makefile.in.orig	Mon Jan 31 10:44:32 2000
++++ Output/Makefile.in	Sun Feb 27 01:37:39 2000
+@@ -125,7 +125,10 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+ 
+-SUBDIRS = OSS esd disk_writer
++SUBDIRS = OSS disk_writer
++.if defined(HAVE_ESOUND) || defined(HAVE_GNOME)
++SUBDIRS += esd
++.endif 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =