3 files changed, 108 insertions, 102 deletions

diff --git a/audio/xmms2/files/patch-src_clients_lib_python_xmmsapi.pyx b/audio/xmms2/files/patch-src_clients_lib_python_xmmsapi.pyx
index 7e243d1abecf..e69de29bb2d1 100644
--- a/audio/xmms2/files/patch-src_clients_lib_python_xmmsapi.pyx
+++ b/audio/xmms2/files/patch-src_clients_lib_python_xmmsapi.pyx
@@ -1,102 +0,0 @@
---- src/clients/lib/python/xmmsapi.pyx.orig	Sun May 20 08:55:40 2007
-+++ src/clients/lib/python/xmmsapi.pyx	Wed Nov 14 15:16:18 2007
-@@ -14,7 +14,7 @@
- 	void Py_DECREF(object)
- 
- cdef extern from "string.h":
--	int strcmp(signed char *s1, signed char *s2)
-+	int strcmp(char *s1, char *s2)
- 	char *strdup(char *str)
- 
- cdef extern from "xmmsc/xmmsc_idnumbers.h":
-@@ -129,17 +129,17 @@
- 	void xmmsc_result_unref(xmmsc_result_t *res)
- 	void xmmsc_result_notifier_set_full(xmmsc_result_t *res, xmmsc_result_notifier_t func, void *user_data, xmmsc_user_data_free_func_t free_func)
- 	void xmmsc_result_wait(xmmsc_result_t *res)
--	signed int xmmsc_result_iserror(xmmsc_result_t *res)
--	signed char *xmmsc_result_get_error(xmmsc_result_t *res)
-+	int xmmsc_result_iserror(xmmsc_result_t *res)
-+	char *xmmsc_result_get_error(xmmsc_result_t *res)
- 	xmmsc_result_value_type_t xmmsc_result_get_type(xmmsc_result_t *res)
- 	xmmsc_result_type_t xmmsc_result_get_class(xmmsc_result_t *res)
- 
--	signed int xmmsc_result_get_int(xmmsc_result_t *res, int *r)
--	signed int xmmsc_result_get_uint(xmmsc_result_t *res, unsigned int *r)
--	signed int xmmsc_result_get_string(xmmsc_result_t *res, signed char **r)
--	signed int xmmsc_result_get_bin(xmmsc_result_t *res, unsigned char **r, unsigned int *rlen)
--	signed int xmmsc_result_get_playlist_change(xmmsc_result_t *res, unsigned int *change, unsigned int *id, unsigned int *argument)
--	signed int xmmsc_result_get_collection (xmmsc_result_t *conn, xmmsc_coll_t **coll)
-+	int xmmsc_result_get_int(xmmsc_result_t *res, int *r)
-+	int xmmsc_result_get_uint(xmmsc_result_t *res, unsigned int *r)
-+	int xmmsc_result_get_string(xmmsc_result_t *res, char **r)
-+	int xmmsc_result_get_bin(xmmsc_result_t *res, unsigned char **r, unsigned int *rlen)
-+	int xmmsc_result_get_playlist_change(xmmsc_result_t *res, unsigned int *change, unsigned int *id, unsigned int *argument)
-+	int xmmsc_result_get_collection (xmmsc_result_t *conn, xmmsc_coll_t **coll)
- 
- 	ctypedef void(*xmmsc_dict_foreach_func)(void *key, xmmsc_result_value_type_t type, void *value, void *user_data)
- 	ctypedef void(*xmmsc_propdict_foreach_func)(void *key, xmmsc_result_value_type_t type, void *value, char *source, void *user_data)
-@@ -155,7 +155,7 @@
- 
- 	xmmsc_connection_t *xmmsc_init(char *clientname)
- 	void xmmsc_disconnect_callback_set(xmmsc_connection_t *c, object(*callback)(object), object userdata)
--	signed int xmmsc_connect(xmmsc_connection_t *c, signed char *p)
-+	int xmmsc_connect(xmmsc_connection_t *c, char *p)
- 	void xmmsc_unref(xmmsc_connection_t *c)
- 	xmmsc_result_t *xmmsc_quit(xmmsc_connection_t *conn)
- 	xmmsc_result_t *xmmsc_plugin_list (xmmsc_connection_t *c, unsigned int type)
-@@ -175,8 +175,8 @@
- 	xmmsc_result_t *xmmsc_playlist_list_entries(xmmsc_connection_t *, char *playlist)
- 	xmmsc_result_t *xmmsc_playlist_sort(xmmsc_connection_t *, char *playlist, char **properties)
- 	xmmsc_result_t *xmmsc_playlist_set_next(xmmsc_connection_t *, int pos)
--	xmmsc_result_t *xmmsc_playlist_set_next_rel(xmmsc_connection_t *, signed int)
--	xmmsc_result_t *xmmsc_playlist_move_entry(xmmsc_connection_t *, char *playlist, unsigned int id, signed int movement)
-+	xmmsc_result_t *xmmsc_playlist_set_next_rel(xmmsc_connection_t *, int)
-+	xmmsc_result_t *xmmsc_playlist_move_entry(xmmsc_connection_t *, char *playlist, unsigned int id, int movement)
- 	xmmsc_result_t *xmmsc_playlist_current_pos(xmmsc_connection_t *, char *playlist)
- 	xmmsc_result_t *xmmsc_playlist_current_active(xmmsc_connection_t *)
- 	xmmsc_result_t *xmmsc_playlist_insert_args(xmmsc_connection_t *, char *playlist, int pos, char *url, int numargs, char **args)
-@@ -188,7 +188,7 @@
- 	xmmsc_result_t *xmmsc_playlist_radd_encoded(xmmsc_connection_t *c, char *, char *path)
- 
- 	xmmsc_result_t *xmmsc_playlist_load(xmmsc_connection_t *, char *playlist)
--	xmmsc_result_t *xmmsc_playlist_move(xmmsc_connection_t *c, unsigned int id, signed int movement)
-+	xmmsc_result_t *xmmsc_playlist_move(xmmsc_connection_t *c, unsigned int id, int movement)
- 	xmmsc_result_t *xmmsc_playlist_create(xmmsc_connection_t *c, char *playlist)
- 
- 	xmmsc_result_t *xmmsc_broadcast_playlist_changed(xmmsc_connection_t *c)
-@@ -357,7 +357,7 @@
- 			i = i + 1
- 		free(self.lst) 
- 
--cdef foreach_source_hash(signed char *key, xmmsc_result_value_type_t typ, void *value, char *source, udata):
-+cdef foreach_source_hash(char *key, xmmsc_result_value_type_t typ, void *value, char *source, udata):
- 	if typ == XMMSC_RESULT_VALUE_TYPE_STRING:
- 		v = to_unicode(<char *>value)
- 	elif typ == XMMSC_RESULT_VALUE_TYPE_UINT32:
-@@ -367,7 +367,7 @@
- 
- 	udata[(source,key)]=v
- 
--cdef foreach_hash(signed char *key, xmmsc_result_value_type_t typ, void *value, udata):
-+cdef foreach_hash(char *key, xmmsc_result_value_type_t typ, void *value, udata):
- 	if typ == XMMSC_RESULT_VALUE_TYPE_STRING:
- 		v = to_unicode(<char *>value)
- 	elif typ == XMMSC_RESULT_VALUE_TYPE_UINT32:
-@@ -874,7 +874,7 @@
- 		Get data from the result structure as an int.
- 		@rtype: int
- 		"""
--		cdef signed int ret
-+		cdef int ret
- 		self._check()
- 		if xmmsc_result_get_int(self.res, &ret):
- 			return ret
-@@ -898,7 +898,7 @@
- 		Get data from the result structure as a string.
- 		@rtype: string
- 		"""
--		cdef signed char *ret
-+		cdef char *ret
- 
- 		self._check()
- 		if xmmsc_result_get_string(self.res, &ret):
diff --git a/audio/xmms2/files/slaveport-src-clients-lib-wscripts b/audio/xmms2/files/slaveport-src-clients-lib-wscripts
new file mode 100644
index 000000000000..c2a0e5229bf5
--- /dev/null
+++ b/audio/xmms2/files/slaveport-src-clients-lib-wscripts
@@ -0,0 +1,90 @@
+--- src/clients/lib/perl/wscript.orig	2008-03-15 22:36:57.000000000 +0600
++++ src/clients/lib/perl/wscript	2008-03-15 22:37:56.000000000 +0600
+@@ -15,7 +15,7 @@
+                  XMMSClientResultPropDict.xs
+                  XMMSClientResultPropDictTie.xs
+                  """.split()
+-    obj.uselib_local = 'xmmsclient'
++    obj.uselib = 'xmmsclient'
+     obj.install_var = "INSTALLDIR_PERL_AUTO"
+ 
+     Common.install_files('INSTALLDIR_PERL_LIB', '', 'pm/XMMSClient.pm')
+--- src/clients/lib/python/wscript.orig	2008-03-15 22:37:03.000000000 +0600
++++ src/clients/lib/python/wscript	2008-03-15 22:38:01.000000000 +0600
+@@ -7,7 +7,7 @@
+     obj.target = 'xmmsapi'
+     obj.includes = '../../../include ../../../includepriv'
+     obj.source = ['xmmsapi.pyx']
+-    obj.uselib_local = 'xmmsclient'
++    obj.uselib = 'xmmsclient'
+     obj.install_var = "xmmsclient_PYTHONDIR"
+ 
+     Common.install_files('xmmsclient_PYTHONDIR', '', 'xmmsclient/__init__.py')
+--- src/clients/lib/ruby/wscript.orig	2007-11-16 00:25:07.000000000 +0600
++++ src/clients/lib/ruby/wscript	2008-03-15 23:01:28.000000000 +0600
+@@ -8,7 +8,7 @@
+     obj.target = 'xmmsclient_ext'
+     obj.includes = '../../../include ../../../includepriv'
+     obj.source = "rb_xmmsclient_main.c rb_xmmsclient.c rb_playlist.c rb_collection.c rb_result.c".split()
+-    obj.uselib_local = 'xmmsclient'
++    obj.uselib = 'xmmsclient'
+     obj.install_var = "ARCHDIR_ruby"
+ 
+     Common.install_files('LIBDIR_ruby', '.', 'xmmsclient.rb')
+@@ -20,8 +20,7 @@
+     obj.target = 'xmmsclient_glib'
+     obj.includes = '../../../include ../../../includepriv'
+     obj.source = ['rb_xmmsclient_glib.c']
+-    obj.uselib_local = 'xmmsclient-glib xmmsclient'
+-    obj.uselib = 'glib2'
++    obj.uselib = 'glib2 xmmsclient-glib xmmsclient'
+     obj.install_var = "ARCHDIR_ruby"
+     obj.env["shlib_PREFIX"] = ''
+ 
+@@ -31,8 +30,8 @@
+         obj.target = 'xmmsclient_ecore'
+         obj.includes = '../../../include ../../../includepriv'
+         obj.source = ['rb_xmmsclient_ecore.c']
+-        obj.uselib_local = 'xmmsclient-ecore xmmsclient'
+-        obj.uselib = 'ecore'
++        obj.uselib_local = 'xmmsclient-ecore'
++        obj.uselib = 'ecore xmmsclient'
+         obj.install_var = "ARCHDIR_ruby"
+         obj.env["shlib_PREFIX"] = ''
+ 
+--- src/clients/lib/xmmsclient++-glib/wscript.orig	2008-03-15 22:37:31.000000000 +0600
++++ src/clients/lib/xmmsclient++-glib/wscript	2008-03-15 22:38:15.000000000 +0600
+@@ -3,8 +3,7 @@
+     lib = bld.create_obj('cpp', 'shlib')
+     lib.target = 'xmmsclient++-glib'
+     lib.source = 'xmmsclient++-glib.cpp'
+-    lib.uselib = 'glib2'
+-    lib.uselib_local = 'xmmsclient xmmsclient-glib'
++    lib.uselib = 'glib2 xmmsclient xmmsclient-glib'
+     lib.includes = '../../../include ../../../includepriv'
+     lib.vnum = '1.0.0'
+     tool.add_install_flag(bld, lib)
+--- src/clients/lib/xmmsclient++/wscript.orig	2007-11-16 00:25:07.000000000 +0600
++++ src/clients/lib/xmmsclient++/wscript	2008-03-15 22:38:33.000000000 +0600
+@@ -22,8 +22,7 @@
+                   signal.cpp
+                   stats.cpp
+                   xform.cpp""".split()
+-    obj.uselib_local = 'xmmsclient'
+-    obj.uselib = 'boosth boostl socket'
++    obj.uselib = 'boosth boostl socket xmmsclient'
+     obj.vnum = '2.0.0'
+     tool.add_install_flag(bld, obj)
+ 
+--- src/clients/lib/xmmsclient-ecore/wscript.orig	2008-03-15 23:01:53.000000000 +0600
++++ src/clients/lib/xmmsclient-ecore/wscript	2008-03-15 23:02:02.000000000 +0600
+@@ -5,8 +5,7 @@
+     obj.target = 'xmmsclient-ecore'
+     obj.includes = '../../../include'
+     obj.source = 'xmmsclient-ecore.c'
+-    obj.uselib = 'ecore'
+-    obj.uselib_local = 'xmmsclient'
++    obj.uselib = 'ecore xmmsclient'
+     obj.vnum = '1.0.0'
+     tool.add_install_flag(bld, obj)
+ 
diff --git a/audio/xmms2/files/slaveport-wscript b/audio/xmms2/files/slaveport-wscript
index 38ee21ff7e29..9f3e33e8ed6c 100644
--- a/audio/xmms2/files/slaveport-wscript
+++ b/audio/xmms2/files/slaveport-wscript
@@ -9,3 +9,21 @@
            src/include
            src/includepriv
            """.split()
+@@ -92,8 +90,6 @@
+     o.version = VERSION
+     o.libs = bld.env_of_name('default')['XMMS_PKGCONF_FILES']
+ 
+-    Common.install_files('SHAREDDIR', '', 'mind.in.a.box-lament_snipplet.ogg')
+-
+ 
+ ####
+ ## Configuration
+@@ -313,6 +309,8 @@
+     # Default POSIX sockets
+     else:
+         conf.env['socket_impl'] = 'posix'
++    conf.env.append_unique('LIB_xmmsclient', 'xmmsclient')
++    conf.env.append_unique('LIB_xmmsclient-glib', 'xmmsclient-glib')
+ 
+     # Glib is required by everyone, so check for it here and let them
+     # assume its presence.