[Maintainer update] multimedia/xmms to 1.2.8

	Update to xmms 1.2.8.  See http://www.xmms.org/next_version.php for
	a full description.

Please note that if you're running -current, some options will be
automaticly disabled due to the absence of -pthread in the current
gcc. For example, libmikmod might do this because of its --ldadd
option:
	[~] edwin@ref5>libmikmod-config --ldadd
	-pthread

PR:		ports/56504
Submitted by:	Espen Skoglund <esk@ira.uka.de>

4 files changed, 14 insertions, 46 deletions

diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-configure
index d99ef6ded3a6..6e9e556ad37c 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-configure
@@ -1,18 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Mon Mar  4 23:57:01 2002
-+++ configure	Tue May 14 09:06:50 2002
-@@ -10576,7 +10576,7 @@
- GMSGFMT="OLD_PO_FILE_INPUT=yes $GMSGFMT"
- MSGFMT="OLD_PO_FILE_INPUT=yes $MSGFMT"
- 
--localedir=${datadir}/locale
-+localedir=${prefix}/share/locale
- 
- 
- 
-@@ -12673,10 +12673,6 @@
+--- configure.orig	Fri Sep  5 20:28:38 2003
++++ configure	Fri Sep  5 20:28:51 2003
+@@ -13928,10 +13928,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/multimedia/xmms/files/patch-libxmms::util.c b/multimedia/xmms/files/patch-libxmms::util.c
deleted file mode 100644
index e0f118f8f1ed..000000000000
--- a/multimedia/xmms/files/patch-libxmms::util.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libxmms/util.c.orig	Fri Jun  1 15:07:49 2001
-+++ libxmms/util.c	Sun Oct  6 18:40:25 2002
-@@ -11,6 +11,7 @@
- #endif
- 
- #ifdef __FreeBSD__
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
- 
diff --git a/multimedia/xmms/files/patch-ltmain.sh b/multimedia/xmms/files/patch-ltmain.sh
index 3513c55b8eb9..928f8aedeb85 100644
--- a/multimedia/xmms/files/patch-ltmain.sh
+++ b/multimedia/xmms/files/patch-ltmain.sh
@@ -1,19 +1,9 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Mon Sep 24 14:12:50 2001
-+++ ltmain.sh	Tue Mar  5 11:16:25 2002
-@@ -2444,6 +2444,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4213,12 @@
+--- ltmain.sh.orig	Fri Sep  5 13:18:43 2003
++++ ltmain.sh	Fri Sep  5 13:18:09 2003
+@@ -4333,10 +4333,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/multimedia/xmms/files/patch-po::Makefile.in.in b/multimedia/xmms/files/patch-po::Makefile.in.in
index 7859a10fc0e4..ff7b31878f9b 100644
--- a/multimedia/xmms/files/patch-po::Makefile.in.in
+++ b/multimedia/xmms/files/patch-po::Makefile.in.in
@@ -1,10 +1,10 @@
---- po/Makefile.in.in.orig	Mon Mar  4 22:56:47 2002
-+++ po/Makefile.in.in	Fri Aug 22 16:50:02 2003
-@@ -88,6 +88,7 @@
- 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- 	  --add-comments --keyword=_ --keyword=N_ \
+--- po/Makefile.in.in.orig	Fri Sep  5 20:26:50 2003
++++ po/Makefile.in.in	Fri Sep  5 20:27:10 2003
+@@ -85,6 +85,7 @@
+ 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ 	  --add-comments=I18N: $(XGETTEXT_OPTIONS) \
  	  --files-from=$(srcdir)/POTFILES.in \
 +	  --from-code=ISO-8859-1 \
- 	&& test ! -f $(PACKAGE).po \
- 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
- 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+ 	  --copyright-holder='$(COPYRIGHT_HOLDER)'
+ 	test ! -f $(DOMAIN).po || { \
+ 	  if test -f $(srcdir)/$(DOMAIN).pot; then \