Update to 1.2.0:

vorbis-tools 1.2.0 -- 2008-02-21

 * FLAC support now relies on libFLAC
 * Support for large files
 * Fixed acinclude.m4 to properly support --no switches
 * ogg123: added remote control support
 * ogg123: fixed a bug in esd when pressing CTRL + C
 * ogg123: fixed a type mismatch in option parsing for 64 bit systems
 * ogg123: configuration no longer hardcoded to /etc
 * oggdec: limited support for chained Ogg bitstreams
 * ogg123: compiles with older versions of libcurl
 * oggdec: support decoding of multiple files into a single one
 * oggenc: -k, switch for Skeleton bitstream encoding
 * oggenc: fixed issues with Skeleton on big endian systems
 * oggenc: proper 5.1 channel mapping support
 * oggenc: FLAC module does not confuse every Ogg file as its own
 * oggenc: compiles with older versions of libvorbis
 * ogginfo: recognizes Skeleton, Dirac, FLAC and Kate bitstreams
 * vcut: solved issues described in ticket #1313
 * vorbiscomment: support for creation of long comments
 * vorbiscomment: support for multiplexed Vorbis
 * Several minor bug fixes

16 files changed, 51 insertions, 670 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 099f2ebcfe6..f80a1285569 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2008/01/18 05:06:21 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2008/03/14 18:55:54 wiz Exp $
 
-DISTNAME=	vorbis-tools-1.1.1
-PKGREVISION=	6
+DISTNAME=	vorbis-tools-1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index cf1377681f2..1cb0f117d07 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,20 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/01/13 15:35:52 wiz Exp $
+$NetBSD: distinfo,v 1.20 2008/03/14 18:55:54 wiz Exp $
 
-SHA1 (vorbis-tools-1.1.1.tar.gz) = a1394b39905b389d72f12c2a9f0c86a33d07a487
-RMD160 (vorbis-tools-1.1.1.tar.gz) = ed38929b8a81f833f726e489e55e9f62d5ed69ec
-Size (vorbis-tools-1.1.1.tar.gz) = 948837 bytes
-SHA1 (patch-aa) = 2adc912765d58b19c1285c12ac0935b860b7da34
+SHA1 (vorbis-tools-1.2.0.tar.gz) = c5c5ee4637ab8c9fc953d203663b7264432f874a
+RMD160 (vorbis-tools-1.2.0.tar.gz) = 8cb6925c6e4e69373b6c91ff20d7ed8d75153b7c
+Size (vorbis-tools-1.2.0.tar.gz) = 1076814 bytes
+SHA1 (patch-aa) = a9fe36760479678df09f840671c515e0d9f37796
 SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9
-SHA1 (patch-ac) = 65e07de0f0e4de30b6fed374146535adebba5ed6
-SHA1 (patch-ad) = 729ca84168ee781335429840ee54a2b894b82f54
-SHA1 (patch-ae) = 67bda1581c18dec0e43846f4c39aba35a7b2223e
-SHA1 (patch-af) = eafb75d8b9aade62b9862e3df1380f15eba80f47
-SHA1 (patch-ag) = af25e010e1eb350a8614398d312dd0842a207060
-SHA1 (patch-ah) = fa01e42b339fe2cbd5d98c150e0bb618b43fd4a1
-SHA1 (patch-ai) = c44c9b0bec99b0e8a3883c0ef388f6d0856fa11a
-SHA1 (patch-aj) = 8cfa93518f71feb1e85f4db784d5e5c158dcf11e
-SHA1 (patch-ak) = fb0e11d1aff4753fbb3ee9088e6faeb5bcd58ef1
-SHA1 (patch-an) = a6a1aa59f2bf87b2217e827e6309233515d162c2
-SHA1 (patch-ao) = f509dde919b93ddfba0105189cb645c2667ba0e4
-SHA1 (patch-ap) = 4da7c1a2b92dad4a05322b05451a1ac4c34ce2fb
-SHA1 (patch-aq) = 237bbcb6c4d895dcd01f42cae5a48f11d2a695b1
+SHA1 (patch-ac) = 53065c4db39f7e975712c2cba51ff5542cf5a77f
diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
index 2b81ed75bcc..002aac2dbc7 100644
--- a/audio/vorbis-tools/patches/patch-aa
+++ b/audio/vorbis-tools/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/12/08 14:43:48 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2008/03/14 18:55:54 wiz Exp $
 
