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

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

3 files changed, 39 insertions, 0 deletions

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*);