Make it work under FreeBSD-current.

There no longer seems to be a __byte_swap_word().

stdin/stdout are no longer static objects, thus can't be used in
global initializers anymore (foo!). :-(

2 files changed, 16 insertions, 26 deletions

diff --git a/audio/timidity/files/patch-af b/audio/timidity/files/patch-af
index c1610885e266..dad932efd2fc 100644
--- a/audio/timidity/files/patch-af
+++ b/audio/timidity/files/patch-af
@@ -25,29 +25,3 @@
   /* Win32 on Intel machines */
   #ifdef __WIN32__
   #  define LITTLE_ENDIAN
-***************
-*** 254,266 ****
---- 270,292 ----
-  #ifdef LITTLE_ENDIAN
-  #define LE_SHORT(x) x
-  #define LE_LONG(x) x
-+ #if defined(__FreeBSD__) && !defined(__alpha__)
-+ #define BE_SHORT(x) __byte_swap_word(x)
-+ #define BE_LONG(x) __byte_swap_long(x)
-+ #else
-  #define BE_SHORT(x) XCHG_SHORT(x)
-  #define BE_LONG(x) XCHG_LONG(x)
-+ #endif
-  #else
-  #define BE_SHORT(x) x
-  #define BE_LONG(x) x
-+ #ifdef __FreeBSD__
-+ #define LE_SHORT(x) __byte_swap_word(x)
-+ #define LE_LONG(x) __byte_swap_long(x)
-+ #else
-  #define LE_SHORT(x) XCHG_SHORT(x)
-  #define LE_LONG(x) XCHG_LONG(x)
-+ #endif
-  #endif
-  
-  #define MAX_AMPLIFICATION 800
diff --git a/audio/timidity/files/patch-dumb_c.c b/audio/timidity/files/patch-dumb_c.c
new file mode 100644
index 000000000000..d143d75c04da
--- /dev/null
+++ b/audio/timidity/files/patch-dumb_c.c
@@ -0,0 +1,16 @@
+--- dumb_c.c.orig	Mon May 20 16:01:17 1996
++++ dumb_c.c	Tue Dec  4 23:45:01 2001
+@@ -66,10 +66,12 @@
+   ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend
+ };
+ 
+-static FILE *infp=stdin, *outfp=stdout; /* infp isn't actually used yet */
++static FILE *infp, *outfp; /* infp isn't actually used yet */
+ 
+ static int ctl_open(int using_stdin, int using_stdout)
+ {
++  infp = stdin;
++  outfp = stdout;
+   if (using_stdin && using_stdout)
+     infp=outfp=stderr;
+   else if (using_stdout)