5 files changed, 26 insertions, 47 deletions

diff --git a/audio/zynaddsubfx/files/patch-src__Misc__Config.cpp b/audio/zynaddsubfx/files/patch-src__Misc__Config.cpp
new file mode 100644
index 000000000000..ce2eed88b2f7
--- /dev/null
+++ b/audio/zynaddsubfx/files/patch-src__Misc__Config.cpp
@@ -0,0 +1,26 @@
+--- src/Misc/Config.cpp.orig
++++ src/Misc/Config.cpp
+@@ -84,10 +84,9 @@
+         //banks
+         cfg.bankRootDirList[0] = "~/banks";
+         cfg.bankRootDirList[1] = "./";
+-        cfg.bankRootDirList[2] = "/usr/share/zynaddsubfx/banks";
+-        cfg.bankRootDirList[3] = "/usr/local/share/zynaddsubfx/banks";
+-        cfg.bankRootDirList[4] = "../banks";
+-        cfg.bankRootDirList[5] = "banks";
++        cfg.bankRootDirList[2] = "%%DATADIR%%/banks";
++        cfg.bankRootDirList[3] = "../banks";
++        cfg.bankRootDirList[4] = "banks";
+     }
+ 
+     if(cfg.presetsDirList[0].empty()) {
+@@ -95,8 +94,7 @@
+         cfg.presetsDirList[0] = "./";
+         cfg.presetsDirList[1] = "../presets";
+         cfg.presetsDirList[2] = "presets";
+-        cfg.presetsDirList[3] = "/usr/share/zynaddsubfx/presets";
+-        cfg.presetsDirList[4] = "/usr/local/share/zynaddsubfx/presets";
++        cfg.presetsDirList[3] = "%%DATADIR%%/presets";
+     }
+     cfg.LinuxALSAaudioDev = "default";
+     cfg.nameTag = "";
diff --git a/audio/zynaddsubfx/files/patch-src_ui_BankUI.fl b/audio/zynaddsubfx/files/patch-src_ui_BankUI.fl
deleted file mode 100644
index 2ff645e46609..000000000000
--- a/audio/zynaddsubfx/files/patch-src_ui_BankUI.fl
+++ /dev/null
@@ -1,11 +0,0 @@
---- UI/BankUI.fl.orig	2011-10-25 22:20:12.000000000 +0200
-+++ UI/BankUI.fl	2011-10-25 22:21:27.000000000 +0200
-@@ -32,7 +32,7 @@
- 
- class BankProcess_ {} {
-   Function {process()} {open return_type {virtual void}
--  } {}
-+  } {code{;}}
-   decl {Bank *bank;} {public
-   }
- } 
diff --git a/audio/zynaddsubfx/files/patch-src_ui_OscilGenUI.fl b/audio/zynaddsubfx/files/patch-src_ui_OscilGenUI.fl
deleted file mode 100644
index aacff62783ac..000000000000
--- a/audio/zynaddsubfx/files/patch-src_ui_OscilGenUI.fl
+++ /dev/null
@@ -1,11 +0,0 @@
---- UI/OscilGenUI.fl.orig	2011-10-25 22:20:20.000000000 +0200
-+++ UI/OscilGenUI.fl	2011-10-25 22:21:59.000000000 +0200
-@@ -129,7 +129,7 @@
- 
- class PSlider {: {public Fl_Slider}
- } {
--  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
-+  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
-   Function {handle(int event)} {return_type int
-   } {
-     code {int X=x(),Y=y(),W=w(),H=h();
diff --git a/audio/zynaddsubfx/files/patch-src_ui_PartUI.fl b/audio/zynaddsubfx/files/patch-src_ui_PartUI.fl
deleted file mode 100644
index 58e1b723a650..000000000000
--- a/audio/zynaddsubfx/files/patch-src_ui_PartUI.fl
+++ /dev/null
@@ -1,11 +0,0 @@
---- UI/PartUI.fl.orig	2011-10-25 22:20:30.000000000 +0200
-+++ UI/PartUI.fl	2011-10-25 22:22:19.000000000 +0200
-@@ -85,7 +85,7 @@
- 
- class PartUI_ {} {
-   Function {showparameters(int kititem,int engine)} {return_type virtual
--  } {}
-+  } {code{;}}
- } 
- 
- class PartKitItem {: {public Fl_Group}
diff --git a/audio/zynaddsubfx/files/patch-src_ui_PresetsUI.fl b/audio/zynaddsubfx/files/patch-src_ui_PresetsUI.fl
deleted file mode 100644
index 70539fc0be93..000000000000
--- a/audio/zynaddsubfx/files/patch-src_ui_PresetsUI.fl
+++ /dev/null
@@ -1,14 +0,0 @@
---- UI/PresetsUI.fl.orig	2010-06-27 20:26:52.000000000 +0200
-+++ UI/PresetsUI.fl	2011-10-25 22:33:16.000000000 +0200
-@@ -18,9 +18,9 @@
- 
- class PresetsUI_ {} {
-   Function {refresh()} {open return_type {virtual void}
--  } {}
-+  } {code{;}}
-   Function {~PresetsUI_()} {open return_type virtual
--  } {}
-+  } {code{;}}
- } 
- 
- class PresetsUI {} {