10 files changed, 15 insertions, 103 deletions

diff --git a/multimedia/xmms/files/extra-patch-Visualization_Makefile.am b/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
deleted file mode 100644
index bc16a87345d2..000000000000
--- a/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
---- Visualization/Makefile.am.orig	2001-01-19 07:37:43.000000000 -0900
-+++ Visualization/Makefile.am	2008-09-28 14:03:48.000000000 -0800
-@@ -1,2 +1,2 @@
--ALL_PLUGINS = blur_scope sanalyzer opengl_spectrum
-+ALL_PLUGINS = blur_scope sanalyzer
- SUBDIRS = @VISUALIZATION_PLUGINS@
diff --git a/multimedia/xmms/files/patch-gcc41 b/multimedia/xmms/files/patch-General-ir-ir.c
index 9e63778e2dbf..e929cd04e49f 100644
--- a/multimedia/xmms/files/patch-gcc41
+++ b/multimedia/xmms/files/patch-General-ir-ir.c
@@ -1,15 +1,11 @@
 --- General/ir/ir.c.orig	Mon Mar  5 14:17:44 2001
 +++ General/ir/ir.c	Sat Dec 16 15:41:23 2006
-@@ -16,10 +16,10 @@
+@@ -16,7 +16,7 @@
  #include "ir.h"
  
  /* Important stuff to know */
 -static gboolean keepGoing = FALSE;
-+gboolean keepGoing = FALSE;
++static volatile gboolean keepGoing = FALSE;
  
  /* The thread handle */
--static pthread_t irapp_thread;
-+pthread_t irapp_thread;
- 
- /* Declarations for calls that we need to mention in the plugin struct */
- static void init(void);
+ static pthread_t irapp_thread;
diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4
deleted file mode 100644
index 2466d0d246fb..000000000000
--- a/multimedia/xmms/files/patch-aclocal.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- aclocal.m4.orig	2007-11-16 15:54:32.000000000 -0600
-+++ aclocal.m4	2010-09-28 00:40:44.000000000 -0500
-@@ -3872,3 +3872,3 @@
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
- 
-@@ -3879,3 +3879,3 @@
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
- 
diff --git a/multimedia/xmms/files/patch-configure.in b/multimedia/xmms/files/patch-configure.in
deleted file mode 100644
index df5cba0e8ecd..000000000000
--- a/multimedia/xmms/files/patch-configure.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.in.orig	2007-11-16 22:52:30.000000000 +0100
-+++ configure.in	2007-12-29 18:08:33.603961280 +0100
-@@ -115,7 +115,14 @@
- dnl ***
- dnl *** Check pthread linking
- dnl ***
-+AC_MSG_CHECKING([for PTHREAD_LIBS])
-+if test "x$PTHREAD_LIBS" = "x"; then
- PTHREAD_LIBS=error
-+else
-+AC_MSG_RESULT([$PTHREAD_LIBS])
-+fi
-+
-+if test "x$PTHREAD_LIBS" = "xerror"; then
- AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
- AC_EGREP_CPP([yes],
- 	[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
-@@ -124,6 +131,7 @@
- 	], AC_MSG_RESULT([yes])
- 	CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
- 	AC_MSG_RESULT([no]))
-+fi
- if test "x$PTHREAD_LIBS" = "xerror"; then
- 	AC_CHECK_LIB([pthread], [pthread_attr_init],
- 		PTHREAD_LIBS="-lpthread")
-@@ -423,7 +431,6 @@
- LIBS_save=$LIBS
- CFLAGS_save=$CFLAGS
- LDFLAGS_save=$LDFLAGS
--AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
- AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
- LIBS=$LIBS_save
- CFLAGS=$CFLAGS_save
diff --git a/multimedia/xmms/files/patch-ltmain.sh b/multimedia/xmms/files/patch-ltmain.sh
deleted file mode 100644
index dc7ec5c89f37..000000000000
--- a/multimedia/xmms/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Sep  5 13:18:43 2003
-+++ ltmain.sh	Fri Sep  5 13:18:09 2003
-@@ -6038,10 +6038,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/xmms/files/patch-po-Makefile.in.in b/multimedia/xmms/files/patch-po-Makefile.in.in
deleted file mode 100644
index 134078c01554..000000000000
--- a/multimedia/xmms/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- po/Makefile.in.in.orig	2007-12-28 18:06:27.340155988 +0100
-+++ po/Makefile.in.in	2007-12-28 18:06:52.250680503 +0100
-@@ -30,6 +30,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+install_sh = @install_sh@
- mkinstalldirs = $(SHELL) @install_sh@ -d
- mkdir_p = @mkdir_p@
- 
diff --git a/multimedia/xmms/files/patch-xmms-config.in b/multimedia/xmms/files/patch-xmms-config.in
deleted file mode 100644
index e3d39c0d048a..000000000000
--- a/multimedia/xmms/files/patch-xmms-config.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- xmms-config.in.orig	2013-03-08 13:50:50.000000000 +0100
-+++ xmms-config.in	2013-03-08 13:51:04.000000000 +0100
-@@ -153,9 +153,9 @@
- fi
- 
- if test "$lib_dir" != "/usr/lib"; then
--    libs="-L$lib_dir $gtk_libs -lxmms"
-+    libs="-L$lib_dir $gtk_libs -lxmms -lgettextlib"
- else
--    libs="$gtk_libs -lxmms"
-+    libs="$gtk_libs -lxmms -lgettextlib"
- fi
- 
- if test "$echo_cflags" = "yes"; then
diff --git a/multimedia/xmms/files/patch-xmms-i18n.h.in b/multimedia/xmms/files/patch-xmms-i18n.h.in
new file mode 100644
index 000000000000..6c152f7bee3a
--- /dev/null
+++ b/multimedia/xmms/files/patch-xmms-i18n.h.in
@@ -0,0 +1,12 @@
+--- xmms/i18n.h.in.orig
++++ xmms/i18n.h.in
+@@ -1,7 +1,8 @@
+ #undef ENABLE_NLS
+ 
++#include <locale.h>
++
+ #ifdef ENABLE_NLS
+-#  include <locale.h>
+ #    include <libintl.h>
+ #    define _(String) gettext (String)
+ #    ifdef gettext_noop
diff --git a/multimedia/xmms/files/pkg-message.in b/multimedia/xmms/files/pkg-message.in
deleted file mode 100644
index a11e67bb1a67..000000000000
--- a/multimedia/xmms/files/pkg-message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-Xmms supports Gzipped and uncompressed skins.  If you would like to use
-Zip format skins you will need to ensure archivers/unzip is installed.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/multimedia/xmms/files/xmms.desktop.in b/multimedia/xmms/files/xmms.desktop
index 24de67f531a9..24de67f531a9 100644
--- a/multimedia/xmms/files/xmms.desktop.in
+++ b/multimedia/xmms/files/xmms.desktop