2 files changed, 0 insertions, 114 deletions
diff --git a/audio/xmms2/0.6_fix_libdir.diff b/audio/xmms2/0.6_fix_libdir.diff
deleted file mode 100644
index 283b8ea1ae..0000000000
--- a/audio/xmms2/0.6_fix_libdir.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -aur xmms2-0.6DrMattDestruction/src/include/xmms/wscript xmms2-0.6DrMattDestruction.e/src/include/xmms/wscript
---- xmms2-0.6DrMattDestruction/src/include/xmms/wscript	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction.e/src/include/xmms/wscript	2009-11-01 19:39:25.226520223 +0100
-@@ -15,8 +15,7 @@
- 
-     defs = {}
- 
--    defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
--                                     'lib', 'xmms2')
-+    defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2')
-     defs['BINDIR']    = conf.env['BINDIR']
-     defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
-                                      'share', 'xmms2')
-diff -aur xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py xmms2-0.6DrMattDestruction.e/wafadmin/Tools/ccroot.py
---- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction.e/wafadmin/Tools/ccroot.py	2009-11-01 19:27:40.099784900 +0100
-@@ -121,13 +121,13 @@
- @feature('cprogram', 'dprogram')
- @before('apply_core')
- def vars_target_cprogram(self):
--	self.default_install_path = '${PREFIX}/bin'
-+	self.default_install_path = '${BINDIR}'
- 	self.default_chmod = O755
- 
- @feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib')
- @before('apply_core')
- def vars_target_cstaticlib(self):
--	self.default_install_path = '${PREFIX}/lib'
-+	self.default_install_path = '${LIBDIR}'
- 	if sys.platform in ['win32', 'cygwin']:
- 		# on win32, libraries need the execute bit, else we
- 		# get 'permission denied' when using them (issue 283)
-diff -aur xmms2-0.6DrMattDestruction/waftools/tool.py xmms2-0.6DrMattDestruction.e/waftools/tool.py
---- xmms2-0.6DrMattDestruction/waftools/tool.py	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction.e/waftools/tool.py	2009-11-01 19:39:25.227770032 +0100
-@@ -6,5 +6,5 @@
- 
-     if env['explicit_install_name']:
-         libname = obj.env["shlib_PATTERN"] % obj.target
--        insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
-+        insname = os.path.join(obj.env["LIBDIR"], libname)
-         obj.env.append_unique("LINKFLAGS", '-install_name ' + insname)
-diff -aur xmms2-0.6DrMattDestruction/wscript xmms2-0.6DrMattDestruction.e/wscript
---- xmms2-0.6DrMattDestruction/wscript	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction.e/wscript	2009-11-01 19:39:44.857519630 +0100
-@@ -103,7 +103,7 @@
-                 'LIB': lib,
-              'PREFIX': bld.env['PREFIX'],
-              'BINDIR': os.path.join("${prefix}", "bin"),
--             'LIBDIR': os.path.join("${prefix}", "lib"),
-+             'LIBDIR': bld.env['LIBDIR'],
-          'INCLUDEDIR': os.path.join("${prefix}", "include", "xmms2"),
-             'VERSION': bld.env["VERSION"],
-         }
-
diff --git a/audio/xmms2/xmms2-ruby-1.9.patch b/audio/xmms2/xmms2-ruby-1.9.patch
deleted file mode 100644
index 6316ace61f..0000000000
--- a/audio/xmms2/xmms2-ruby-1.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c	2009-09-14 09:13:19.000000000 +0000
-@@ -241,10 +241,10 @@
- 	COLL_METHOD_HANDLER_HEADER
- 
- 	rb_ary = RARRAY (ids);
--	ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+	ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1));
- 
--	for (i = 0; i < rb_ary->len; i++)
--		ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+	for (i = 0; i < RARRAYLEN(rb_ary); i++)
-+		ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
- 	ary[i] = 0;
- 
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c	2009-09-14 09:14:51.000000000 +0000
-@@ -1421,10 +1421,10 @@
- 	if (!NIL_P (rb_check_array_type (value))) {
- 		struct RArray *ary = RARRAY (value);
- 
--		ret = malloc (sizeof (char *) * (ary->len + 1));
-+		ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1));
- 
--		for (i = 0; i < ary->len; i++)
--			ret[i] = StringValuePtr (ary->ptr[i]);
-+		for (i = 0; i < RARRAYLEN(ary); i++)
-+			ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
- 		ret[i] = NULL;
- 	} else {
-@@ -1451,10 +1451,10 @@
- 		struct RArray *ary = RARRAY (value);
- 		int i;
- 
--		for (i = 0; i < ary->len; i++) {
-+		for (i = 0; i < RARRAYLEN(ary); i++) {
- 			xmmsv_t *elem;
- 
--			elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+			elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i]));
- 			xmmsv_list_append (list, elem);
- 			xmmsv_unref (elem);
- 		}
-diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h	2009-09-14 09:00:11.000000000 +0000
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
-