- Update to 5.13

PR:		ports/154488
Submitted by:	chris petrik <c.petrik.sosa@gmail.com>

4 files changed, 118 insertions, 51 deletions

diff --git a/audio/csound/files/patch-Engine-csound_orc.l b/audio/csound/files/patch-Engine-csound_orc.l
new file mode 100644
index 000000000000..43cb79f8c9e0
--- /dev/null
+++ b/audio/csound/files/patch-Engine-csound_orc.l
@@ -0,0 +1,47 @@
+--- Engine/csound_orc.l.old	2011-02-03 05:49:04.000000000 -0600
++++ Engine/csound_orc.l	2011-02-03 05:49:33.000000000 -0600
+@@ -202,7 +202,7 @@
+                   alt_stack[macro_stack_ptr++] = macros;
+                   /* printf("Push %p macro stack; new body #%s#\n", macros, mm->body); */
+                   /* printf("Push buffer %p -> ", YY_CURRENT_BUFFER); */
+-                  yypush_buffer_state(YY_CURRENT_BUFFER);
++                  //yypush_buffer_state(YY_CURRENT_BUFFER);
+                   yy_scan_string(mm->body);
+                   /* printf("%p\n", YY_CURRENT_BUFFER); */
+                  }
+@@ -228,7 +228,7 @@
+                   alt_stack[macro_stack_ptr++] = macros;
+                   /* printf("Push %p macro stack\n", mm_save); */
+                   /* printf("Push buffer %p -> ", YY_CURRENT_BUFFER); */
+-                  yypush_buffer_state(YY_CURRENT_BUFFER);
++                  //yypush_buffer_state(YY_CURRENT_BUFFER);
+                   yy_scan_string(mm->body);
+                   /* printf("%p\n", YY_CURRENT_BUFFER); */
+                 }
+@@ -280,7 +280,7 @@
+                   //include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
+                   alt_stack[macro_stack_ptr++] = mm_save;
+                   /* printf("Push %p macro stack\n", mm_save); */
+-                  yypush_buffer_state(YY_CURRENT_BUFFER);
++                  //yypush_buffer_state(YY_CURRENT_BUFFER);
+                   yy_scan_string(mm->body);
+                 }
+ {MACRONAMEDA}   { printf("Macro with arguments call not written\n");}
+@@ -307,7 +307,7 @@
+ <<EOF>>         {
+                   MACRO *x, *y=macros;
+                   /* printf("Leaving buffer %p\n", YY_CURRENT_BUFFER); */
+-                  yypop_buffer_state();
++                  //yypop_buffer_state();
+                   if ( !YY_CURRENT_BUFFER ) yyterminate();
+                   /* printf("End of input; popping to %p\n", YY_CURRENT_BUFFER); */
+                   macros = alt_stack[--macro_stack_ptr];
+@@ -388,7 +388,7 @@
+       exit(1);
+     }
+     alt_stack[macro_stack_ptr++] = macros;
+-    yypush_buffer_state(yy_create_buffer( yyin, YY_BUF_SIZE ) );
++    //yypush_buffer_state(yy_create_buffer( yyin, YY_BUF_SIZE ) );
+ }
+ 
+ static inline int isNameChar(int c, int pos)
diff --git a/audio/csound/files/patch-Opcodes-urandom.c b/audio/csound/files/patch-Opcodes-urandom.c
new file mode 100644
index 000000000000..7d19cb045fdd
--- /dev/null
+++ b/audio/csound/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/csound/files/patch-Top-csound.c b/audio/csound/files/patch-Top-csound.c
index e7e9df160491..6e60eed06af7 100644
--- a/audio/csound/files/patch-Top-csound.c
+++ b/audio/csound/files/patch-Top-csound.c
@@ -1,63 +1,68 @@
---- Top/csound.c.old	2009-10-15 16:24:10.000000000 -0500
-+++ Top/csound.c	2009-10-15 16:25:28.000000000 -0500
-@@ -58,6 +58,7 @@
+--- Top/csound.c.old	2011-01-30 01:43:37.000000000 -0600
++++ Top/csound.c	2011-01-30 01:46:42.000000000 -0600
+@@ -58,7 +58,9 @@
  #include "namedins.h"
  #include "pvfileio.h"
  #include "fftlib.h"
+-
++#if defined(__FreeBSD__)
 +#include <sys/sysctl.h>
