[pkgsrc/trunk]: pkgsrc/audio/csound5 Fix compilation.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5350843d3c01
branches:  trunk
changeset: 396777:5350843d3c01
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 03 13:28:22 2009 +0000

description:
Fix compilation.

diffstat:

 audio/csound5/distinfo         |   4 ++--
 audio/csound5/patches/patch-ai |  22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r f03cac1070f2 -r 5350843d3c01 audio/csound5/distinfo
--- a/audio/csound5/distinfo    Mon Aug 03 13:18:37 2009 +0000
+++ b/audio/csound5/distinfo    Mon Aug 03 13:28:22 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/01/02 12:53:55 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/08/03 13:28:22 joerg Exp $
 
 SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
 RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
@@ -9,7 +9,7 @@
 SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c
 SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58
 SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4
-SHA1 (patch-ai) = 4c86c1cd8c6c9ff48cd890255523b08848d56764
+SHA1 (patch-ai) = b7e079331053e555ce39df425e092715a6232d56
 SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54
 SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
 SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636
diff -r f03cac1070f2 -r 5350843d3c01 audio/csound5/patches/patch-ai
--- a/audio/csound5/patches/patch-ai    Mon Aug 03 13:18:37 2009 +0000
+++ b/audio/csound5/patches/patch-ai    Mon Aug 03 13:28:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2009/08/03 13:28:22 joerg Exp $
 
---- InOut/widgets.cpp.orig     2006-02-15 10:25:55.000000000 -0800
+--- InOut/widgets.cpp.orig     2006-02-15 19:25:55.000000000 +0100
 +++ InOut/widgets.cpp
 @@ -29,7 +29,7 @@
  #  include <windows.h>
@@ -20,3 +20,21 @@
    {
      struct sched_param  sp;
      // IV - Aug 27 2002: widget thread is always run with normal priority
+@@ -2579,7 +2579,7 @@ extern "C" int fl_setTextType(CSOUND *cs
+   return OK;
+ }
+ 
+-extern "C" int fl_box(CSOUND *csound, FL_BOX *p)
++extern "C" int my_fl_box(CSOUND *csound, FL_BOX *p)
+ {
+   char *text = GetString(csound, p->itext, p->XSTRCODE);
+   Fl_Box *o =  new Fl_Box((int)*p->ix, (int)*p->iy,
+@@ -3612,7 +3612,7 @@ static OENTRY localops[] = {
+     { "FLsetAlign",     S(FL_TALIGN),           1,  "",     "ii",
+         (SUBR) fl_align,                (SUBR) NULL,              (SUBR) NULL },
+     { "FLbox",          S(FL_BOX),              1,  "i",    "Tiiiiiii",
+-        (SUBR) fl_box,                  (SUBR) NULL,              (SUBR) NULL },
++        (SUBR) my_fl_box,             (SUBR) NULL,              (SUBR) NULL },
+     { "FLvalue",        S(FLVALUE),             1,  "i",    "Tjjjj",
+         (SUBR) fl_value,                (SUBR) NULL,              (SUBR) NULL },
+     { "FLpanel",        S(FLPANEL),             1,  "",     "Tjjooo",