diff options
| author | Robby Workman <rworkman@slackware.com> | 2010-03-21 14:22:54 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-05-13 14:19:23 +0200 |
| commit | d095ce087ce1d923676a1faa366e41610dc1617c (patch) | |
| tree | 5af7ca5c353a00174ca39063e2bb951f0957b56f /audio/xmms2/0.6_fix_libdir.diff | |
| parent | 67df1ff63664c4250e7cad51ed658e70c4a21e83 (diff) | |
| download | slackbuilds-d095ce087ce1d923676a1faa366e41610dc1617c.tar.gz | |
audio/xmms2: Remove extraneous patches.
Diffstat (limited to 'audio/xmms2/0.6_fix_libdir.diff')
| -rw-r--r-- | audio/xmms2/0.6_fix_libdir.diff | 55 |
1 files changed, 0 insertions, 55 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"], - } - |