From 4c30502baa54e0bb4c2afe5d5ac3fb6429a325a0 Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Thu, 13 Feb 2003 13:10:40 +0000
Subject: [PATCH] Reduce compiler warning on -CURRENT.

PR:		ports/48231
Submitted by:	Andrew Lankford <arlankfo@141.com>
---
 audio/timidity/files/patch-ae |  4 +-
 audio/timidity/files/patch-ag | 87 +++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 audio/timidity/files/patch-ag

diff --git a/audio/timidity/files/patch-ae b/audio/timidity/files/patch-ae
index 1c8b9c92d5fb..bc2666e7cfc4 100644
--- a/audio/timidity/files/patch-ae
+++ b/audio/timidity/files/patch-ae
@@ -19,7 +19,7 @@
      can't handle either, let me know. */
   
 + /* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
-+ static luigi_driver = 0;
++ static int luigi_driver = 0;
 + 
   static int open_output(void)
   {
@@ -48,7 +48,7 @@
 +     if (i != -1)
 +       luigi_driver = 1;
 +   }
-+ #endif defined (AIOGFMT)
++ #endif
 + 
 +   ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 + 	    luigi_driver ? "luigi" : "VoxWare");
diff --git a/audio/timidity/files/patch-ag b/audio/timidity/files/patch-ag
new file mode 100644
index 000000000000..2d24e035ec23
--- /dev/null
+++ b/audio/timidity/files/patch-ag
@@ -0,0 +1,87 @@
+--- common.c	2003/02/08 01:42:31	1.1
++++ common.c	2003/02/08 01:53:36
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(SOLARIS) || defined(__WIN32__)
++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
+ #include <string.h>
+ #else
+ #include <strings.h>
+--- instrum.c	2003/02/08 01:42:31	1.1
++++ instrum.c	2003/02/08 01:53:50
+@@ -25,7 +25,7 @@
+ 
+ #include <stdio.h>
+ 
+-#if defined(SOLARIS) || defined(__WIN32__)
++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
+ #include <string.h>
+ #else
+ #include <strings.h>
+--- playmidi.c	2003/02/08 01:42:31	1.1
++++ playmidi.c	2003/02/08 01:54:18
+@@ -27,7 +27,7 @@
+ #endif
+ #include <stdlib.h>
+ 
+-#if defined(SOLARIS) || defined(__WIN32__)
++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
+ # include <string.h>
+ #else
+ #include <strings.h>
+--- raw_a.c	2003/02/08 01:42:31	1.1
++++ raw_a.c	2003/02/08 01:54:38
+@@ -35,6 +35,7 @@
+ 
+ #ifdef __FreeBSD__
+ #include <stdio.h>
++#include <string.h>
+ #endif
+ 
+ #include "config.h"
+--- readmidi.c	2003/02/08 01:42:31	1.1
++++ readmidi.c	2003/02/08 01:53:19
+@@ -23,7 +23,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
+-#if defined(SOLARIS) | defined(__WIN32__)
++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
+ # include <string.h>
+ #else
+ #include <strings.h>
+--- timidity.c	2003/02/08 01:42:31	1.1
++++ timidity.c	2003/02/08 01:54:51
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#if defined(SOLARIS) || defined(__WIN32__)
++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
+ #include <string.h>
+ #else
+ #include <strings.h>
+--- wav2pat.c	2003/02/08 01:42:31	1.1
++++ wav2pat.c	2003/02/08 01:55:29
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
+-#ifdef SOLARIS
++#if defined(SOLARIS) || defined(__FreeBSD__)
+ #include <string.h>
+ #else
+ #include <strings.h>
+--- wave_a.c	2003/02/08 01:42:31	1.1
++++ wave_a.c	2003/02/08 01:55:45
+@@ -35,6 +35,7 @@
+ 
+ #ifdef __FreeBSD__
+ #include <stdio.h>
++#include <string.h>
+ #endif
+ 
+ #include "config.h"
+