---- ogg123/buffer.c.orig	Mon Sep  1 22:15:19 2003
+--- ogg123/buffer.c.orig	2008-03-03 05:37:26.000000000 +0000
 +++ ogg123/buffer.c
-@@ -412,7 +412,9 @@ void buffer_reset (buf_t *buf)
+@@ -419,7 +419,9 @@ void buffer_reset (buf_t *buf)
  
    /* Cleanup pthread variables */
    pthread_mutex_destroy(&buf->mutex);
@@ -10,5 +10,5 @@ $NetBSD: patch-aa,v 1.9 2003/12/08 14:43:48 wiz Exp $
    pthread_cond_destroy(&buf->write_cond);
 +  COND_SIGNAL(buf->playback_cond);
    pthread_cond_destroy(&buf->playback_cond);
-   
+ 
    /* Reinit pthread variables */
diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac
index 2b59c61f8ad..100caaa2427 100644
--- a/audio/vorbis-tools/patches/patch-ac
+++ b/audio/vorbis-tools/patches/patch-ac
@@ -1,46 +1,46 @@
-$NetBSD: patch-ac,v 1.7 2007/01/13 15:35:52 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2008/03/14 18:55:54 wiz Exp $
 
---- oggenc/oggenc.c.orig	2005-06-03 10:15:10.000000000 +0000
+--- oggenc/oggenc.c.orig	2008-03-03 05:37:27.000000000 +0000
 +++ oggenc/oggenc.c
-@@ -659,6 +659,8 @@ static void parse_options(int argc, char
+@@ -676,6 +676,8 @@ static void parse_options(int argc, char
  
- 				break;
- 			case 'a':
-+				if (strlen(optarg) == 0)
-+					break;
- 				opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *));
- 				opt->artist[opt->artist_count - 1] = strdup(optarg);
- 				break;
-@@ -671,10 +673,14 @@ static void parse_options(int argc, char
- 				opt->comments[opt->comment_count - 1] = strdup(optarg);
- 				break;
- 			case 'd':
-+				if (strlen(optarg) == 0)
-+					break;
- 				opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *));
- 				opt->dates[opt->date_count - 1] = strdup(optarg);
- 				break;
+                 break;
+             case 'a':
++		if (strlen(optarg) == 0)
++			break;
+                 opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *));
+                 opt->artist[opt->artist_count - 1] = strdup(optarg);
+                 break;
+@@ -688,10 +690,14 @@ static void parse_options(int argc, char
+                 opt->comments[opt->comment_count - 1] = strdup(optarg);
+                 break;
+             case 'd':
++		if (strlen(optarg) == 0)
++			break;
+                 opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *));
+                 opt->dates[opt->date_count - 1] = strdup(optarg);
+                 break;
              case 'G':
-+				if (strlen(optarg) == 0)
-+					break;
++		if (strlen(optarg) == 0)
++			break;
                  opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *));
                  opt->genre[opt->genre_count - 1] = strdup(optarg);
                  break;