- 
-   extern void MakeAscii(CSOUND *, WINDAT *, const char *);
-   extern void DrawAscii(CSOUND *, WINDAT *);
-@@ -2566,46 +2567,17 @@
-   static int getTimeResolution(void)
-   {
++#endif
+ #if defined(USE_OPENMP)
+ #include <omp.h>
+ #endif
+@@ -2641,49 +2643,14 @@
+     static int getTimeResolution(void)
+     {
  #if defined(HAVE_RDTSC)
--      FILE    *f;
--      char    buf[256];
+-        FILE    *f;
+-        char    buf[256];
 +     size_t size;
 +     int timeResolutionSeconds;
 +     size = sizeof timeResolutionSeconds;
 +     sysctlbyname("hw.clockrate", &timeResolutionSeconds, &size, NULL, 0);
  
--      /* if frequency is not known yet */
--      f = fopen("/proc/cpuinfo", "r");
--      if (UNLIKELY(f == NULL)) {
--        fprintf(stderr, Str("Cannot open /proc/cpuinfo. "
--                            "Support for RDTSC is not available.\n"));
--        return -1;
--      }
--      /* find CPU frequency */
--      while (fgets(buf, 256, f) != NULL) {
--        int     i;
--        char    *s = (char*) buf - 1;
+-        /* if frequency is not known yet */
+-        f = fopen("/proc/cpuinfo", "r");
+-        if (UNLIKELY(f == NULL)) {
+-            fprintf(stderr, Str("Cannot open /proc/cpuinfo. "
+-                    "Support for RDTSC is not available.\n"));
+-            return -1;
+-        }
+-        /* find CPU frequency */
+-        while (fgets(buf, 256, f) != NULL) {
+-            int     i;
+-            char    *s = (char*) buf - 1;
 -
--        buf[255] = '\0';          /* safety */
--        if (strlen(buf) < 9)
--          continue;                       /* too short, skip */
--        while (*++s != '\0')
--          if (isupper(*s))
--            *s = tolower(*s);             /* convert to lower case */
--        if (strncmp(buf, "cpu mhz", 7) != 0)
--          continue;                       /* check key name */
--        s = strchr(buf, ':');             /* find frequency value */
--        if (s == NULL) continue;              /* invalid entry */
--        do {
--          s++;
--        } while (*s == ' ' || *s == '\t');    /* skip white space */
--        i = sscanf(s, "%lf", &timeResolutionSeconds);
--        if (i < 1 || timeResolutionSeconds < 1.0) {
--          timeResolutionSeconds = -1.0;       /* invalid entry */
--          continue;
+-            buf[255] = '\0';          /* safety */
+-            if (strlen(buf) < 9) {
+-                continue;    /* too short, skip */
+-            }
+-            while (*++s != '\0')
+-                if (isupper(*s)) {
+-                    *s = tolower(*s);    /* convert to lower case */
+-                }
+-            if (strncmp(buf, "cpu mhz", 7) != 0) {
+-                continue;    /* check key name */
+-            }
+-            s = strchr(buf, ':');             /* find frequency value */
+-            if (s == NULL) {
+-                continue;    /* invalid entry */
+-            }
+-            do {
+-                s++;
+-            } while (*s == ' ' || *s == '\t');    /* skip white space */
+-            i = sscanf(s, "%lf", &timeResolutionSeconds);
+-            if (i < 1 || timeResolutionSeconds < 1.0) {
+-                timeResolutionSeconds = -1.0;       /* invalid entry */
+-                continue;
+-            }
 -        }
--      }
--      fclose(f);
-       if (UNLIKELY(timeResolutionSeconds <= 0.0)) {
-         fprintf(stderr, Str("No valid CPU frequency entry "
--                            "was found in /proc/cpuinfo.\n"));
-+                            "was found \n"));
-         return -1;
-       }
-+
-       /* MHz -> seconds */
-       timeResolutionSeconds = 0.000001 / timeResolutionSeconds;
- #elif defined(WIN32)
+-        fclose(f);
+         if (UNLIKELY(timeResolutionSeconds <= 0.0)) {
+             fprintf(stderr, Str("No valid CPU frequency entry "
+-                    "was found in /proc/cpuinfo.\n"));
++                    "was found.\n"));
+             return -1;
+         }
+         /* MHz -> seconds */
diff --git a/audio/csound/files/pkg-message.in b/audio/csound/files/pkg-message.in
index 3c5ff38586a1..e27adbc80348 100644
--- a/audio/csound/files/pkg-message.in
+++ b/audio/csound/files/pkg-message.in
@@ -2,3 +2,8 @@
 %%PREFIX%%/bin/mixer has been renamed to %%PREFIX%%/bin/cs_mixer so it
 won't conflict with /usr/bin/mixer
 =====================================================================
+
+===================-Support:-========================================
+Due to the complexity of this port, support requests must be done using
+http://www.cpetservices.com/site/tickets/misc.htm 
+=====================================================================