diff options
Diffstat (limited to 'audio/csound5/patches')
-rw-r--r-- | audio/csound5/patches/patch-ac | 247 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ad | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ae | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-af | 31 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ag | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ah | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ai | 22 | ||||
-rw-r--r-- | audio/csound5/patches/patch-aj | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ak | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-al | 22 | ||||
-rw-r--r-- | audio/csound5/patches/patch-am | 52 | ||||
-rw-r--r-- | audio/csound5/patches/patch-an | 40 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ao | 13 | ||||
-rw-r--r-- | audio/csound5/patches/patch-ap | 14 |
14 files changed, 0 insertions, 519 deletions
diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac deleted file mode 100644 index 618e7defafe..00000000000 --- a/audio/csound5/patches/patch-ac +++ /dev/null @@ -1,247 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/01/02 12:53:55 rillig Exp $ - ---- SConstruct.orig 2006-03-15 16:22:43.000000000 +0100 -+++ SConstruct 2007-01-02 13:32:42.000000000 +0100 -@@ -50,6 +50,10 @@ def today(): - def getPlatform(): - if sys.platform[:5] == 'linux': - return 'linux' -+ elif sys.platform[:6] == 'netbsd': -+ return 'netbsd' -+ elif sys.platform[:9] == 'dragonfly': -+ return 'dragonfly' - elif sys.platform[:3] == 'win': - return 'mingw' - elif sys.platform[:6] == 'darwin': -@@ -335,6 +339,15 @@ elif getPlatform() == 'mingw': - pythonLinkFlags = [] - pythonLibraryPath = [] - pythonLibs = ['python%s' % commonEnvironment['pythonVersion'].replace('.', '')] -+elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': -+ commonEnvironment.Append(CCFLAGS = Split(os.environ['CFLAGS'])) -+ commonEnvironment.Append(CXXFLAGS = Split(os.environ['CXXFLAGS'])) -+ commonEnvironment.Append(LINKFLAGS = Split(os.environ['LDFLAGS'])) -+ pythonIncludePath = [] -+ pythonLinkFlags = [] -+ pythonLibraryPath = [] -+ pythonLibs = [] -+ SConsignFile("unused-consign-file") - - # Check for prerequisites. - # We check only for headers; checking for libs may fail -@@ -485,7 +498,7 @@ def buildzip(env, target, source): - # library version is CS_VERSION.CS_APIVERSION - csoundLibraryVersion = '5.1' - csoundLibraryName = 'csound' --if getPlatform() == 'linux' and commonEnvironment['useDouble'] != '0': -+if (getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly') and commonEnvironment['useDouble'] != '0': - csoundLibraryName += '64' - # flags for linking with the Csound library - libCsoundLinkFlags = [] -@@ -526,6 +539,12 @@ if commonEnvironment['buildRelease'] != - tmp += '64' - s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp - csoundLibraryEnvironment.Append(CPPFLAGS = [s]) -+ if getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': -+ tmp = '%s/lib/csound5/plugins' % commonEnvironment['prefix'] -+ if commonEnvironment['useDouble'] != '0': -+ tmp += '64' -+ s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp -+ csoundLibraryEnvironment.Append(CPPFLAGS = [s]) - csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Copy() - csoundDynamicLibraryEnvironment.Append(LIBS = ['sndfile']) - if getPlatform() == 'mingw': -@@ -550,6 +569,11 @@ if getPlatform() == 'mingw': - csoundDynamicLibraryEnvironment['ENV']['PATH'] = os.environ['PATH'] - elif getPlatform() == 'linux': - csoundDynamicLibraryEnvironment.Append(LIBS = ['dl', 'm', 'pthread']) -+elif getPlatform() == 'netbsd': -+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m', 'pthread']) -+elif getPlatform() == 'dragonfly': -+ csoundDynamicLibraryEnvironment.Append(LINKFLAGS = ['-pthread']) -+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m']) - csoundInterfacesEnvironment = csoundDynamicLibraryEnvironment.Copy() - - if buildOSXFramework: -@@ -776,9 +800,17 @@ else: - csoundProgramEnvironment.Append(LIBS = ['dl']) - vstEnvironment.Append(LIBS = ['dl']) - guiProgramEnvironment.Append(LIBS = ['dl']) -- csoundProgramEnvironment.Append(LIBS = ['pthread', 'm']) -- vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) -- guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) -+ if getPlatform() == 'dragonfly': -+ csoundProgramEnvironment.Append(LIBS = ['m']) -+ csoundProgramEnvironment.Append(LINKFLAGS = ['-pthread']) -+ vstEnvironment.Append(LIBS = ['stdc++', 'm']) -+ vstEnvironment.Append(LINKFLAGS = ['-pthread']) -+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'm']) -+ guiProgramEnvironment.Append(LINKFLAGS = ['-pthread']) -+ else: -+ csoundProgramEnvironment.Append(LIBS = ['pthread', 'm']) -+ vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) -+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) - if getPlatform() == 'darwin': - csoundProgramEnvironment.Append(LINKFLAGS = Split(''' - -framework Carbon -framework CoreAudio -framework CoreMidi -@@ -989,7 +1021,7 @@ makePlugin(pluginEnvironment, 'stdopcod' - pluginLibraries.append('opcodes.dir') - MacOSX_InstallPlugin('opcodes.dir') - --if getPlatform() == 'linux' or getPlatform() == 'darwin': -+if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform == 'netbsd' or getPlatform == 'dragonfly': - makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c']) - makePlugin(pluginEnvironment, 'ftest', ['Opcodes/ftest.c']) - makePlugin(pluginEnvironment, 'mixer', ['Opcodes/mixer.cpp']) -@@ -1042,6 +1074,13 @@ else: - -framework Carbon -framework CoreAudio -framework CoreMidi - -framework ApplicationServices - ''')) -+ elif getPlatform() == 'netbsd': -+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags') -+ widgetsEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm']) -+ elif getPlatform() == 'dragonfly': -+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags') -+ widgetsEnvironment.Append(LIBS = ['stdc++', 'm']) -+ widgetsEnvironment.Append(LINKFLAGS = ['-pthread']) - makePlugin(widgetsEnvironment, 'widgets', - ['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp']) - -@@ -1060,7 +1099,11 @@ if not (commonEnvironment['useALSA'] == - else: - print "CONFIGURATION DECISION: Building ALSA plugin." - alsaEnvironment = pluginEnvironment.Copy() -- alsaEnvironment.Append(LIBS = ['asound', 'pthread']) -+ if getPlatform() == 'dragonfly': -+ alsaEnvironment.Append(LIBS = ['asound']) -+ alsaEnvironment.Append(LINKFLAGS = ['-pthread']) -+ else: -+ alsaEnvironment.Append(LIBS = ['asound', 'pthread']) - makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c']) - - if getPlatform() == 'mingw': -@@ -1082,6 +1125,8 @@ else: - elif getPlatform() == 'mingw': - portaudioEnvironment.Append(LIBS = ['winmm', 'dsound']) - portaudioEnvironment.Append(LIBS = csoundWindowsLibraries) -+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': -+ portaudioEnvironment.ParseConfig('pkg-config --cflags --libs portaudio-2.0') - makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c']) - - if not (commonEnvironment['useJack'] == '1' and jackFound): -@@ -1091,6 +1136,9 @@ else: - jackEnvironment = pluginEnvironment.Copy() - if getPlatform() == 'linux': - jackEnvironment.Append(LIBS = ['jack', 'asound', 'pthread']) -+ elif getPlatform() == 'dragonfly': -+ jackEnvironment.Append(LIBS = ['jack']) -+ jackEnvironment.Append(LINKFLAGS = ['-pthread']) - else: - jackEnvironment.Append(LIBS = ['jack', 'pthread']) - makePlugin(jackEnvironment, 'rtjack', ['InOut/rtjack.c']) -@@ -1100,7 +1148,11 @@ if not (commonEnvironment['useOSC'] == ' - else: - print "CONFIGURATION DECISION: Building OSC plugin." - oscEnvironment = pluginEnvironment.Copy() -- oscEnvironment.Append(LIBS = ['lo', 'pthread']) -+ if getPlatform() == 'dragonfly': -+ oscEnvironment.Append(LIBS = ['lo']) -+ oscEnvironment.Append(LINKFLAGS = ['-pthread']) -+ else: -+ oscEnvironment.Append(LIBS = ['lo', 'pthread']) - if getPlatform() == 'mingw': - oscEnvironment.Append(LIBS = csoundWindowsLibraries) - oscEnvironment.Append(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup']) -@@ -1118,8 +1170,10 @@ else: - fluidEnvironment.Append(CPPFLAGS = ['-DFLUIDSYNTH_NOT_A_DLL']) - fluidEnvironment.Append(LIBS = ['winmm', 'dsound']) - fluidEnvironment.Append(LIBS = csoundWindowsLibraries) -- elif getPlatform() == 'linux' or getPlatform() == 'darwin': -+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd': - fluidEnvironment.Append(LIBS = ['pthread']) -+ elif getPlatform() == 'dragonfly': -+ fluidEnvironment.Append(LINKFLAGS = ['-pthread']) - makePlugin(fluidEnvironment, 'fluidOpcodes', - ['Opcodes/fluidOpcodes/fluidOpcodes.c']) - -@@ -1237,6 +1291,13 @@ else: - guiProgramEnvironment.Prepend(LINKFLAGS = ['-mwindows']) - vstEnvironment.Append(LIBS = ['fltk_images', 'fltk']) - guiProgramEnvironment.Append(LINKFLAGS = '-mwindows') -+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': -+ vstEnvironment.Append(LIBS = ['m']) -+ vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols') -+ vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.']) -+ guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.']) -+ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so']) -+ os.symlink('lib_CsoundVST.so', '_CsoundVST.so') - guiProgramEnvironment.Prepend(LIBS = ['_CsoundVST']) - for option in vstEnvironment['CCFLAGS']: - if string.find(option, '-D') == 0: -@@ -1420,8 +1481,10 @@ else: - stkEnvironment.Append(LIBS = ['stdc++']) - if getPlatform() == 'mingw': - stkEnvironment.Append(LIBS = csoundWindowsLibraries) -- elif getPlatform() == 'linux' or getPlatform() == 'darwin': -+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd': - stkEnvironment.Append(LIBS = ['pthread']) -+ elif getPlatform() == 'dragonfly': -+ stkEnvironment.Append(LINKFLAGS = ['-pthread']) - # This is the one that actually defines the opcodes. - # They are straight wrappers, as simple as possible. - stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp']) -@@ -1443,6 +1506,8 @@ else: - elif getPlatform() == 'mingw': - pyEnvironment['ENV']['PATH'] = os.environ['PATH'] - pyEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols') -+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': -+ pyEnvironment.Append(LIBS = ['m']) - pythonOpcodes = makePlugin(pyEnvironment, 'py', - ['Opcodes/py/pythonopcodes.c']) - if getPlatform() == 'mingw' and pythonLibs[0] < 'python24': -@@ -1461,7 +1526,7 @@ if commonEnvironment['buildPDClass']=='1 - pdClass = pdClassEnvironment.Program( - 'csoundapi~.pd_darwin', - 'frontends/csoundapi_tilde/csoundapi_tilde.c') -- elif getPlatform() == 'linux': -+ elif getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly': - pdClass = pdClassEnvironment.SharedLibrary( - 'csoundapi~.pd_linux', - 'frontends/csoundapi_tilde/csoundapi_tilde.c', -@@ -1493,6 +1558,11 @@ if commonEnvironment['buildTclcsound'] = - ''')) - elif getPlatform() == 'linux': - csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'dl', 'pthread']) -+ elif getPlatform() == 'netbsd': -+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'pthread']) -+ elif getPlatform() == 'dragonfly': -+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4']) -+ csTclEnvironment.Append(LINKFLAGS = ['-pthread']) - elif getPlatform() == 'mingw': - csTclEnvironment.Append(LIBS = ['tcl84', 'tk84']) - csTclEnvironment.Append(LIBS = csoundWindowsLibraries) -@@ -1591,18 +1661,18 @@ else: - - PREFIX = commonEnvironment['prefix'] - --BIN_DIR = PREFIX + "/bin" --INCLUDE_DIR = PREFIX + "/include/csound" -+BIN_DIR = PREFIX + "/lib/csound5" -+INCLUDE_DIR = PREFIX + "/include/csound5" - - if (commonEnvironment['Word64'] == '1'): -- LIB_DIR = PREFIX + "/lib64" -+ LIB_DIR = PREFIX + "/lib64/csound5" - else: -- LIB_DIR = PREFIX + "/lib" -+ LIB_DIR = PREFIX + "/lib/csound5" - - if commonEnvironment['useDouble'] == '0': -- PLUGIN_DIR = LIB_DIR + "/csound/plugins" -+ PLUGIN_DIR = LIB_DIR + "/plugins" - else: -- PLUGIN_DIR = LIB_DIR + "/csound/plugins64" -+ PLUGIN_DIR = LIB_DIR + "/plugins" - - if commonEnvironment['install'] == '1': - installExecutables = Alias('install-executables', diff --git a/audio/csound5/patches/patch-ad b/audio/csound5/patches/patch-ad deleted file mode 100644 index 2544cd2be3a..00000000000 --- a/audio/csound5/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Top/csound.c.orig 2006-03-10 08:37:48.000000000 -0800 -+++ Top/csound.c -@@ -613,7 +613,7 @@ static const CSOUND cenviron_ = { - csound_free_string_database(); - } - --#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) -+#if !defined(__NetBSD__) && !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) && !defined(__DragonFly__) - static char *signal_to_string(int sig) - { - switch(sig) { diff --git a/audio/csound5/patches/patch-ae b/audio/csound5/patches/patch-ae deleted file mode 100644 index 2e93eebab64..00000000000 --- a/audio/csound5/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Engine/linevent.c.orig 2005-12-06 14:58:54.000000000 -0800 -+++ Engine/linevent.c -@@ -30,7 +30,7 @@ - #include "linevent.h" - - #ifdef PIPES --# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) -+# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__) - # define _popen popen - # define _pclose pclose - # elif defined(__BEOS__) || defined(__MACH__) diff --git a/audio/csound5/patches/patch-af b/audio/csound5/patches/patch-af deleted file mode 100644 index e5c6cba76e7..00000000000 --- a/audio/csound5/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Engine/namedins.c.orig 2006-03-11 08:30:35.000000000 -0800 -+++ Engine/namedins.c -@@ -1342,7 +1342,7 @@ PUBLIC int csoundGetControlChannelParams - - int csoundCheckOpcodePluginFile(CSOUND *csound, const char *fname) - { --#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__)) -+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)) - char buf[512]; - size_t i; - #endif -@@ -1352,7 +1352,7 @@ int csoundCheckOpcodePluginFile(CSOUND * - - if (fname == NULL || fname[0] == (char) 0) - return 0; --#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__)) -+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)) - /* on some platforms, file names are case insensitive */ - i = (size_t) 0; - do { -@@ -1502,7 +1502,7 @@ int csoundLoadOpcodeDB(CSOUND *csound, c - } - opcodeCnt++; - } --#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__)) -+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)) - else { - size_t j; - /* on some platforms, file names are case insensitive */ diff --git a/audio/csound5/patches/patch-ag b/audio/csound5/patches/patch-ag deleted file mode 100644 index da5c2e30e92..00000000000 --- a/audio/csound5/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- frontends/CsoundVST/System.cpp.orig 2005-12-22 09:06:21.000000000 -0800 -+++ frontends/CsoundVST/System.cpp -@@ -468,7 +468,7 @@ namespace csound - Beep(880, 1000); - } - --#elif defined(LINUX) || defined(MACOSX) -+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__) - - #include <dlfcn.h> - #include <dirent.h> diff --git a/audio/csound5/patches/patch-ah b/audio/csound5/patches/patch-ah deleted file mode 100644 index d1374132e59..00000000000 --- a/audio/csound5/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- frontends/CsoundVST/CsoundVSTMain.cpp.orig 2005-09-02 07:30:33.000000000 -0700 -+++ frontends/CsoundVST/CsoundVSTMain.cpp -@@ -36,7 +36,7 @@ bool oome = false; - #if defined(__GNUC__) && defined(WIN32) - #define main main_plugin - extern "C" __declspec(dllexport) AEffect *main_plugin (audioMasterCallback audioMaster) --#elif defined(LINUX) || defined(MACOSX) -+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__) - AEffect *main_plugin (audioMasterCallback audioMaster) - #else - AEffect *main(audioMasterCallback audioMaster) diff --git a/audio/csound5/patches/patch-ai b/audio/csound5/patches/patch-ai deleted file mode 100644 index fa5fa9ca19e..00000000000 --- a/audio/csound5/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- InOut/widgets.cpp.orig 2006-02-15 10:25:55.000000000 -0800 -+++ InOut/widgets.cpp -@@ -29,7 +29,7 @@ - # include <windows.h> - #endif /* defined(WIN32) */ - --#if defined(LINUX) -+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - # include <pthread.h> - # include <sched.h> - # include <sys/time.h> -@@ -1722,7 +1722,7 @@ static uintptr_t fltkRun(void *userdata) - - p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound, - "_widgets_globals"); --#ifdef LINUX -+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - { - struct sched_param sp; - // IV - Aug 27 2002: widget thread is always run with normal priority diff --git a/audio/csound5/patches/patch-aj b/audio/csound5/patches/patch-aj deleted file mode 100644 index 99bd6bdda8b..00000000000 --- a/audio/csound5/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- InOut/libsnd.c.orig 2006-02-13 09:05:46.000000000 -0800 -+++ InOut/libsnd.c -@@ -47,7 +47,7 @@ typedef struct { - - #ifdef PIPES - # if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || \ -- defined(__MACH__) -+ defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__) - # define _popen popen - # define _pclose pclose - # endif diff --git a/audio/csound5/patches/patch-ak b/audio/csound5/patches/patch-ak deleted file mode 100644 index 266217cbc9c..00000000000 --- a/audio/csound5/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- InOut/winEPS.c.orig 2005-12-29 05:49:04.000000000 -0800 -+++ InOut/winEPS.c -@@ -146,7 +146,7 @@ void PS_MakeGraph(CSOUND *csound, WINDAT - * Get the current time and date - */ - lt = time(NULL); --#ifndef LINUX -+#if !defined(LINUX) && !defined(__NetBSD__) && !defined(__DragonFly__) - { - struct tm *date_ptr; - char *date; diff --git a/audio/csound5/patches/patch-al b/audio/csound5/patches/patch-al deleted file mode 100644 index 672aabf7ac8..00000000000 --- a/audio/csound5/patches/patch-al +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-al,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- InOut/winFLTK.c.orig 2005-12-30 07:21:18.000000000 -0800 -+++ InOut/winFLTK.c -@@ -29,7 +29,7 @@ - #include <stdio.h> - #include "cwindow.h" - --#ifdef LINUX -+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - #include <X11/Xlib.h> - #endif - -@@ -54,7 +54,7 @@ static void KillGraph_FLTK(CSOUND *csoun - - void set_display_callbacks(CSOUND *csound) - { --#ifdef LINUX -+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - Display *dpy = XOpenDisplay(NULL); - if (dpy == NULL) - return; diff --git a/audio/csound5/patches/patch-am b/audio/csound5/patches/patch-am deleted file mode 100644 index abc3fdf3966..00000000000 --- a/audio/csound5/patches/patch-am +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-am,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Top/csmodule.c.orig 2006-03-08 15:13:15.000000000 -0800 -+++ Top/csmodule.c -@@ -78,7 +78,7 @@ - #include "csoundCore.h" - #include "csmodule.h" - --#if defined(LINUX) -+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - #include <dlfcn.h> - #elif defined(WIN32) - #include <windows.h> -@@ -121,7 +121,7 @@ static const char *plugindir_envva - static const char *plugindir64_envvar = "OPCODEDIR64"; - - /* default directory to load plugins from if environment variable is not set */ --#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__))) -+#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))) - # define ENABLE_OPCODEDIR_WARNINGS 1 - # ifdef CS_DEFAULT_PLUGINDIR - # undef CS_DEFAULT_PLUGINDIR -@@ -131,9 +131,9 @@ static const char *plugindir64_env - # define ENABLE_OPCODEDIR_WARNINGS 0 - # ifndef CS_DEFAULT_PLUGINDIR - # ifndef USE_DOUBLE --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" -+# define CS_DEFAULT_PLUGINDIR __PKGSRC_PREFIX__ "lib/csound5/plugins" - # else --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" -+# define CS_DEFAULT_PLUGINDIR __PKGSRC_PREFIX__ "lib/csound5/plugins64" - # endif - # endif - #endif -@@ -225,7 +225,7 @@ static CS_NOINLINE int csoundLoadExterna - /* load library */ - err = csound->OpenLibrary(&h, libraryPath); - if (err) { --#if defined(BETA) && defined(LINUX) -+#if defined(BETA) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)) - csound->Warning(csound, "%s", dlerror()); - #endif - csound->Warning(csound, Str("could not open library '%s' (%d)"), -@@ -591,7 +591,7 @@ PUBLIC void *csoundGetLibrarySymbol(void - return (void*) GetProcAddress((HMODULE) library, procedureName); - } - --#elif defined(LINUX) -+#elif defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__) - - PUBLIC int csoundOpenLibrary(void **library, const char *libraryPath) - { diff --git a/audio/csound5/patches/patch-an b/audio/csound5/patches/patch-an deleted file mode 100644 index 3c9a5dfd78d..00000000000 --- a/audio/csound5/patches/patch-an +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-an,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Top/one_file.c.orig 2006-01-11 03:47:55.000000000 -0800 -+++ Top/one_file.c -@@ -24,7 +24,7 @@ - #include "csoundCore.h" - #include <ctype.h> - #include <errno.h> --#if defined(LINUX) || defined(__MACH__) || defined(WIN32) -+#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__) - # include <sys/types.h> - # include <sys/stat.h> - #endif -@@ -66,7 +66,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU - buf = csound->Malloc(csound, nBytes); - } - { --#if defined(LINUX) || defined(__MACH__) -+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__) - struct stat tmp; - do { - #elif defined(WIN32) -@@ -89,7 +89,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU - } - #endif - if (ext != NULL && ext[0] != (char) 0) { --#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32) -+#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) - char *p; - /* remove original extension (does not work on OS X */ - /* and may be a bad idea) */ -@@ -109,7 +109,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU - } while (buf[i] != (char) 0); - } - #endif --#if defined(LINUX) || defined(__MACH__) -+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__) - /* if the file already exists, try again */ - } while (stat(buf, &tmp) == 0); - #elif defined(WIN32) diff --git a/audio/csound5/patches/patch-ao b/audio/csound5/patches/patch-ao deleted file mode 100644 index d7202647818..00000000000 --- a/audio/csound5/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2006/05/29 19:44:24 joerg Exp $ - ---- Top/threads.c.orig 2005-12-26 09:27:07.000000000 -0800 -+++ Top/threads.c -@@ -109,7 +109,7 @@ PUBLIC void csoundSleep(size_t milliseco - Sleep((DWORD) milliseconds); - } - --#elif defined(LINUX) || defined(__MACH__) -+#elif defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__) - - #include <pthread.h> - #include <time.h> diff --git a/audio/csound5/patches/patch-ap b/audio/csound5/patches/patch-ap deleted file mode 100644 index a5c6ab7e8f3..00000000000 --- a/audio/csound5/patches/patch-ap +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2006/10/17 21:32:37 rillig Exp $ - ---- cleanup.sh.orig 2005-12-20 20:50:46.000000000 +0100 -+++ cleanup.sh 2006-10-17 23:28:47.000000000 +0200 -@@ -1,7 +1,7 @@ - #!/bin/sh - --if [ "$#" == "2" ] ; then -- if [ "$1" == "remove" ] ; then -+if [ "$#" = "2" ] ; then -+ if [ "$1" = "remove" ] ; then - if ( test -e "$2" ) ; then - echo -e "Removing '$2'" - rm -Rf "$2" ; |