3 files changed, 24 insertions, 11 deletions

diff --git a/audio/vorbis-tools/files/patch-ogg123_speex_format.c b/audio/vorbis-tools/files/patch-ogg123_speex_format.c
deleted file mode 100644
index db3ac5de45c5..000000000000
--- a/audio/vorbis-tools/files/patch-ogg123_speex_format.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogg123/speex_format.c.orig	2008-05-11 17:57:48.000000000 +0200
-+++ ogg123/speex_format.c	2008-05-11 17:58:19.000000000 +0200
-@@ -475,7 +475,7 @@ void *process_header(ogg_packet *op, int
-            cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
-      return NULL;
-    }
--   if ((*header)->mode >= SPEEX_NB_MODES) {
-+   if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
-      cb->printf_error(callback_arg, ERROR, 
- 		      _("Mode number %d does not (any longer) exist in this version"),
- 	      (*header)->mode);
diff --git a/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c b/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c
new file mode 100644
index 000000000000..2a57c64d013f
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- ogg123/vorbis_comments.c.orig	2010-06-05 16:48:23.000000000 +0200
++++ ogg123/vorbis_comments.c	2010-06-05 16:55:21.000000000 +0200
+@@ -72,7 +72,7 @@ char *lookup_comment_prettyprint (char *
+ 
+   /* Use default formatting */
+   j = strcspn(comment, "=");
+-  if (j) {
++  if (j != strlen(comment)) {
+     *offset = j + 1;
+     s = malloc(j + 2);
+     if (s == NULL) {
diff --git a/audio/vorbis-tools/files/patch-oggenc_lyrics.c b/audio/vorbis-tools/files/patch-oggenc_lyrics.c
new file mode 100644
index 000000000000..a496678c03fc
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-oggenc_lyrics.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- oggenc/lyrics.c.orig	2010-06-05 17:00:07.000000000 +0200
++++ oggenc/lyrics.c	2010-06-05 17:00:17.000000000 +0200
+@@ -16,7 +16,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+