Update mp3splt to 2.2.1 (obviating the need for mp3splt-devel) and take

MAINTAINER. From the changelog:

- corrected the -g option to be more intuitive
- fixed bug in the man page (from wrong '-t' to wrong '-g')
- changed small usage error on '-g' option
- mp3splt is now using libmp3splt
- checks for compatibilities between options
- added 'm-' for mp3 STDIN
- possibility to specify the server and port for freedb search;
    (now using tracktype.org by default)
- original id3v1 for mp3 tags are kept in the splitted files and also
    ogg vorbis tags
- add custom tags with the new '-g' option
- '-o' option now creates the specified directories if '-d' option is not
    specified
- added '-Q' option which enables the '-q' option and does not print
    anything to STDOUT
- added experimental '-D' debug mode option
- added '-i' option for counting the number of silence splitpoints
- also added '-h' option which shows a small usage

2 files changed, 17 insertions, 23 deletions

diff --git a/audio/mp3splt/patches/patch-aa b/audio/mp3splt/patches/patch-aa
index 75ded249249..1dfb0078d7e 100644
--- a/audio/mp3splt/patches/patch-aa
+++ b/audio/mp3splt/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2005/10/31 15:59:14 tv Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/05 22:56:41 schmonz Exp $
 
---- mp3splt.c.orig	2005-03-26 08:51:56.000000000 -0500
-+++ mp3splt.c
-@@ -38,8 +38,6 @@
- #include <vorbis/vorbisfile.h>
- #endif
+--- src/mp3splt.c.orig	2006-12-21 16:35:40.000000000 -0500
++++ src/mp3splt.c
+@@ -31,7 +31,14 @@
+ 
+ #include <libmp3splt/mp3splt.h>
  
 -#include "getopt.h"
--
- #include "mp3.h"
- #include "wrap.h"
- #include "ogg.h"
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcomat/cdefs.h>
++#include <nbcompat/getopt.h>
++#else
++#include <getopt.h>
++#endif
++
+ 
+ //constants
+ //we include the "config.h" file from the config options
diff --git a/audio/mp3splt/patches/patch-ab b/audio/mp3splt/patches/patch-ab
deleted file mode 100644
index c66dd65108c..00000000000
--- a/audio/mp3splt/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/06 14:26:17 joerg Exp $
-
---- splt.h.orig	2006-03-06 15:13:08.000000000 +0100
-+++ splt.h
-@@ -93,7 +93,7 @@ char *zero_pad (char *s, char *out, int 
- 
- char *zero_pad_float (float f, char *out);
- 
--int parse_outformat(char *s, char format[][], int cddboption);
-+int parse_outformat(char *s, char format[OUTNUM][MAXOLEN], int cddboption);
- 
- unsigned char *cleanstring (unsigned char *s);
-