Update to 1.2.5.

PR:		28292
Submitted by:	maintainer

5 files changed, 7 insertions, 178 deletions

diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab
deleted file mode 100644
index a4895b9..0000000
--- a/multimedia/xmms/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
index 638bfcf..6de233e 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-ad
@@ -1,55 +1,17 @@
---- configure.orig	Tue Nov 28 16:12:16 2000
-+++ configure	Tue Nov 28 16:12:52 2000
-@@ -4033,6 +4033,9 @@
- fi
- 
- 
-+if [ x"${HAVE_ESOUND}" != x"yes" ]; then
-+  have_esd=no
-+fi
- 
- if test "x$have_esd" = xyes; then
-   HAVE_ESD_TRUE=
-@@ -4314,6 +4317,9 @@
-   rm -f conf.mikmodtest
- 
- 
-+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
-+  have_mikmod=no
-+fi
- 
- if test "x$have_mikmod" = xyes; then
-   HAVE_MIKMOD_TRUE=
-@@ -4574,6 +4580,11 @@
-   
-   rm -f conf.vorbistest
- 
-+if [ x"${HAVE_VORBIS}" != x"yes" ]; then
-+  have_ogg=no
-+  have_vorbis=no
-+fi
-+
- have_oggvorbis=no
- if test "x$have_ogg" = xyes
- then
-@@ -7551,14 +7562,14 @@
- 
- if test -n "$GCC"
- then
--	CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math"
-+	CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -finline-functions -ffast-math"
- fi
- 
- arch_type=other
+
+$FreeBSD$
+
+--- configure.orig	Mon Jun 18 22:53:50 2001
++++ configure	Thu Jun 21 18:24:01 2001
+@@ -8062,7 +8062,6 @@
  ARCH_DEFINES=""
  case "$host" in 
  	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
 -		CFLAGS="$CFLAGS -m486"
-+		CFLAGS="$CFLAGS"
  		ARCH_DEFINES="-DI386_ASSEM"
  		arch_type=ix86
  	;;
-@@ -8315,10 +8326,6 @@
+@@ -8858,10 +8857,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/multimedia/xmms/files/patch-ae b/multimedia/xmms/files/patch-ae
deleted file mode 100644
index e013d1c..0000000
--- a/multimedia/xmms/files/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in.orig	Tue Nov 28 14:55:51 2000
-+++ Makefile.in	Tue Nov 28 14:57:22 2000
-@@ -152,7 +152,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
- 
-@@ -211,9 +214,9 @@
- 		rm -f $(srcdir)/stamp-h.in; \
- 		$(MAKE) $(srcdir)/stamp-h.in; \
- 	else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
--	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-+#	cd $(top_srcdir) && $(AUTOHEADER)
-+#	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
- 
diff --git a/multimedia/xmms/files/patch-af b/multimedia/xmms/files/patch-af
deleted file mode 100644
index eccc666..0000000
--- a/multimedia/xmms/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
---- Output/Makefile.in.orig	Tue Nov 28 14:58:15 2000
-+++ Output/Makefile.in	Tue Nov 28 14:58:46 2000
-@@ -152,7 +152,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 = 
diff --git a/multimedia/xmms/files/patch-ba b/multimedia/xmms/files/patch-ba
deleted file mode 100644
index 0a38064..0000000
--- a/multimedia/xmms/files/patch-ba
+++ /dev/null
@@ -1,81 +0,0 @@
-*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.c	Wed Aug  2 02:15:13 2000
---- Input/cdaudio/cdaudio.c	Tue Sep  5 12:46:29 2000
-***************
-*** 183,194 ****
-  
-  static gboolean is_mounted(gchar * device_name)
-  {
-! #ifdef HAVE_MNTENT_H
-! 	FILE *mounts;
-! 	struct mntent *mnt;
-  	char devname[256];
-  	struct stat st;
-! 
-  	if (lstat(device_name, &st) < 0)
-  		return -1;
-  
---- 183,199 ----
-  
-  static gboolean is_mounted(gchar * device_name)
-  {
-! #if defined (HAVE_MNTENT_H) || defined (__FreeBSD__)
-  	char devname[256];
-  	struct stat st;
-! #if defined (HAVE_MNTENT_H)
-! 	FILE *mounts;
-! 	struct mntent *mnt;
-! #elif defined (__FreeBSD__)
-! 	struct statfs *fsp;
-! 	int entries;
-! #endif
-! 	
-  	if (lstat(device_name, &st) < 0)
-  		return -1;
-  
-***************
-*** 197,202 ****
---- 202,208 ----
-  	else
-  		strncpy(devname, device_name, 256);
-  
-+ #if defined (HAVE_MNTENT_H)		
-  	if ((mounts = setmntent(MOUNTED, "r")) == NULL)
-  		return TRUE;
-  
-***************
-*** 209,214 ****
---- 215,231 ----
-  		}
-  	}
-  	endmntent(mounts);
-+ #elif defined (__FreeBSD__)
-+ 	entries = getmntinfo (&fsp, MNT_NOWAIT);
-+ 	if (entries < 0)
-+ 		return NULL;
-+ 
-+         while (entries-- > 0) {
-+                 if (!strcmp(fsp->f_mntfromname, devname))
-+ 		return TRUE;
-+         fsp++;
-+         }
-+ #endif                            
-  #endif
-  	return FALSE;
-  }
-*** /usr/local/src/CVS/MM/xmms/xmms/Input/cdaudio/cdaudio.h	Thu Jun 15 00:51:44 2000
---- Input/cdaudio/cdaudio.h	Tue Sep  5 13:49:37 2000
-***************
-*** 46,51 ****
---- 46,57 ----
-  #include <mntent.h>
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ #include <sys/param.h>
-+ #include <sys/ucred.h>
-+ #include <sys/mount.h>
-+ #endif
-+ 
-  #ifndef CD_FRAMES
-  #define CD_FRAMES 75
-  #endif