diff options
author | alexbl <alexbl@FreeBSD.org> | 2008-07-11 00:41:44 +0800 |
---|---|---|
committer | alexbl <alexbl@FreeBSD.org> | 2008-07-11 00:41:44 +0800 |
commit | 6003269980f85becb159301fc0bb8fc5c651a32a (patch) | |
tree | 32a12390fcd88c3aff29efb11d27e27682273dc6 /audio/xmms2 | |
parent | 5be00c9a5746cf88449b34356b24b97ffc54af13 (diff) | |
download | freebsd-ports-gnome-6003269980f85becb159301fc0bb8fc5c651a32a.tar.gz freebsd-ports-gnome-6003269980f85becb159301fc0bb8fc5c651a32a.tar.zst freebsd-ports-gnome-6003269980f85becb159301fc0bb8fc5c651a32a.zip |
- remove the no longer needed patch files that cause binding builds to fail
Diffstat (limited to 'audio/xmms2')
-rw-r--r-- | audio/xmms2/Makefile | 3 | ||||
-rw-r--r-- | audio/xmms2/files/slaveport-src-clients-lib-wscripts | 90 | ||||
-rw-r--r-- | audio/xmms2/files/slaveport-src_include_wscript | 11 | ||||
-rw-r--r-- | audio/xmms2/files/slaveport-wscript | 29 |
4 files changed, 0 insertions, 133 deletions
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index a4901b550fb7..833a2f28ba47 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -68,9 +68,6 @@ OPTIONS= FAAD "Support to playback AAC files" on \ .if defined(XMMS2_SLAVE) EXCLUDE+= --without-xmms2d=1 -EXTRA_PATCHES= ${PATCHDIR}/slaveport-wscript\ - ${PATCHDIR}/slaveport-src_include_wscript\ - ${PATCHDIR}/slaveport-src-clients-lib-wscripts .endif .if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python" diff --git a/audio/xmms2/files/slaveport-src-clients-lib-wscripts b/audio/xmms2/files/slaveport-src-clients-lib-wscripts deleted file mode 100644 index c2a0e5229bf5..000000000000 --- a/audio/xmms2/files/slaveport-src-clients-lib-wscripts +++ /dev/null @@ -1,90 +0,0 @@ ---- 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-src_include_wscript b/audio/xmms2/files/slaveport-src_include_wscript deleted file mode 100644 index f26fc665ff3f..000000000000 --- a/audio/xmms2/files/slaveport-src_include_wscript +++ /dev/null @@ -1,11 +0,0 @@ ---- src/include/wscript.orig Fri May 25 16:27:44 2007 -+++ src/include/wscript Fri May 25 16:27:51 2007 -@@ -5,8 +5,6 @@ - paths = ['xmms', 'xmmsc', 'xmmsclient', 'xmmsclient/xmmsclient++'] - for p in paths: - bld.add_subdirs(p) -- f = [os.path.join(p, a) for a in os.listdir(os.path.join('src','include',p)) if a.endswith('.h')] -- Common.install_files('PREFIX', os.path.join('include', 'xmms2', p), " ".join(f)) - - def configure(conf): - conf.sub_config("xmms") diff --git a/audio/xmms2/files/slaveport-wscript b/audio/xmms2/files/slaveport-wscript deleted file mode 100644 index 9f3e33e8ed6c..000000000000 --- a/audio/xmms2/files/slaveport-wscript +++ /dev/null @@ -1,29 +0,0 @@ ---- wscript.orig Fri May 25 16:27:23 2007 -+++ wscript Fri May 25 16:27:28 2007 -@@ -41,8 +41,6 @@ - src/lib/xmmssocket - src/lib/xmmsipc - src/lib/xmmsutils -- src/clients/lib/xmmsclient -- src/clients/lib/xmmsclient-glib - 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. |