-@@ -683,6 +689,8 @@ static void parse_options(int argc, char
- 				exit(0);
- 				break;
- 			case 'l':
-+				if (strlen(optarg) == 0)
-+					break;
- 				opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *));
- 				opt->album[opt->album_count - 1] = strdup(optarg);
- 				break;
-@@ -693,6 +701,8 @@ static void parse_options(int argc, char
- 					opt->serial = 0; /* Failed, so just set to zero */
- 				break;
- 			case 't':
-+				if (strlen(optarg) == 0)
-+					break;
- 				opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *));
- 				opt->title[opt->title_count - 1] = strdup(optarg);
- 				break;
+@@ -700,6 +706,8 @@ static void parse_options(int argc, char
+                 exit(0);
+                 break;
+             case 'l':
++		if (strlen(optarg) == 0)
++			break;
+                 opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *));
+                 opt->album[opt->album_count - 1] = strdup(optarg);
+                 break;
+@@ -712,6 +720,8 @@ static void parse_options(int argc, char
+                                     opt->fixedserial = 1;
+                 break;
+             case 't':
++		if (strlen(optarg) == 0)
++			break;
+                 opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *));
+                 opt->title[opt->title_count - 1] = strdup(optarg);
+                 break;
diff --git a/audio/vorbis-tools/patches/patch-ad b/audio/vorbis-tools/patches/patch-ad
deleted file mode 100644
index d3616a9f0e3..00000000000
--- a/audio/vorbis-tools/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/03 15:59:13 joerg Exp $
-
---- ogg123/playlist.c.orig	2005-08-17 20:03:15.000000000 +0000
-+++ ogg123/playlist.c
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/audio/vorbis-tools/patches/patch-ae b/audio/vorbis-tools/patches/patch-ae
deleted file mode 100644
index 57d938c5963..00000000000
--- a/audio/vorbis-tools/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/20 20:08:59 rillig Exp $
-
-ISO-C90 fix.
-
---- oggenc/encode.c.orig	Fri Jun  3 12:15:10 2005
-+++ oggenc/encode.c	Thu Oct 20 22:06:18 2005
-@@ -160,6 +160,8 @@ int oe_encode(oe_enc_opt *opt)
-         /* do we have optional hard bitrate restrictions? */
-         if(opt->max_bitrate > 0 || opt->min_bitrate > 0){
-             struct ovectl_ratemanage2_arg ai;
-+            long bitrate;
-+
- 	        vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai);
- 
-             /* libvorbis 1.1 (and current svn) doesn't actually fill this in,
-@@ -173,7 +175,6 @@ int oe_encode(oe_enc_opt *opt)
-                Also, note that this won't work correctly unless you have a very
-                recent (2005/03/04 or later) version of libvorbis from svn).
-              */
--            long bitrate;
- 
-             {
-                 vorbis_info vi2;
diff --git a/audio/vorbis-tools/patches/patch-af b/audio/vorbis-tools/patches/patch-af
deleted file mode 100644
index 47b3b51b19e..00000000000
--- a/audio/vorbis-tools/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/11/02 07:57:56 wiz Exp $
-
---- ogg123/http_transport.c.orig	2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/http_transport.c
-@@ -116,7 +116,6 @@ void set_curl_opts (http_private_t *priv
-   if (inputOpts.ProxyTunnel)
-     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
-   */
--  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
-   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/audio/vorbis-tools/patches/patch-ag b/audio/vorbis-tools/patches/patch-ag
deleted file mode 100644
index 25cc4975623..00000000000
--- a/audio/vorbis-tools/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- configure.ac.orig	2005-06-27 09:25:51.000000000 +0000
-+++ configure.ac
-@@ -171,13 +171,8 @@ FLAC_LIBS=""
- if test "x$build_flac" = xyes; then
-   AC_CHECK_LIB(m,log,FLAC_LIBS="-lm")
-   AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
--    [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
-+    [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS"],
-     AC_MSG_WARN([libFLAC missing])
--    have_libFLAC=no, [$FLAC_LIBS]
--  )
--  AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
--    [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
--    AC_MSG_WARN([libOggFLAC missing])
-     have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
-   )
-   AC_CHECK_HEADER(FLAC/stream_decoder.h,,
diff --git a/audio/vorbis-tools/patches/patch-ah b/audio/vorbis-tools/patches/patch-ah
deleted file mode 100644
index 6fab9e5426d..00000000000
--- a/audio/vorbis-tools/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/Makefile.am.orig	2005-06-13 13:11:44.000000000 +0000
-+++ ogg123/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- if HAVE_LIBFLAC
--flac_sources = flac_format.c easyflac.c easyflac.h 
-+flac_sources = flac_format.c
- else
- flac_sources =
- endif
diff --git a/audio/vorbis-tools/patches/patch-ai b/audio/vorbis-tools/patches/patch-ai
deleted file mode 100644
index 9ec1366902f..00000000000
--- a/audio/vorbis-tools/patches/patch-ai
+++ /dev/null
@@ -1,208 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/flac_format.c.orig	2005-06-03 10:15:09.000000000 +0000
-+++ ogg123/flac_format.c
-@@ -25,13 +25,23 @@
- #include "audio.h"
- #include "format.h"
- #include "i18n.h"
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#else
-+#include <FLAC/stream_decoder.h>
-+#endif
- #include "vorbis_comments.h"
- 
--#define DEFAULT_FLAC_FRAME_SIZE 4608
--
- typedef struct {
-+#if NEED_EASYFLAC
-   EasyFLAC__StreamDecoder *decoder;
-+#else
-+  FLAC__StreamDecoder *decoder;
-+  int is_oggflac;
-+#endif
-   short channels;
-   int rate;
-   int bits_per_sample;
-@@ -67,10 +77,18 @@ format_t oggflac_format;
- 
- 
- /* Private functions declarations */
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
- 
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples);
- /*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/
-@@ -155,6 +173,7 @@ decoder_t* flac_init (data_source_t *sou
-   private->buf_start = 0;
-   
-   /* Setup FLAC decoder */
-+#if NEED_EASYFLAC
-   if (oggflac_can_decode(source)) {
-     decoder->format = &oggflac_format;
-     private->decoder = EasyFLAC__stream_decoder_new(1);
-@@ -172,13 +191,39 @@ decoder_t* flac_init (data_source_t *sou
-   EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-   EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-   EasyFLAC__init(private->decoder);
-+#else
-+  if (oggflac_can_decode(source)) {
-+    private->is_oggflac = 1;
-+    decoder->format = &oggflac_format;
-+  } else {
-+    private->is_oggflac = 0;
-+    decoder->format = &flac_format;
-+  }
-+  private->decoder = FLAC__stream_decoder_new();
-+
-+  FLAC__stream_decoder_set_md5_checking(private->decoder, false);
-+  FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+  FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+  if(private->is_oggflac)
-+    FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+  else
-+    FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+#endif
-   
-   /* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
-   EasyFLAC__process_until_end_of_metadata(private->decoder);
-+#else
-+  FLAC__stream_decoder_process_until_end_of_metadata(private->decoder);
-+#endif
- 
-   /* Callback will set the number of channels and resize the 
-      audio buffer */
-+#if NEED_EASYFLAC
-   EasyFLAC__process_single(private->decoder);
-+#else
-+  FLAC__stream_decoder_process_single(private->decoder);
-+#endif
- 
-   /* FLAC API returns signed samples on all streams */
-   decoder->actual_fmt.signed_sample = 1;
-@@ -241,11 +286,19 @@ int flac_read (decoder_t *decoder, void 
-       realsamples += copy;
-     }
-     else if (!priv->eos) {
-+#if NEED_EASYFLAC
-       ret = EasyFLAC__process_single(priv->decoder);
-       if (!ret ||
- 	  EasyFLAC__get_state(priv->decoder)
- 	  == FLAC__STREAM_DECODER_END_OF_STREAM)
- 	priv->eos = 1;  /* Bail out! */
-+#else
-+      ret = FLAC__stream_decoder_process_single(priv->decoder);
-+      if (!ret ||
-+	  FLAC__stream_decoder_get_state(priv->decoder)
-+	  == FLAC__STREAM_DECODER_END_OF_STREAM)
-+	priv->eos = 1;  /* Bail out! */
-+#endif
-     } else
-       break;
-   }
-@@ -311,8 +364,13 @@ void flac_cleanup (decoder_t *decoder)
-     free(priv->buf[i]);
-   
-   free(priv->buf);
-+#if NEED_EASYFLAC
-   EasyFLAC__finish(priv->decoder);
-   EasyFLAC__stream_decoder_delete(priv->decoder);
-+#else
-+  FLAC__stream_decoder_finish(priv->decoder);
-+  FLAC__stream_decoder_delete(priv->decoder);
-+#endif
- 
-   free(decoder->private);
-   free(decoder);
-@@ -342,7 +400,11 @@ format_t oggflac_format = {
- 
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -363,7 +425,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
- }
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -389,7 +455,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
- }
- 
- 
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -409,12 +479,24 @@ void easyflac_metadata_callback(const Ea
- }
- 
- 
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
- 
- 
- }
- 
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
-+{
-+  // can't get this info from the data source, so we'll let the read callback handle it
-+  return false;
-+}
-+#endif
-+
- 
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples)
- {
-@@ -457,7 +539,11 @@ void print_flac_stream_info (decoder_t *
-     
- 
-   
-+#if NEED_EASYFLAC
-   if (EasyFLAC__is_oggflac(priv->decoder))
-+#else
-+  if (priv->is_oggflac)
-+#endif
-     cb->printf_metadata(decoder->callback_arg, 2,
- 			_("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
- 			priv->bits_per_sample,
diff --git a/audio/vorbis-tools/patches/patch-aj b/audio/vorbis-tools/patches/patch-aj
deleted file mode 100644
index 6f8e2996163..00000000000
--- a/audio/vorbis-tools/patches/patch-aj
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/flac.c.orig	2005-06-03 10:15:10.000000000 +0000
-+++ oggenc/flac.c
-@@ -20,15 +20,21 @@
- #include "platform.h"
- #include "resample.h"
- 
--#define DEFAULT_FLAC_FRAME_SIZE 4608
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
- 
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
--
--void resize_buffer(flacfile *flac, int newchannels, int newsamples);
--void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
-+static void resize_buffer(flacfile *flac, int newchannels, int newsamples);
-+static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
- 
- 
- int flac_id(unsigned char *buf, int len)
-@@ -76,6 +82,7 @@ int flac_open(FILE *in, oe_enc_opt *opt,
- 	flac->in = in;
- 
- 	/* Setup FLAC decoder */
-+#if NEED_EASYFLAC
- 	flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen));
- 	EasyFLAC__set_client_data(flac->decoder, flac);
- 	EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback);
-@@ -85,13 +92,31 @@ int flac_open(FILE *in, oe_enc_opt *opt,
- 	EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
- 	EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- 	EasyFLAC__init(flac->decoder);
-+#else
-+	flac->decoder = FLAC__stream_decoder_new();
-+	FLAC__stream_decoder_set_md5_checking(flac->decoder, false);
-+	FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+	FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+	if(oggflac_id(oldbuf, buflen))
-+		FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+	else
-+		FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+#endif
- 	
- 	/* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
- 	EasyFLAC__process_until_end_of_metadata(flac->decoder);
-+#else
-+	FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder);
-+#endif
- 
- 	/* Callback will set the number of channels and resize the 
- 	   audio buffer */
-+#if NEED_EASYFLAC
- 	EasyFLAC__process_single(flac->decoder);
-+#else
-+	FLAC__stream_decoder_process_single(flac->decoder);
-+#endif
- 	
- 	/* Copy format info for caller */
- 	opt->rate = flac->rate;
-@@ -133,11 +158,19 @@ long flac_read(void *in, float **buffer,
- 		}
- 		else if (!flac->eos)
- 		{
-+#if NEED_EASYFLAC
- 			ret = EasyFLAC__process_single(flac->decoder);
- 			if (!ret ||
- 			    EasyFLAC__get_state(flac->decoder)
- 			    == FLAC__STREAM_DECODER_END_OF_STREAM)
- 				flac->eos = 1;  /* Bail out! */
-+#else
-+			ret = FLAC__stream_decoder_process_single(flac->decoder);
-+			if (!ret ||
-+			    FLAC__stream_decoder_get_state(flac->decoder)
-+			    == FLAC__STREAM_DECODER_END_OF_STREAM)
-+				flac->eos = 1;  /* Bail out! */
-+#endif
- 		} else
- 			break;
- 	}
-@@ -157,13 +190,22 @@ void flac_close(void *info)
- 	free(flac->buf);
- 	free(flac->oldbuf);
- 	free(flac->comments);
-+#if NEED_EASYFLAC
- 	EasyFLAC__finish(flac->decoder);
- 	EasyFLAC__stream_decoder_delete(flac->decoder);
-+#else
-+	FLAC__stream_decoder_finish(flac->decoder);
-+	FLAC__stream_decoder_delete(flac->decoder);
-+#endif
- 	free(flac);
- }
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 	int i = 0;
-@@ -200,7 +242,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
- 	return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;	 
- }
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 	int samples = frame->header.blocksize;
-@@ -221,7 +267,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
- 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
- 
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 
-@@ -240,11 +290,24 @@ void easyflac_metadata_callback(const Ea
- 	}
- }
- 
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
-+{
-+	flacfile *flac = (flacfile *) client_data;
-+
-+}
-+
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
- {
- 	flacfile *flac = (flacfile *) client_data;
- 
-+	return feof(flac->in)? true : false;
- }
-+#endif
- 
- 
- void resize_buffer(flacfile *flac, int newchannels, int newsamples)
-@@ -292,4 +355,3 @@ void copy_comments (vorbis_comment *v_co
- 		free(comment);
- 	}
- }
--
diff --git a/audio/vorbis-tools/patches/patch-ak b/audio/vorbis-tools/patches/patch-ak
deleted file mode 100644
index f8d61697901..00000000000
--- a/audio/vorbis-tools/patches/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/flac.h.orig	2005-06-03 10:15:10.000000000 +0000
-+++ oggenc/flac.h
-@@ -5,10 +5,21 @@
- #include "encode.h"
- #include "audio.h"
- #include <stdio.h>
-+#include <FLAC/stream_decoder.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#include <OggFLAC/stream_decoder.h>
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#endif
- 
- typedef struct {
-+#if NEED_EASYFLAC
- 	EasyFLAC__StreamDecoder *decoder;
-+#else
-+	FLAC__StreamDecoder *decoder;
-+#endif
- 	short channels;
- 	int rate;
- 	long totalsamples; /* per channel, of course */
diff --git a/audio/vorbis-tools/patches/patch-an b/audio/vorbis-tools/patches/patch-an
deleted file mode 100644
index 87ed9fdf0d8..00000000000
--- a/audio/vorbis-tools/patches/patch-an
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- configure.orig	2005-06-27 09:29:29.000000000 +0000
-+++ configure
-@@ -27521,78 +27521,6 @@ echo "$as_me: WARNING: libFLAC missing" 
-     have_libFLAC=no
- fi
- 
--  echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_new in -lOggFLAC" >&5
--echo $ECHO_N "checking for OggFLAC__stream_decoder_new in -lOggFLAC... $ECHO_C" >&6
--if test "${ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS
--   $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char OggFLAC__stream_decoder_new ();
--int
--main ()
--{
--OggFLAC__stream_decoder_new ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new" >&5
--echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new" >&6
--if test $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_new = yes; then
--  FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"
--else
--  { echo "$as_me:$LINENO: WARNING: libOggFLAC missing" >&5
--echo "$as_me: WARNING: libOggFLAC missing" >&2;}
--    have_libFLAC=no
--fi
--
-   echo "$as_me:$LINENO: checking for FLAC/stream_decoder.h" >&5
- echo $ECHO_N "checking for FLAC/stream_decoder.h... $ECHO_C" >&6
- if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then
diff --git a/audio/vorbis-tools/patches/patch-ao b/audio/vorbis-tools/patches/patch-ao
deleted file mode 100644
index c214aff9031..00000000000
--- a/audio/vorbis-tools/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- ogg123/Makefile.in.orig	2005-06-27 09:29:11.000000000 +0000
-+++ ogg123/Makefile.in
-@@ -63,8 +63,8 @@ am__ogg123_SOURCES_DIST = audio.c buffer
- 	format.h ogg123.h playlist.h status.h transport.h \
- 	vorbis_comments.h flac_format.c easyflac.c easyflac.h \
- 	speex_format.c
--@HAVE_LIBFLAC_TRUE@am__objects_1 = flac_format.$(OBJEXT) \
--@HAVE_LIBFLAC_TRUE@	easyflac.$(OBJEXT)
-+@HAVE_LIBFLAC_TRUE@am__objects_1 =  \
-+@HAVE_LIBFLAC_TRUE@	flac_format.$(OBJEXT)
- @HAVE_LIBSPEEX_TRUE@am__objects_2 = speex_format.$(OBJEXT)
- am_ogg123_OBJECTS = audio.$(OBJEXT) buffer.$(OBJEXT) \
- 	callbacks.$(OBJEXT) cfgfile_options.$(OBJEXT) \
diff --git a/audio/vorbis-tools/patches/patch-ap b/audio/vorbis-tools/patches/patch-ap
deleted file mode 100644
index c4faf2d0e93..00000000000
--- a/audio/vorbis-tools/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/Makefile.am.orig	2005-06-13 13:11:44.000000000 +0000
-+++ oggenc/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- if HAVE_LIBFLAC
--flac_sources = flac.c flac.h easyflac.c easyflac.h
-+flac_sources = flac.c flac.h
- else
- flac_sources =
- endif
diff --git a/audio/vorbis-tools/patches/patch-aq b/audio/vorbis-tools/patches/patch-aq
deleted file mode 100644
index f748cf261f2..00000000000
--- a/audio/vorbis-tools/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/01/13 15:35:52 wiz Exp $
-
---- oggenc/Makefile.in.orig	2005-06-27 09:29:13.000000000 +0000
-+++ oggenc/Makefile.in
-@@ -56,7 +56,7 @@ PROGRAMS = $(bin_PROGRAMS)
- am__oggenc_SOURCES_DIST = flac.c flac.h easyflac.c easyflac.h oggenc.c \
- 	audio.c encode.c platform.c audio.h encode.h platform.h \
- 	resample.c resample.h
--@HAVE_LIBFLAC_TRUE@am__objects_1 = flac.$(OBJEXT) easyflac.$(OBJEXT)
-+@HAVE_LIBFLAC_TRUE@am__objects_1 = flac.$(OBJEXT)
- am_oggenc_OBJECTS = $(am__objects_1) oggenc.$(OBJEXT) audio.$(OBJEXT) \
- 	encode.$(OBJEXT) platform.$(OBJEXT) resample.$(OBJEXT)
- oggenc_OBJECTS = $(am_oggenc_OBJECTS)