A gettext-like function is not printf-like, but passing the first

argument semantically through. Rename macro used as template parameter
in newer Boost.

4 files changed, 43 insertions, 1 deletions

diff --git a/audio/csound6/distinfo b/audio/csound6/distinfo
index 8b02c5093a0..1732b1a44df 100644
--- a/audio/csound6/distinfo
+++ b/audio/csound6/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:12:27 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/03/29 22:06:48 joerg Exp $
 
 SHA1 (Csound6.03.2.tar.gz) = 2ff8081c887ef98735197c1ff70bb4955c3eb3ff
 RMD160 (Csound6.03.2.tar.gz) = 00d6407feab8f992b8d309ec6701858087569752
 SHA512 (Csound6.03.2.tar.gz) = 01cea31349632ecf3692a23535793c1cd622669e07a9035e1ee80d6ad117e8d0296d2ece78635fee8a73eb5ba53d2b03a8b895f0b2a9a74ae015288243445c1b
 Size (Csound6.03.2.tar.gz) = 24571513 bytes
 SHA1 (patch-CMakeLists.txt) = 47e77bb65a091a8925893f4cf7bc76efc5080110
+SHA1 (patch-Engine_entry1.c) = 915c11cb182ad9375ec0f034f1adfde009131aa4
 SHA1 (patch-Engine_linevent.c) = da606596a1c8d2545dc0a8e948cd04e9188975ad
 SHA1 (patch-InOut_libsnd.c) = b460ef3ef7117fd9c194eff3f62a64435243ccc4
 SHA1 (patch-InOut_widgets.cpp) = f73a58a636254d27a3aa6b94ace4f72b978ca9ec
@@ -17,3 +18,5 @@ SHA1 (patch-Top_csound.c) = 26c03324e0f8f8ccedbfe32bfedbd282d69a93fa
 SHA1 (patch-Top_one_file.c) = c5929f9efcf8c11625fde7a86321f2fd303b55d2
 SHA1 (patch-Top_threads.c) = 107cb8605b5b46b70de3adeec0ae8acaafc2a6f2
 SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = a16da9c4975d37e56fefb58fd0458e94c3ed4925
+SHA1 (patch-include_interlocks.h) = 60bbb3a92ccb4d52665db58042de4a7caabfa5f2
+SHA1 (patch-include_text.h) = fc3c164c3740b2c595113dd7811506abb29402d0
diff --git a/audio/csound6/patches/patch-Engine_entry1.c b/audio/csound6/patches/patch-Engine_entry1.c
new file mode 100644
index 00000000000..e102e71561d
--- /dev/null
+++ b/audio/csound6/patches/patch-Engine_entry1.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-Engine_entry1.c,v 1.1 2016/03/29 22:06:48 joerg Exp $
+
+--- Engine/entry1.c.orig	2016-03-28 17:51:03.964243385 +0000
++++ Engine/entry1.c
+@@ -1084,7 +1084,7 @@ OENTRY opcodlst_1[] = {
+     (SUBR) chnset_opcode_init_a, (SUBR) NULL, (SUBR) notinit_opcode_stub },
+   { "chnset.S",    S(CHNGET),0,           3,      "",             "SS",
+     (SUBR) chnset_opcode_init_S, (SUBR) chnset_opcode_perf_S, (SUBR) NULL },
+-  { "chnmix",      S(CHNGET),           CB, 5,      "",             "aS",
++  { "chnmix",      S(CHNGET),           CSOUND_CB, 5,      "",             "aS",
+     (SUBR) chnmix_opcode_init, (SUBR) NULL, (SUBR) notinit_opcode_stub  },
+   { "chnclear",    S(CHNCLEAR),        CW, 5,      "",             "S",
+     (SUBR) chnclear_opcode_init, (SUBR) NULL, (SUBR) notinit_opcode_stub },
diff --git a/audio/csound6/patches/patch-include_interlocks.h b/audio/csound6/patches/patch-include_interlocks.h
new file mode 100644
index 00000000000..60981d49b72
--- /dev/null
+++ b/audio/csound6/patches/patch-include_interlocks.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_interlocks.h,v 1.1 2016/03/29 22:06:48 joerg Exp $
+
+--- include/interlocks.h.orig	2016-03-28 17:49:58.186898677 +0000
++++ include/interlocks.h
+@@ -37,7 +37,7 @@
+ //Channels
+ #define CR (0x0020)
+ #define CW (0x0040)
+-#define CB (0x0060)
++#define CSOUND_CB (0x0060)
+ 
+ //Stack
+ #define SK (0x0080)
diff --git a/audio/csound6/patches/patch-include_text.h b/audio/csound6/patches/patch-include_text.h
new file mode 100644
index 00000000000..e5652f97848
--- /dev/null
+++ b/audio/csound6/patches/patch-include_text.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_text.h,v 1.1 2016/03/29 22:06:48 joerg Exp $
+
+--- include/text.h.orig	2016-03-28 17:47:57.518957272 +0000
++++ include/text.h
+@@ -111,7 +111,7 @@ extern "C" {
+ #endif
+ #include <libintl.h>
+   char *csoundLocalizeString(const char *s)
+-     __attribute__ ((format (printf, 1,0)));
++     __attribute__ ((format_arg (1)));
+   /* This could be gettext but this indirection helps debugging */
+ #define Str(x) csoundLocalizeString(x)
+   void init_getstring(void*);