summaryrefslogtreecommitdiff
path: root/audio/csound5
diff options
context:
space:
mode:
authorjoerg <joerg>2006-05-29 19:44:24 +0000
committerjoerg <joerg>2006-05-29 19:44:24 +0000
commit9a6200f241c49be0586e32b7834239791333ab5f (patch)
tree2241d3d1b8c5f408f4f8380b30819f23de1e9df9 /audio/csound5
parentbefbae1a65258b6547f76396f306a80acf001f47 (diff)
downloadpkgsrc-9a6200f241c49be0586e32b7834239791333ab5f.tar.gz
Add DragonFly support.
XXX The SCons usage sucks.
Diffstat (limited to 'audio/csound5')
-rw-r--r--audio/csound5/distinfo28
-rw-r--r--audio/csound5/patches/patch-ac125
-rw-r--r--audio/csound5/patches/patch-ad4
-rw-r--r--audio/csound5/patches/patch-ae4
-rw-r--r--audio/csound5/patches/patch-af8
-rw-r--r--audio/csound5/patches/patch-ag4
-rw-r--r--audio/csound5/patches/patch-ah4
-rw-r--r--audio/csound5/patches/patch-ai6
-rw-r--r--audio/csound5/patches/patch-aj4
-rw-r--r--audio/csound5/patches/patch-ak4
-rw-r--r--audio/csound5/patches/patch-al6
-rw-r--r--audio/csound5/patches/patch-am10
-rw-r--r--audio/csound5/patches/patch-an10
-rw-r--r--audio/csound5/patches/patch-ao4
14 files changed, 148 insertions, 73 deletions
diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo
index 3ff8f2a1617..df9c1d43353 100644
--- a/audio/csound5/distinfo
+++ b/audio/csound5/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$NetBSD: distinfo,v 1.2 2006/05/29 19:44:24 joerg Exp $
SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
Size (Csound5.01_src.tar.gz) = 2031426 bytes
-SHA1 (patch-ac) = 12c410532ece80a9f226ffcb4c986eaaa84e2006
-SHA1 (patch-ad) = 756308bc40378738794469fca72c3e249b314150
-SHA1 (patch-ae) = 8878e9927811b4c46deb473724a4e19631e326e9
-SHA1 (patch-af) = 7d885796ee6794ff88fb4b22aee7fe8b3084864c
-SHA1 (patch-ag) = 76a7283a2da202a866ef416f4cac4d581dca39ec
-SHA1 (patch-ah) = 9ecda7d9a8b4ff41dd84ce826a0d0ede0c09b15d
-SHA1 (patch-ai) = 10571cb1d5e579d36f7c60e0651cfde71fc5498e
-SHA1 (patch-aj) = e2661124db32cf3831c23f128e6d8edc628cafbc
-SHA1 (patch-ak) = 5837eb03a8950ea0d6fc6718f99070bdda015a86
-SHA1 (patch-al) = accb874d07de58b075e909efb7578d3f59372b6b
-SHA1 (patch-am) = 3e981f6e15fea1d94f4d87276b4c7840ed381ee7
-SHA1 (patch-an) = 5131a8e880bdb1cd4996c75e9579b591e2925c97
-SHA1 (patch-ao) = 22c845f281e1cacdda7c2334100c7ca54771cdc3
+SHA1 (patch-ac) = 0488928265427da9ee292130088ac5a48448ea07
+SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a
+SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595
+SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c
+SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58
+SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4
+SHA1 (patch-ai) = 4c86c1cd8c6c9ff48cd890255523b08848d56764
+SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54
+SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
+SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636
+SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6
+SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e
+SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113
diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac
index a35211bba5b..acabeabb2e2 100644
--- a/audio/csound5/patches/patch-ac
+++ b/audio/csound5/patches/patch-ac
@@ -1,21 +1,23 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$NetBSD: patch-ac,v 1.2 2006/05/29 19:44:24 joerg Exp $
---- SConstruct.orig 2006-03-15 07:22:43.000000000 -0800
+--- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000
+++ SConstruct
-@@ -50,6 +50,8 @@ def today():
+@@ -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 +337,15 @@ elif getPlatform() == 'mingw':
+@@ -335,6 +339,15 @@ elif getPlatform() == 'mingw':
pythonLinkFlags = []
pythonLibraryPath = []
pythonLibs = ['python%s' % commonEnvironment['pythonVersion'].replace('.', '')]
-+elif getPlatform() == 'netbsd':
++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']))
@@ -27,20 +29,20 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
# Check for prerequisites.
# We check only for headers; checking for libs may fail
-@@ -485,7 +496,7 @@ def buildzip(env, target, source):
+@@ -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') 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 +537,12 @@ if commonEnvironment['buildRelease'] !=
+@@ -526,6 +539,12 @@ if commonEnvironment['buildRelease'] !=
tmp += '64'
s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
csoundLibraryEnvironment.Append(CPPFLAGS = [s])
-+ if getPlatform() == 'netbsd':
++ if getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
+ tmp = '%s/lib/csound5/plugins' % commonEnvironment['prefix']
+ if commonEnvironment['useDouble'] != '0':
+ tmp += '64'
@@ -49,57 +51,124 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Copy()
csoundDynamicLibraryEnvironment.Append(LIBS = ['sndfile'])
if getPlatform() == 'mingw':
-@@ -550,6 +567,8 @@ 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:
-@@ -989,7 +1008,7 @@ makePlugin(pluginEnvironment, 'stdopcod'
+@@ -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':
++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 +1061,9 @@ else:
+@@ -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'])
-@@ -1082,6 +1104,8 @@ else:
+@@ -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':
++ 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):
-@@ -1118,7 +1142,7 @@ else:
+@@ -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 +1261,13 @@ else:
+
+@@ -1237,6 +1291,13 @@ else:
guiProgramEnvironment.Prepend(LINKFLAGS = ['-mwindows'])
vstEnvironment.Append(LIBS = ['fltk_images', 'fltk'])
guiProgramEnvironment.Append(LINKFLAGS = '-mwindows')
-+ elif getPlatform() == 'netbsd':
++ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
+ vstEnvironment.Append(LIBS = ['m'])
+ vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+ vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
@@ -109,43 +178,49 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
guiProgramEnvironment.Prepend(LIBS = ['_CsoundVST'])
for option in vstEnvironment['CCFLAGS']:
if string.find(option, '-D') == 0:
-@@ -1420,7 +1451,7 @@ else:
+@@ -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.
-@@ -1443,6 +1474,8 @@ else:
+ 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':
++ 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 +1494,7 @@ if commonEnvironment['buildPDClass']=='1
+@@ -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':
++ elif getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
pdClass = pdClassEnvironment.SharedLibrary(
'csoundapi~.pd_linux',
'frontends/csoundapi_tilde/csoundapi_tilde.c',
-@@ -1493,6 +1526,8 @@ if commonEnvironment['buildTclcsound'] =
+@@ -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 +1626,18 @@ else:
+@@ -1591,18 +1661,18 @@ else:
PREFIX = commonEnvironment['prefix']
diff --git a/audio/csound5/patches/patch-ad b/audio/csound5/patches/patch-ad
index 0999916fc77..2544cd2be3a 100644
--- a/audio/csound5/patches/patch-ad
+++ b/audio/csound5/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
-#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__)
-+#if !defined(__NetBSD__) && !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
index c03db006e2f..2e93eebab64 100644
--- a/audio/csound5/patches/patch-ae
+++ b/audio/csound5/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#ifdef PIPES
-# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__)
-+# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__)
++# 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
index ece8db801a7..e5c6cba76e7 100644
--- a/audio/csound5/patches/patch-af
+++ b/audio/csound5/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
int csoundCheckOpcodePluginFile(CSOUND *csound, const char *fname)
{
-#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__))
++#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
char buf[512];
size_t i;
#endif
@@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
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__))
++#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
/* on some platforms, file names are case insensitive */
i = (size_t) 0;
do {
@@ -25,7 +25,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
opcodeCnt++;
}
-#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__))
++#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
index a16a5436d2a..da5c2e30e92 100644
--- a/audio/csound5/patches/patch-ag
+++ b/audio/csound5/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
-#elif defined(LINUX) || defined(MACOSX)
-+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__)
++#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
index b6685d3eee1..d1374132e59 100644
--- a/audio/csound5/patches/patch-ah
+++ b/audio/csound5/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#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__)
++#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
index 637fd652abe..fa5fa9ca19e 100644
--- a/audio/csound5/patches/patch-ai
+++ b/audio/csound5/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#endif /* defined(WIN32) */
-#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__)
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
# include <pthread.h>
# include <sched.h>
# include <sys/time.h>
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound,
"_widgets_globals");
-#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__)
++#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
index 018f965753b..99bd6bdda8b 100644
--- a/audio/csound5/patches/patch-aj
+++ b/audio/csound5/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#ifdef PIPES
# if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || \
- defined(__MACH__)
-+ defined(__MACH__) || defined(__NetBSD__)
++ 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
index 1558bbcd64a..266217cbc9c 100644
--- a/audio/csound5/patches/patch-ak
+++ b/audio/csound5/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
*/
lt = time(NULL);
-#ifndef LINUX
-+#if !defined(LINUX) && !defined(__NetBSD__)
++#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
index 720d1c646d6..672aabf7ac8 100644
--- a/audio/csound5/patches/patch-al
+++ b/audio/csound5/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#include "cwindow.h"
-#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__)
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
#include <X11/Xlib.h>
#endif
@@ -16,7 +16,7 @@ $NetBSD: patch-al,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
void set_display_callbacks(CSOUND *csound)
{
-#ifdef LINUX
-+#if defined(LINUX) || defined(__NetBSD__)
++#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
index 6559f7a484e..abc3fdf3966 100644
--- a/audio/csound5/patches/patch-am
+++ b/audio/csound5/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#include "csmodule.h"
-#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__)
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
#include <dlfcn.h>
#elif defined(WIN32)
#include <windows.h>
@@ -16,7 +16,7 @@ $NetBSD: patch-am,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
/* 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__)))
++#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
@@ -37,7 +37,7 @@ $NetBSD: patch-am,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
err = csound->OpenLibrary(&h, libraryPath);
if (err) {
-#if defined(BETA) && defined(LINUX)
-+#if defined(BETA) && (defined(LINUX) || defined(__NetBSD__))
++#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)"),
@@ -46,7 +46,7 @@ $NetBSD: patch-am,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
-#elif defined(LINUX)
-+#elif defined(LINUX) || defined(__NetBSD__)
++#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
index a87451362ab..3c9a5dfd78d 100644
--- a/audio/csound5/patches/patch-an
+++ b/audio/csound5/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#include <ctype.h>
#include <errno.h>
-#if defined(LINUX) || defined(__MACH__) || defined(WIN32)
-+#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__)
++#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__)
# include <sys/types.h>
# include <sys/stat.h>
#endif
@@ -16,7 +16,7 @@ $NetBSD: patch-an,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
{
-#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__)
++#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
struct stat tmp;
do {
#elif defined(WIN32)
@@ -25,7 +25,7 @@ $NetBSD: patch-an,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
#endif
if (ext != NULL && ext[0] != (char) 0) {
-#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32)
-+#if !defined(LINUX) && !defined(__MACH__) && !defined(WIN32) && !defined(__NetBSD__)
++#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) */
@@ -34,7 +34,7 @@ $NetBSD: patch-an,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
#endif
-#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__)
++#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
index 8cc3f76a0ba..d7202647818 100644
--- a/audio/csound5/patches/patch-ao
+++ b/audio/csound5/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $
}
-#elif defined(LINUX) || defined(__MACH__)
-+#elif defined(LINUX) || defined(__MACH__) || defined(__NetBSD__)
++#elif defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <pthread.h>
#include <time.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 00:39:39 +0000