5 files changed, 21 insertions, 21 deletions

diff --git a/audio/bristol/files/patch-bin_startBristol.in b/audio/bristol/files/patch-bin_startBristol.in
index 2ef201ac8607..d845f2e16374 100644
--- a/audio/bristol/files/patch-bin_startBristol.in
+++ b/audio/bristol/files/patch-bin_startBristol.in
@@ -1,6 +1,6 @@
---- bin/startBristol.in.orig	2012-04-27 13:07:18.000000000 +0200
-+++ bin/startBristol.in	2012-09-24 13:30:26.589848964 +0200
-@@ -39,14 +39,19 @@
+--- bin/startBristol.in.orig	2012-04-27 11:07:18 UTC
++++ bin/startBristol.in
+@@ -39,14 +39,19 @@ FREQ=0
  #PORT=5028
  # Randomise the port numbers, can be overridden by -port which would be a
  # requirement for multitimbral
@@ -27,7 +27,7 @@
  fi
  
  valgrind=0
-@@ -497,12 +502,12 @@
+@@ -497,12 +502,12 @@ if [ $engine = 1 ]; then
  		fi
  	else
  		echo checking availability of TCP port $PORT
diff --git a/audio/bristol/files/patch-bristol-bristol.c b/audio/bristol/files/patch-bristol_bristol.c
index e98e58d1f7a3..e53e31dea611 100644
--- a/audio/bristol/files/patch-bristol-bristol.c
+++ b/audio/bristol/files/patch-bristol_bristol.c
@@ -1,5 +1,5 @@
---- bristol/bristol.c.orig	2012-04-27 13:04:28.000000000 +0200
-+++ bristol/bristol.c	2012-09-24 15:43:08.299853839 +0200
+--- bristol/bristol.c.orig	2012-04-27 11:04:28 UTC
++++ bristol/bristol.c
 @@ -27,7 +27,11 @@
  #include <unistd.h>
  #include <pthread.h>
diff --git a/audio/bristol/files/patch-libbristolaudio-audioEngine.c b/audio/bristol/files/patch-libbristolaudio-audioEngine.c
deleted file mode 100644
index c8802e81d6cf..000000000000
--- a/audio/bristol/files/patch-libbristolaudio-audioEngine.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libbristolaudio/audioEngine.c.orig	2012-04-27 13:04:29.000000000 +0200
-+++ libbristolaudio/audioEngine.c	2012-09-24 15:41:49.609845763 +0200
-@@ -59,8 +59,10 @@
- #include <fcntl.h>
- #ifdef SUBFRAGMENT
- #include <stdlib.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
- #endif
-+#endif
- 
- #include <sys/ioctl.h>
- 
diff --git a/audio/bristol/files/patch-libbristolaudio_audioEngine.c b/audio/bristol/files/patch-libbristolaudio_audioEngine.c
new file mode 100644
index 000000000000..bf2b7c5d2a7c
--- /dev/null
+++ b/audio/bristol/files/patch-libbristolaudio_audioEngine.c
@@ -0,0 +1,13 @@
+--- libbristolaudio/audioEngine.c.orig	2012-04-27 11:04:29 UTC
++++ libbristolaudio/audioEngine.c
+@@ -59,8 +59,10 @@ extern int alsaDevAudioStart(duplexDev *
+ #include <fcntl.h>
+ #ifdef SUBFRAGMENT
+ #include <stdlib.h>
++#ifndef __FreeBSD__
+ #include <malloc.h>
+ #endif
++#endif
+ 
+ #include <sys/ioctl.h>
+ 
diff --git a/audio/bristol/files/patch-libbristolaudio-audioGUIOSS.c b/audio/bristol/files/patch-libbristolaudio_audioGUIOSS.c
index cc07057ab980..06d1592d19c6 100644
--- a/audio/bristol/files/patch-libbristolaudio-audioGUIOSS.c
+++ b/audio/bristol/files/patch-libbristolaudio_audioGUIOSS.c
@@ -1,5 +1,5 @@
---- libbristolaudio/audioGUIOSS.c.orig	2012-04-27 13:04:29.000000000 +0200
-+++ libbristolaudio/audioGUIOSS.c	2012-09-24 15:42:10.570849586 +0200
+--- libbristolaudio/audioGUIOSS.c.orig	2012-04-27 11:04:29 UTC
++++ libbristolaudio/audioGUIOSS.c
 @@ -50,7 +50,9 @@
  #include <unistd.h>
  #include <fcntl.h>