update to csound 6.03.2. changes include:

    o   printks2: Prints a new value every time a control variable changes using
	a printf() style syntax.
    o   mp3sr mp3bitrate and mp3nchnls to get information on mp3 files
    o   New score opcode y sets the random seed (for ~) at read time
    o   A bug in CsOptions; the last argument was missed being read (issue #296)
    o   For ogg output it is possible to specify a VBR (variable bit rate)
	quality.
    o   Many array operations now available for i-arrays as well as k-arrays.
    o   fillarray will work for string arrays
    o   Displays of FFT (via dispfft) improved with scaling/zooming options
    o   Signal flow graph opcodes are now working with a-rate array signals.
    o   New command-line option --devices[=in|out] gives a list of available
	audio devices and then exit
    o   fixed the bug when tables were replaced but the size did not change
    o   A number of bugs in --sample-accurate have been detected and fixed.
	This includes opcodes out, outn, and line.
    o   A number of bugs in grain3 were fixed#
    o   Bug in str_chanel could cause a crash; fixed
    o   Error in resize opcode corrected
    o   A number of bugs/untidiness fixed in GEN23
    o   Array bound checks fixed
    o   strings channels were not correctly set for dynamic-size strings
    o   memory allocation for string formatting in printfsk was fixed
    o   strcat safe against overflow
    o   error in compilation of arrays fixed (issue #293)
    o   GetPvsChannel fixed against a crash
    o   turnoff opcode now checks that the instrument being affected is active
    o   lenarray can accept any array type
    o   there is a new possible section in a csd file called <CsFile...> which
	is like csFileB but with unencoded text.
    o   The whole system has been checked by the Coverity static checker which
        identified a number of (mainly minor) problems.  These have been
	reviewed and checked.  In particular better use of printing and string
	copying should prevent overflows.
    o   The type and variable system has been extensively rewritten; this allows
        better array and UDO support.  This means that UDOs now allow any array
	type to be used.
    o   Alignment of variables got right in all cases
    o   array copying is now using the type system to copy values; fixes issues
        with copying string arrays, f-sigs, etc.

7 files changed, 36 insertions, 35 deletions

diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index fabbc812cf6..018f8e26d67 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/08/05 05:12:38 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2014/08/06 06:17:07 mrg Exp $
 
 DISTNAME=		Csound${CSOUND_VERSION}
 PKGNAME=		csound6-${CSOUND_VERSION}
 PKGREVISION=		1
 CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound${CSOUND_VERSION}/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound6.03/}
 WRKSRC=			${WRKDIR}/Csound${CSOUND_VERSION}
 
 MAINTAINER=		mrg@eterna.com.au
@@ -12,7 +12,7 @@ HOMEPAGE=		http://sourceforge.net/projects/csound/
 COMMENT=		Software synthesizer and sequencer
 LICENSE=		gnu-lgpl-v2.1 # or later
 
-CSOUND_VERSION=		6.02
+CSOUND_VERSION=		6.03.2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison
 CFLAGS+=		-g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA
diff --git a/audio/csound6/PLIST b/audio/csound6/PLIST
index d9f80f28e90..d5179c61cc3 100644
--- a/audio/csound6/PLIST
+++ b/audio/csound6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/08/05 05:12:38 mrg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/06 06:17:07 mrg Exp $
 bin/csound6
 include/csound6/CppSound.hpp
 include/csound6/CsoundFile.hpp
@@ -7,6 +7,7 @@ include/csound6/cfgvar.h
 include/csound6/csPerfThread.hpp
 include/csound6/cs_par_structs.h
 include/csound6/cscore.h
+include/csound6/csdebug.h
 include/csound6/csdl.h
 include/csound6/csound.h
 include/csound6/csound.hpp
@@ -16,7 +17,6 @@ include/csound6/csound_standard_types.h
 include/csound6/csound_type_system.h
 include/csound6/cwindow.h
 include/csound6/filebuilding.h
-include/csound6/float-version-double.h
 include/csound6/float-version.h
 include/csound6/interlocks.h
 include/csound6/msg_attr.h
@@ -32,6 +32,7 @@ lib/csound6/cs
 lib/csound6/csanalyze
 lib/csound6/csb64enc
 lib/csound6/csbeats
+lib/csound6/csdebugger
 lib/csound6/csound
 lib/csound6/cvanal
 lib/csound6/dnoise
diff --git a/audio/csound6/distinfo b/audio/csound6/distinfo
index 1a4902792e8..557fa2e5e99 100644
--- a/audio/csound6/distinfo
+++ b/audio/csound6/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: distinfo,v 1.3 2014/08/06 06:17:07 mrg Exp $
 
-SHA1 (Csound6.02.tar.gz) = 9903dd2825d533d08fa333adb85bb39a2ef3da77
-RMD160 (Csound6.02.tar.gz) = a2a6b0436a1988bcfd4b24b4dc2e0e78f56cb7c1
-Size (Csound6.02.tar.gz) = 23459796 bytes
+SHA1 (Csound6.03.2.tar.gz) = 2ff8081c887ef98735197c1ff70bb4955c3eb3ff
+RMD160 (Csound6.03.2.tar.gz) = 00d6407feab8f992b8d309ec6701858087569752
+Size (Csound6.03.2.tar.gz) = 24571513 bytes
 SHA1 (patch-CMakeLists.txt) = 47e77bb65a091a8925893f4cf7bc76efc5080110
 SHA1 (patch-Engine_linevent.c) = da606596a1c8d2545dc0a8e948cd04e9188975ad
 SHA1 (patch-InOut_libsnd.c) = b460ef3ef7117fd9c194eff3f62a64435243ccc4
 SHA1 (patch-InOut_widgets.cpp) = f73a58a636254d27a3aa6b94ace4f72b978ca9ec
 SHA1 (patch-InOut_winEPS.c) = 5b3182dc79d819145df73426fead54fc28414ff2
-SHA1 (patch-InOut_winFLTK.c) = 92d5c9be1b352c4e3e0de292ffecd2fcb12df5e3
-SHA1 (patch-Opcodes_cpumeter.c) = c107de07dd1d613867e8033e951aba8c91703c4f
+SHA1 (patch-InOut_winFLTK.c) = 0c9b566ae5acfae5dcf7a9d0795976f103d069a5
+SHA1 (patch-Opcodes_cpumeter.c) = 4f5fdcdd1c0eb600be49e977df5214f52de1437b
 SHA1 (patch-Opcodes_wavegde.h) = e1a6d742b28dd9b6b129a993102baf7218efa57c
-SHA1 (patch-Top_csmodule.c) = 2791b4a68c4e0260a32e6330f7c464ad5d8cea6d
+SHA1 (patch-Top_csmodule.c) = 0ce136346dfe19d56dc4e882976aa2e66cd17e92
 SHA1 (patch-Top_csound.c) = 26c03324e0f8f8ccedbfe32bfedbd282d69a93fa
-SHA1 (patch-Top_one_file.c) = 52f4cc414f87b71057948fcf7b3050a42c113f69
+SHA1 (patch-Top_one_file.c) = c5929f9efcf8c11625fde7a86321f2fd303b55d2
 SHA1 (patch-Top_threads.c) = 107cb8605b5b46b70de3adeec0ae8acaafc2a6f2
 SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = a16da9c4975d37e56fefb58fd0458e94c3ed4925
diff --git a/audio/csound6/patches/patch-InOut_winFLTK.c b/audio/csound6/patches/patch-InOut_winFLTK.c
index 32ba8017fa8..572e81a8263 100644
--- a/audio/csound6/patches/patch-InOut_winFLTK.c
+++ b/audio/csound6/patches/patch-InOut_winFLTK.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-InOut_winFLTK.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-InOut_winFLTK.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- InOut/winFLTK.c.orig	2014-01-07 08:53:47.000000000 -0800
-+++ InOut/winFLTK.c	2014-02-12 23:47:05.000000000 -0800
+--- InOut/winFLTK.c.orig	2014-05-04 04:49:41.000000000 -0700
++++ InOut/winFLTK.c	2014-08-04 22:18:13.000000000 -0700
 @@ -29,7 +29,7 @@
  #include <stdio.h>
  #include "cwindow.h"
@@ -23,7 +23,7 @@ Add NetBSD and DragonFlyBSD support.
        if (dpy != NULL) {
          XCloseDisplay(dpy);
 @@ -104,7 +104,7 @@
-           csound->Message(csound, "graph init \n");
+           csound->Message(csound, "graph init... \n");
  
          }
 -#ifdef LINUX
diff --git a/audio/csound6/patches/patch-Opcodes_cpumeter.c b/audio/csound6/patches/patch-Opcodes_cpumeter.c
index c4f0dfa4254..2601efb97ee 100644
--- a/audio/csound6/patches/patch-Opcodes_cpumeter.c
+++ b/audio/csound6/patches/patch-Opcodes_cpumeter.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-Opcodes_cpumeter.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-Opcodes_cpumeter.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
 be best to patch this to use eg, getloadavg() or something not /proc.
 
---- Opcodes/cpumeter.c.orig	2014-01-07 08:53:48.000000000 -0800
-+++ Opcodes/cpumeter.c	2014-02-12 23:36:40.000000000 -0800
-@@ -16,7 +16,7 @@
-  *
+--- Opcodes/cpumeter.c.orig	2014-05-04 04:49:41.000000000 -0700
++++ Opcodes/cpumeter.c	2014-08-04 22:19:34.000000000 -0700
+@@ -17,7 +17,7 @@
   */
  
--#if defined(__MACH__) || defined(LINUX)
-+#if defined(__MACH__) || defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+ // only available on Linux (no /proc/stat on OSX)
+-#if defined(LINUX)
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
  
  #include "csoundCore.h"
  #include <sys/resource.h>
diff --git a/audio/csound6/patches/patch-Top_csmodule.c b/audio/csound6/patches/patch-Top_csmodule.c
index 6a4e64e18a6..e2f3540ba37 100644
--- a/audio/csound6/patches/patch-Top_csmodule.c
+++ b/audio/csound6/patches/patch-Top_csmodule.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-Top_csmodule.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-Top_csmodule.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
 
 Fix the installation path for csound6 plugins.
 Add NetBSD and DragonFlyBSD support.
 
---- Top/csmodule.c.orig	2014-01-07 08:54:20.000000000 -0800
-+++ Top/csmodule.c	2014-02-13 02:01:01.000000000 -0800
+--- Top/csmodule.c.orig	2014-05-04 04:49:41.000000000 -0700
++++ Top/csmodule.c	2014-08-04 22:20:35.000000000 -0700
 @@ -89,7 +89,7 @@
  #endif
  
@@ -41,7 +41,7 @@ Add NetBSD and DragonFlyBSD support.
        char ERRSTR[256];
 -#if !(defined(NACL)) && defined(LINUX)
 +#if !(defined(NACL)) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__))
-       sprintf(ERRSTR, Str("could not open library '%s' (%s)"),
+       snprintf(ERRSTR, 256, Str("could not open library '%s' (%s)"),
                        libraryPath, dlerror());
   #else
 @@ -684,7 +684,7 @@
diff --git a/audio/csound6/patches/patch-Top_one_file.c b/audio/csound6/patches/patch-Top_one_file.c
index 6c0a417e5b5..a5c4082a6f2 100644
--- a/audio/csound6/patches/patch-Top_one_file.c
+++ b/audio/csound6/patches/patch-Top_one_file.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-Top_one_file.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-Top_one_file.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- Top/one_file.c.orig	2014-01-07 08:54:20.000000000 -0800
-+++ Top/one_file.c	2014-02-12 23:53:28.000000000 -0800
+--- Top/one_file.c.orig	2014-05-04 04:49:41.000000000 -0700
++++ Top/one_file.c	2014-08-04 22:21:26.000000000 -0700
 @@ -29,7 +29,7 @@
  #include <stdlib.h>
  #include "corfile.h"
@@ -13,16 +13,16 @@ Add NetBSD and DragonFlyBSD support.
  #  include <sys/types.h>
  #  include <sys/stat.h>
  #endif
-@@ -77,7 +77,7 @@
+@@ -62,7 +62,7 @@
  {
-     size_t  nBytes = 256;
+ #define   nBytes (256)
      char lbuf[256];
 -#if defined(LINUX) || defined(__MACH__)
 +#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
      struct stat tmp;
  #elif defined(WIN32)
      struct _stat tmp;
-@@ -109,7 +109,7 @@
+@@ -94,7 +94,7 @@
        }
  #endif
        if (ext != NULL && ext[0] != (char) 0) {
@@ -31,7 +31,7 @@ Add NetBSD and DragonFlyBSD support.
          char  *p;
          /* remove original extension (does not work on OS X */
          /* and may be a bad idea) */
-@@ -129,7 +129,7 @@
+@@ -114,7 +114,7 @@
            } while (lbuf[i] != '\0');
        }
  #endif