7 files changed, 173 insertions, 0 deletions
diff --git a/audio/csound6/files/custom.py.in b/audio/csound6/files/custom.py.in
new file mode 100644
index 000000000000..3e5fbf1a5856
--- /dev/null
+++ b/audio/csound6/files/custom.py.in
@@ -0,0 +1,12 @@
+# Order is important: place local paths ahead of system paths.
+
+import sys
+
+customCPPPATH = [ '%%LOCALBASE%%/include', '%%PYTHON_INCLUDEDIR%%' ]
+customCCFLAGS = [  ]
+customCXXFLAGS = [ ]
+customLIBS = [ 'intl' ]
+customLIBPATH = [ '%%PORTAUDIO_L%%', '%%LOCALBASE%%/lib' ]
+customSHLINKFLAGS = [ '%%PORTAUDIO_R%%', '%%PTHREAD_LIBS%%' ]
+customSWIGFLAGS = []
+platform = 'linux'
diff --git a/audio/csound6/files/patch-InOut-rtalsa.c b/audio/csound6/files/patch-InOut-rtalsa.c
new file mode 100644
index 000000000000..952a11f4267d
--- /dev/null
+++ b/audio/csound6/files/patch-InOut-rtalsa.c
@@ -0,0 +1,27 @@
+--- InOut/rtalsa.c.orig	2011-12-22 19:41:53.000000000 +0900
++++ InOut/rtalsa.c	2011-12-27 23:53:00.000000000 +0900
+@@ -23,6 +23,7 @@
+     02111-1307 USA
+ */
+ 
++/*
+ #ifndef _ISOC99_SOURCE
+ #define _ISOC99_SOURCE 1
+ #endif
+@@ -39,6 +40,7 @@
+ #ifndef _POSIX_C_SOURCE
+ #define _POSIX_C_SOURCE 1
+ #endif
++*/
+ 
+ #include "csdl.h"
+ 
+@@ -57,6 +59,8 @@
+ #include <signal.h>
+ #include <sys/mman.h>
+ #include <sys/resource.h>
++#include <stdlib.h>
++#include <sys/fcntl.h>
+ 
+ 
+ #include "soundio.h"
diff --git a/audio/csound6/files/patch-Opcodes-urandom.c b/audio/csound6/files/patch-Opcodes-urandom.c
new file mode 100644
index 000000000000..7d19cb045fdd
--- /dev/null
+++ b/audio/csound6/files/patch-Opcodes-urandom.c
@@ -0,0 +1,10 @@
+--- Opcodes/urandom.c.old	2011-01-30 02:14:59.000000000 -0600
++++ Opcodes/urandom.c	2011-01-30 02:15:08.000000000 -0600
+@@ -22,7 +22,6 @@
+ */
+ 
+ #include "csdl.h"
+-#include <ieee754.h>
+ 
+ typedef struct {
+     OPDS    h;
diff --git a/audio/csound6/files/patch-Top-csound.c b/audio/csound6/files/patch-Top-csound.c
new file mode 100644
index 000000000000..08609d0b47b3
--- /dev/null
+++ b/audio/csound6/files/patch-Top-csound.c
@@ -0,0 +1,64 @@
+--- Top/csound.c.orig	2011-10-16 22:59:03.000000000 +0900
++++ Top/csound.c	2011-12-07 01:15:33.000000000 +0900
+@@ -60,10 +60,13 @@
+ #include "cs_par_dispatch.h"
+ #include "csound_orc_semantics.h"
+ 
+-#if defined(linux) || defined(__HAIKU__)
++#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__)
+ #define PTHREAD_SPINLOCK_INITIALIZER 0
+ #endif
+ 
++#if defined(__FreeBSD__)
++#include <sys/sysctl.h>
++#endif
+ #if defined(USE_OPENMP)
+ #include <omp.h>
+ #endif /* USE_OPENMP */
+@@ -899,7 +902,7 @@
+ 
+ #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \
+                          !defined(__HAIKU__) && !defined(__BEOS__) && \
+-                         !defined(__MACH__))
++                         !defined(__MACH__) && !defined(__FreeBSD__))
+ static char *signal_to_string(int sig)
+ {
+     switch(sig) {
+@@ -3172,7 +3175,7 @@
+ /* ------------------------------------ */
+ 
+ #if defined(HAVE_RDTSC)
+-#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__))
++#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__)) || !(defined(__FreeBSD__) && defined(__i386__))
+ #undef HAVE_RDTSC
+ #endif
+ #endif
+@@ -3185,6 +3188,13 @@
+ static int getTimeResolution(void)
+ {
+ #if defined(HAVE_RDTSC)
++#if defined(__FreeBSD__)
++    size_t size;
++    int timeResolutionSeconds;
++    size = sizeof timeResolutionSeconds;
++    sysctlbyname("hw.clockrate", &timeResolutionSeconds, &size, NULL, 0);
++
++#else
+     FILE    *f;
+     char    buf[256];
+ 
+@@ -3220,9 +3230,14 @@
+       }
+     }
+     fclose(f);
++#endif /* __FreeBSD__ */
+     if (UNLIKELY(timeResolutionSeconds <= 0.0)) {
+       fprintf(stderr, Str("No valid CPU frequency entry "
++#if defined(__FreeBSD__)
++                          "was found.\n"));
++#else
+                           "was found in /proc/cpuinfo.\n"));
++#endif /* __FreeBSD__ */
+       return -1;
+     }
+     /* MHz -> seconds */
diff --git a/audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp b/audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp
new file mode 100644
index 000000000000..68c76b77f5eb
--- /dev/null
+++ b/audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp
@@ -0,0 +1,19 @@
+--- frontends/CsoundAC/ChordSpace.hpp.orig
++++ frontends/CsoundAC/ChordSpace.hpp
+@@ -29,6 +29,7 @@
+ #include <climits>
+ #include <cmath>
+ #include <cstdarg>
++#include <cstdio>
+ #include <eigen3/Eigen/Dense>
+ #include "Event.hpp"
+ #include <iostream>
+@@ -545,7 +546,7 @@
+ 		char buffer[0x1000];
+ 		std::stringstream stream;
+ 		for (size_t voice = 0; voice < voices(); ++voice) {
+-			std::snprintf(buffer, 0x100, "%12.7f", getPitch(voice));
++			snprintf(buffer, 0x100, "%12.7f", getPitch(voice));
+ 			if (voice > 0) {
+ 				stream << " ";
+ 			}
diff --git a/audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp b/audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp
new file mode 100644
index 000000000000..fd03d322285e
--- /dev/null
+++ b/audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp
@@ -0,0 +1,37 @@
+--- frontends/CsoundAC/Composition.cpp.orig
++++ frontends/CsoundAC/Composition.cpp
+@@ -22,6 +22,7 @@
+ #endif
+ #include "Composition.hpp"
+ #include "System.hpp"
++#include <cstdio>
+ #include <cstdlib>
+ #include <map>
+ 
+@@ -289,7 +290,7 @@
+   int Composition::normalizeOutputSoundfile(double levelDb)
+   {
+     char buffer[0x100];
+-    std::snprintf(buffer,
++    snprintf(buffer,
+                   0x100,
+                   "sox %s -V3 -b 32 -e floating-point %s gain -n %f\n",
+                   getOutputSoundfileName().c_str(),
+@@ -307,7 +308,7 @@
+   int Composition::translateToCdAudio(double levelDb)
+   {
+     char buffer[0x100];
+-    std::snprintf(buffer, 0x100, "sox %s -V3 -b 16 %s gain -n %f rate 44100\n",
++    snprintf(buffer, 0x100, "sox %s -V3 -b 16 %s gain -n %f rate 44100\n",
+                   getOutputSoundfileName().c_str(),
+                   getCdSoundfileName().c_str(),
+                   levelDb);
+@@ -323,7 +324,7 @@
+   int Composition::translateToMp3(double bitrate, double levelDb)
+   {
+     char buffer[0x100];
+-    std::snprintf(buffer,
++    snprintf(buffer,
+                   0x100,
+                   "lame --verbose --disptime 2 --nohist --preset cd --tt %s --ta %s --tl %s --tc %s %s %s\n",
+                   getTitle().c_str(),
diff --git a/audio/csound6/files/pkg-message.in b/audio/csound6/files/pkg-message.in
new file mode 100644
index 000000000000..94fe1c601a87
--- /dev/null
+++ b/audio/csound6/files/pkg-message.in
@@ -0,0 +1,4 @@
+===================-Please Note:-====================================
+%%PREFIX%%/bin/mixer has been renamed to %%PREFIX%%/bin/csmixer so it
+won't conflict with /usr/bin/mixer
+=====================================================================