summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-02-24 16:19:39 +0000
committerjoerg <joerg@pkgsrc.org>2014-02-24 16:19:39 +0000
commit65a21dc7f8729f838f9fdf0f021ad36591c4454f (patch)
tree698877cb67a09455d6f1fbd4fef9d7e17c8e745c
parent4c78b546e7a62f7d9474e1e6ccc7f5b1334b11cb (diff)
downloadpkgsrc-65a21dc7f8729f838f9fdf0f021ad36591c4454f.tar.gz
Fix missing prototype. Fix missing bison dependency. Invoke it by hand
as scons want to add the header on the command line, which clang doesn't like.
-rw-r--r--audio/csound5/Makefile6
-rw-r--r--audio/csound5/distinfo9
-rw-r--r--audio/csound5/patches/patch-Engine_cs__par__base.c39
-rw-r--r--audio/csound5/patches/patch-Engine_cs__par__dispatch.c26
-rw-r--r--audio/csound5/patches/patch-H_cs__par__base.h41
-rw-r--r--audio/csound5/patches/patch-H_cs__par__dispatch.h26
-rw-r--r--audio/csound5/patches/patch-ac60
-rw-r--r--audio/csound5/patches/patch-frontends_beats_main.c12
8 files changed, 190 insertions, 29 deletions
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index 5a751d3f856..94c8c22a44e 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/02/22 00:59:26 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2014/02/24 16:19:39 joerg Exp $
DISTNAME= Csound${CSOUND_VERSION}
PKGNAME= csound5-${CSOUND_VERSION}
@@ -13,7 +13,8 @@ LICENSE= gnu-lgpl-v2.1 # or later
CSOUND_VERSION= 5.19.01
USE_LANGUAGES= c c++
-CFLAGS+= -g -D__PKGSRC_PREFIX__=${PREFIX}/ -DBETA
+USE_TOOLS+= bison
+CFLAGS+= -D__PKGSRC_PREFIX__=${PREFIX}/ -DBETA
BUILD_DEPENDS+= scons>=0.96:../../devel/scons
SCONS= ${PREFIX}/bin/scons
SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX}
@@ -41,6 +42,7 @@ SUBST_SED.strip= -e 's/--strip-unneeded//g'
.endif
do-build:
+ cd ${WRKSRC} && ${TOOLS_PATH.bison} -d -o frontends/beats/beats.tab.c frontends/beats/beats.y
cd ${WRKSRC} && if [ ! -f custom.py ]; then cp custom.py.mkg custom.py; fi
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo
index e09d6c23d27..77f68290b0c 100644
--- a/audio/csound5/distinfo
+++ b/audio/csound5/distinfo
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.11 2014/02/13 10:10:06 mrg Exp $
+$NetBSD: distinfo,v 1.12 2014/02/24 16:19:39 joerg Exp $
SHA1 (Csound5.19.01.tar.gz) = eeeb3591745c5b352b9040a2dfa3805f22f5fbda
RMD160 (Csound5.19.01.tar.gz) = ceb9952d562c57b09143a47a4d51081753f1b694
Size (Csound5.19.01.tar.gz) = 9302526 bytes
+SHA1 (patch-Engine_cs__par__base.c) = ab28f22d8806e7eb57c4849156c0fc854094fe20
+SHA1 (patch-Engine_cs__par__dispatch.c) = 91a65c4e5d4a1fd8e2cc882739fa15dbee37bd24
+SHA1 (patch-H_cs__par__base.h) = 198ceed3c47d3fe48d45f7d78c00d85912cc98a7
+SHA1 (patch-H_cs__par__dispatch.h) = d4c2be5958f533c8383d85efb97ecda0a33ef43d
SHA1 (patch-Opcodes_cpumeter.c) = 45cf1eafa0fbf7d430c5f4a39a193c63e0259d5a
SHA1 (patch-Opcodes_wavegde.h) = e1a6d742b28dd9b6b129a993102baf7218efa57c
-SHA1 (patch-ac) = 6079e0715edd55215f7f53a2d390d0fb290de1a4
+SHA1 (patch-ac) = 6420eba18a5c06c84a592b96d3725d6f96d238a4
SHA1 (patch-ad) = 30aa452d35dbcd6ba4fe2c9a7680fe028368aae4
SHA1 (patch-ae) = cba2fb017f4b940debbf7f8fd482c73c3fe19587
SHA1 (patch-ah) = 229fc00e122288ea16ebf07f081869965cab9365
@@ -17,4 +21,5 @@ SHA1 (patch-am) = 4df76fa93f26455d559acadb8389a6d7174c43ed
SHA1 (patch-an) = edaddf39179bf686e46591c2353b16917a9ae8f0
SHA1 (patch-ao) = 83a028f92ef743072728376cf4ddc79ef3d46381
SHA1 (patch-custom.py.mkg) = ef45464105e7d7bc8ad2401d1b19f521e12333ca
+SHA1 (patch-frontends_beats_main.c) = 5de77ee83be93120a93b86b755d767c46c58fcdf
SHA1 (patch-install.py) = 8a02d553440bf921761a189af7b96fdd9657e870
diff --git a/audio/csound5/patches/patch-Engine_cs__par__base.c b/audio/csound5/patches/patch-Engine_cs__par__base.c
new file mode 100644
index 00000000000..5a05d2db146
--- /dev/null
+++ b/audio/csound5/patches/patch-Engine_cs__par__base.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-Engine_cs__par__base.c,v 1.1 2014/02/24 16:19:39 joerg Exp $
+
+--- Engine/cs_par_base.c.orig 2014-02-24 12:54:12.000000000 +0000
++++ Engine/cs_par_base.c
+@@ -547,34 +547,6 @@ int csp_set_print(CSOUND *csound, struct
+ return CSOUND_SUCCESS;
+ }
+
+-inline int csp_set_count(struct set_t *set)
+-{
+- return set->count;
+-}
+-
+-/* 0 indexed */
+-inline int csp_set_get_num(struct set_t *set, int num, void **data)
+-{
+- *data = set->cache[num]->data;
+- /*
+- if (set->cache != NULL) {
+-
+- }
+- else {
+- int ctr = 0;
+- struct set_element_t *ele = set->head;
+- while (ctr < num && ele != NULL) {
+- ctr++;
+- ele = ele->next;
+- }
+- if (ctr == num && ele != NULL) {
+- *data = ele->data;
+- }
+- }
+- */
+- return CSOUND_SUCCESS;
+-}
+-
+ int csp_set_union(CSOUND *csound, struct set_t *first,
+ struct set_t *second, struct set_t **result)
+ {
diff --git a/audio/csound5/patches/patch-Engine_cs__par__dispatch.c b/audio/csound5/patches/patch-Engine_cs__par__dispatch.c
new file mode 100644
index 00000000000..d68ee25042a
--- /dev/null
+++ b/audio/csound5/patches/patch-Engine_cs__par__dispatch.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-Engine_cs__par__dispatch.c,v 1.1 2014/02/24 16:19:39 joerg Exp $
+
+--- Engine/cs_par_dispatch.c.orig 2014-02-24 13:00:33.000000000 +0000
++++ Engine/cs_par_dispatch.c
+@@ -1488,21 +1488,6 @@ static inline void csp_dag_prepare_use_i
+ }
+ }
+
+-inline int csp_dag_is_finished(DAG *dag)
+-{
+-#ifdef CAUTIOUS
+- if (dag == NULL)
+- csound->Die(csound, Str("Invalid NULL Parameter dag"));
+-#endif
+- /* TAKE_LOCK(&(dag->spinlock));
+- int res = (dag->remaining <= 0);
+- RELS_LOCK(&(dag->spinlock));
+- return res;
+- */
+- TRACE_5("DAG is finished %d\n", dag->remaining <= 0);
+- return (dag->remaining <= 0);
+-}
+-
+ static void csp_dag_calculate_max_roots(DAG *dag)
+ {
+ //INSTR_SEMANTICS *instr = NULL;
diff --git a/audio/csound5/patches/patch-H_cs__par__base.h b/audio/csound5/patches/patch-H_cs__par__base.h
new file mode 100644
index 00000000000..b12d2cbfdde
--- /dev/null
+++ b/audio/csound5/patches/patch-H_cs__par__base.h
@@ -0,0 +1,41 @@
+$NetBSD: patch-H_cs__par__base.h,v 1.1 2014/02/24 16:19:39 joerg Exp $
+
+--- H/cs_par_base.h.orig 2014-02-24 12:55:11.000000000 +0000
++++ H/cs_par_base.h
+@@ -167,9 +167,33 @@ int csp_set_remove(CSOUND *csound, stru
+ int csp_set_exists(CSOUND *csound, struct set_t *set, void *data);
+ int csp_set_print(CSOUND *csound, struct set_t *set);
+
+-/* get a count and access members */
+-inline int csp_set_count(struct set_t *set);
+-inline int csp_set_get_num(struct set_t *set, int num, void **data);
++static inline int csp_set_count(struct set_t *set)
++{
++ return set->count;
++}
++
++/* 0 indexed */
++static inline int csp_set_get_num(struct set_t *set, int num, void **data)
++{
++ *data = set->cache[num]->data;
++ /*
++ if (set->cache != NULL) {
++
++ }
++ else {
++ int ctr = 0;
++ struct set_element_t *ele = set->head;
++ while (ctr < num && ele != NULL) {
++ ctr++;
++ ele = ele->next;
++ }
++ if (ctr == num && ele != NULL) {
++ *data = ele->data;
++ }
++ }
++ */
++ return CSOUND_SUCCESS;
++}
+
+ /*
+ * set union and intersection
diff --git a/audio/csound5/patches/patch-H_cs__par__dispatch.h b/audio/csound5/patches/patch-H_cs__par__dispatch.h
new file mode 100644
index 00000000000..a2657bafcfb
--- /dev/null
+++ b/audio/csound5/patches/patch-H_cs__par__dispatch.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-H_cs__par__dispatch.h,v 1.1 2014/02/24 16:19:39 joerg Exp $
+
+--- H/cs_par_dispatch.h.orig 2014-02-24 13:00:48.000000000 +0000
++++ H/cs_par_dispatch.h
+@@ -107,7 +107,20 @@ void csp_dag_build(CSOUND *csound, DAG *
+ void csp_dag_print(CSOUND *csound, DAG *dag);
+
+ /* return 1 if the DAG is completely consume */
+-inline int csp_dag_is_finished(DAG *dag);
++static inline int csp_dag_is_finished(DAG *dag)
++{
++#ifdef CAUTIOUS
++ if (dag == NULL)
++ csound->Die(csound, Str("Invalid NULL Parameter dag"));
++#endif
++ /* TAKE_LOCK(&(dag->spinlock));
++ int res = (dag->remaining <= 0);
++ RELS_LOCK(&(dag->spinlock));
++ return res;
++ */
++ TRACE_5("DAG is finished %d\n", dag->remaining <= 0);
++ return (dag->remaining <= 0);
++}
+ /* get a node from the dag
+ * update_hdl should be passed into consume_update when the node has
+ * been performed */
diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac
index b916d953a1d..8918f8be4b9 100644
--- a/audio/csound5/patches/patch-ac
+++ b/audio/csound5/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
+$NetBSD: patch-ac,v 1.9 2014/02/24 16:19:39 joerg Exp $
---- SConstruct.orig 2013-01-07 04:49:34.000000000 -0800
-+++ SConstruct 2014-02-12 23:01:25.000000000 -0800
-@@ -60,6 +60,10 @@
+--- SConstruct.orig 2013-01-07 12:49:34.000000000 +0000
++++ SConstruct
+@@ -60,6 +60,10 @@ def getPlatform():
return 'darwin'
elif sys.platform[:5] == 'sunos':
return 'sunos'
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
else:
return 'unsupported'
-@@ -408,6 +412,8 @@
+@@ -408,6 +412,8 @@ if commonEnvironment['useGettext'] == '1
commonEnvironment.Append(LIBS=['intl'])
if getPlatform() == 'haiku':
commonEnvironment.Append(LIBS=['intl'])
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
else:
print "CONFIGURATION DECISION: No localisation"
-@@ -505,17 +511,17 @@
+@@ -505,17 +511,17 @@ else:
if getPlatform() == 'linux':
commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
@@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
if compilerGNU():
commonEnvironment.Append(CCFLAGS = "-DPIPES")
commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
-@@ -570,6 +576,11 @@
+@@ -570,6 +576,11 @@ elif getPlatform() == 'win32':
if compilerIntel():
print 'Generating code optimized for Intel Core 2 Duo and Pentium 4 that will run on other processors also.'
commonEnvironment.Append(CCFLAGS = Split('/O3 /QaxTP'))
@@ -58,7 +58,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
if getPlatform() == 'linux':
path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-@@ -942,6 +953,13 @@
+@@ -942,6 +953,13 @@ if commonEnvironment['buildRelease'] !=
tmp += '64'
s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
csoundLibraryEnvironment.Append(CPPFLAGS = [s])
@@ -72,7 +72,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Clone()
csoundDynamicLibraryEnvironment.Append(LIBS = ['sndfile'])
if getPlatform() == 'win32':
-@@ -999,6 +1017,11 @@
+@@ -999,6 +1017,11 @@ ws2_32
csoundDynamicLibraryEnvironment.Append(SHLINKFLAGS = ['-module'])
elif getPlatform() == 'linux' or getPlatform() == 'sunos' or getPlatform() == 'darwin':
csoundDynamicLibraryEnvironment.Append(LIBS = ['dl', 'm', 'pthread'])
@@ -84,7 +84,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
csoundInterfacesEnvironment = csoundDynamicLibraryEnvironment.Clone()
if buildOSXFramework:
-@@ -1289,7 +1312,7 @@
+@@ -1289,7 +1312,7 @@ else:
csoundLibraryEnvironment.Append(CCFLAGS='-fPIC')
csoundLibrary = csoundLibraryEnvironment.Library(
csoundLibraryName, libCsoundSources)
@@ -93,7 +93,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
# We need the library before sndfile in case we are building a static
# libcsound and passing -Wl,-as-needed
libCsoundLibs.insert(0,csoundLibrary)
-@@ -1691,7 +1714,7 @@
+@@ -1691,7 +1714,7 @@ makePlugin(pluginEnvironment, 'signalflo
makePlugin(pluginEnvironment, 'fractalnoise', ['Opcodes/tl/fractalnoise.cpp'])
# platform-specific
@@ -102,7 +102,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c'])
# makePlugin(pluginEnvironment, 'cpumeter', ['Opcodes/cpumeter.c'])
if getPlatform() == 'linux':
-@@ -1738,8 +1761,10 @@
+@@ -1738,8 +1761,10 @@ else:
print "CONFIGURATION DECISION: Building OSC plugin."
oscEnvironment = pluginEnvironment.Clone()
oscEnvironment.Append(LIBS = ['lo'])
@@ -115,7 +115,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
if getPlatform() == 'win32':
oscEnvironment.Append(LIBS = csoundWindowsLibraries)
if compilerGNU():
-@@ -1842,8 +1867,15 @@
+@@ -1842,8 +1867,15 @@ else:
WiiEnvironment.Append(LIBS = ['wiiuse', 'bluetooth'])
if p5gfound :
P5GEnvironment.Append(LIBS = ['p5glove'])
@@ -133,7 +133,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
if getPlatform() == 'darwin':
csoundProgramEnvironment.Append(LINKFLAGS = Split('''-framework Carbon -framework CoreAudio -framework CoreMIDI'''))
-@@ -1872,6 +1904,13 @@
+@@ -1872,6 +1904,13 @@ else:
widgetsEnvironment.Append(LIBS = csoundWindowsLibraries)
elif getPlatform() == 'darwin':
widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
@@ -147,7 +147,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
makePlugin(widgetsEnvironment, 'widgets',
['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp'])
-@@ -1909,7 +1948,11 @@
+@@ -1909,7 +1948,11 @@ if not (commonEnvironment['useALSA'] ==
else:
print "CONFIGURATION DECISION: Building ALSA plugin."
alsaEnvironment = pluginEnvironment.Clone()
@@ -160,7 +160,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
-@@ -1942,6 +1985,9 @@
+@@ -1942,6 +1985,9 @@ else:
portaudioEnvironment.Append(LIBS = ['winmm', 'dsound'])
portaudioEnvironment.Append(LIBS = csoundWindowsLibraries)
makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.cpp'])
@@ -170,7 +170,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
else:
makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c'])
-@@ -1954,6 +2000,9 @@
+@@ -1954,6 +2000,9 @@ else:
jackEnvironment.Append(LIBS = ['jack', 'asound', 'pthread'])
elif getPlatform() == 'win32':
jackEnvironment.Append(LIBS = ['jackdmp'])
@@ -180,7 +180,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
else:
jackEnvironment.Append(LIBS = ['pthread', 'jack'])
makePlugin(jackEnvironment, 'rtjack', ['InOut/rtjack.c'])
-@@ -2016,6 +2065,12 @@
+@@ -2016,6 +2065,12 @@ else:
fluidEnvironment.Append(LIBS = ['pthread'])
elif getPlatform() == 'haiku':
fluidEnvironment.Append(LIBS = ['fluidsynth'])
@@ -193,7 +193,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
makePlugin(fluidEnvironment, 'fluidOpcodes',
['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
-@@ -2178,8 +2233,10 @@
+@@ -2178,8 +2233,10 @@ else:
stkEnvironment.Append(LIBS = ['stdc++'])
if getPlatform() == 'win32':
stkEnvironment.Append(LIBS = csoundWindowsLibraries)
@@ -205,7 +205,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
# 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'])
-@@ -2206,6 +2263,8 @@
+@@ -2206,6 +2263,8 @@ else:
pyEnvironment.Append(LIBS = ['dl', 'm'])
elif getPlatform() == 'win32':
pyEnvironment['ENV']['PATH'] = os.environ['PATH']
@@ -214,7 +214,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
pythonOpcodes = makePlugin(pyEnvironment, 'py',
['Opcodes/py/pythonopcodes.c'])
if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
-@@ -2606,6 +2665,13 @@
+@@ -2606,6 +2665,13 @@ else:
vstEnvironment.Append(LIBS = Split('fltk fltk_images fltk_png fltk_jpeg fltk_z'))
else:
vstEnvironment.Append(LIBS = Split('csound64 csnd fltk fltkimages fltkpng fltkjpeg fltkz'))
@@ -228,7 +228,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
print 'PATH =', commonEnvironment['ENV']['PATH']
csoundVstSources = Split('''
frontends/CsoundVST/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp
-@@ -2653,7 +2719,7 @@
+@@ -2653,7 +2719,7 @@ if commonEnvironment['buildPDClass'] ==
pdClass = pdClassEnvironment.Program(
'csoundapi~.pd_darwin',
'frontends/csoundapi_tilde/csoundapi_tilde.c')
@@ -237,7 +237,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
pdClass = pdClassEnvironment.SharedLibrary(
'csoundapi~.pd_linux',
'frontends/csoundapi_tilde/csoundapi_tilde.c',
-@@ -2694,6 +2760,15 @@
+@@ -2694,6 +2760,15 @@ if commonEnvironment['buildTclcsound'] =
lib2 = 'tk%s' % commonEnvironment['tclversion']
csTclEnvironment.Append(LIBS = [lib1, lib2])
csTclEnvironment.Append(LIBS = csoundWindowsLibraries)
@@ -253,7 +253,17 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
csTclCmdObj = csTclEnvironment.SharedObject(
'frontends/tclcsound/commands.c')
csTcl = csTclEnvironment.Program(
-@@ -2887,11 +2962,15 @@
+@@ -2831,8 +2906,7 @@ else:
+ blb = csBeatsEnvironment.CFile(target = 'frontends/beats/lex.yy.c',
+ source = 'frontends/beats/beats.l')
+ bb = csBeatsEnvironment.Program('csbeats',
+- ['frontends/beats/main.c',
+- byb,
++ ['frontends/beats/main.c', 'frontends/beats/beats.tab.c',
+ blb])
+ executables.append(bb)
+
+@@ -2887,11 +2961,15 @@ INSTDIR = commonEnvironment['instdir']
PREFIX = INSTDIR + commonEnvironment['prefix']
BIN_DIR = PREFIX + "/bin"
@@ -269,7 +279,7 @@ $NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
else:
LIB_DIR = PREFIX + "/lib"
PYTHON_DIR = '%s/lib' % sys.prefix
-@@ -2903,8 +2982,10 @@
+@@ -2903,8 +2981,10 @@ for i in sys.path:
if commonEnvironment['useDouble'] == '0':
PLUGIN_DIR = LIB_DIR + "/csound/plugins"
diff --git a/audio/csound5/patches/patch-frontends_beats_main.c b/audio/csound5/patches/patch-frontends_beats_main.c
new file mode 100644
index 00000000000..38962d9a8b9
--- /dev/null
+++ b/audio/csound5/patches/patch-frontends_beats_main.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-frontends_beats_main.c,v 1.1 2014/02/24 16:19:39 joerg Exp $
+
+--- frontends/beats/main.c.orig 2014-02-24 12:58:20.000000000 +0000
++++ frontends/beats/main.c
+@@ -22,6 +22,7 @@
+ */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <time.h>
+ #include "beats.h"
+