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

12 files changed, 30 insertions, 155 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 0a700ec8000..6de56fb69f8 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.381 2008/09/16 16:07:31 wiz Exp $
+# $NetBSD: Makefile,v 1.382 2008/10/05 22:56:41 schmonz Exp $
 #
 
 COMMENT=	Audio tools
@@ -221,7 +221,6 @@ SUBDIR+=	mp3check
 SUBDIR+=	mp3cut
 SUBDIR+=	mp3info
 SUBDIR+=	mp3splt
-SUBDIR+=	mp3splt-devel
 SUBDIR+=	mp3to
 SUBDIR+=	mpc
 SUBDIR+=	mpegaudio
diff --git a/audio/mp3splt-devel/DESCR b/audio/mp3splt-devel/DESCR
deleted file mode 100644
index 801be060300..00000000000
--- a/audio/mp3splt-devel/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Mp3Splt is a command line utility to split mp3 (VBR supported) and
-ogg files selecting a begin and an end time position, without
-decoding. It's very useful to split large mp3/ogg to make smaller
-files or to split entire albums to obtain original tracks. If you
-want to split an album, you can select split points and filenames
-manually or you can get them automatically from CDDB (internet or
-a local file) or from .cue files. Supports also automatic silence
-split, that can be used also to adjust cddb/cue splitpoints.
-Otherwise if you have a file created either with Mp3Wrap or AlbumWrap
-you can extract tracks just in few seconds.
diff --git a/audio/mp3splt-devel/Makefile b/audio/mp3splt-devel/Makefile
deleted file mode 100644
index a9164a4dbae..00000000000
--- a/audio/mp3splt-devel/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/06 09:31:06 bjs Exp $
-#
-
-DISTNAME=		mp3splt-2.2_rc1
-PKGNAME=		${DISTNAME:S/_//}
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mp3splt/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://mp3splt.sourceforge.net/
-COMMENT=		Command line utility to split MP3 (VBR supported) and OGG files
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-CONFLICTS+=		mp3splt-[0-9]*
-
-GNU_CONFIGURE=	 	yes
-USE_PKGLOCALEDIR=	yes
-USE_FEATURES= 	 	getopt_long
-
-.include "../../mk/bsd.prefs.mk"
-###
-### This was done in configure, but best to do it here--the tests are
-### not robust.
-###
-.if ${OPSYS} == "Solaris"
-LIBS+= 	 -lsocket
-.endif
-
-post-install:
-	${LN} -s ${DESTDIR}${PREFIX}/bin/mp3splt \
- 	 	${DESTDIR}${PREFIX}/bin/oggsplt
-
-.include "../../audio/libmp3splt/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3splt-devel/PLIST b/audio/mp3splt-devel/PLIST
deleted file mode 100644
index ae6ef428ee2..00000000000
--- a/audio/mp3splt-devel/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/06 09:31:06 bjs Exp $
-bin/mp3splt
-bin/oggsplt
-man/man1/mp3splt.1
diff --git a/audio/mp3splt-devel/distinfo b/audio/mp3splt-devel/distinfo
deleted file mode 100644
index 3a9fef6d8c8..00000000000
--- a/audio/mp3splt-devel/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/06 09:31:06 bjs Exp $
-
-SHA1 (mp3splt-2.2_rc1.tar.gz) = a9a3a88209a0bb5eb2c454567b63da5256e5b828
-RMD160 (mp3splt-2.2_rc1.tar.gz) = acb2e222d214f43f7e64bc378247eff0af69da6a
-Size (mp3splt-2.2_rc1.tar.gz) = 125632 bytes
-SHA1 (patch-aa) = 936252eebac04437f52c74796297cb6c3f61a24b
-SHA1 (patch-ab) = e43a6a98887ded24c27857f8389d0a015e4805e9
diff --git a/audio/mp3splt-devel/patches/patch-aa b/audio/mp3splt-devel/patches/patch-aa
deleted file mode 100644
index d250e7cd9d2..00000000000
--- a/audio/mp3splt-devel/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/06 09:31:06 bjs Exp $
-
---- 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"
-+#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-devel/patches/patch-ab b/audio/mp3splt-devel/patches/patch-ab
deleted file mode 100644
index 47ebd82ff0a..00000000000
--- a/audio/mp3splt-devel/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/02/06 09:31:06 bjs Exp $
-
---- configure.orig	2006-12-21 16:36:28.000000000 -0500
-+++ configure
-@@ -3260,30 +3260,9 @@ fi
- { echo "$as_me:$LINENO: checking the host" >&5
- echo $ECHO_N "checking the host... $ECHO_C" >&6; }
- case $host in
--	*linux*)
--		HOST="Linux-based system"
--		;;
--	*openbsd*)
--		HOST="OpenBSD"
--		;;
--	*netbsd*)
--		HOST="NetBSD"
--		;;
--	*freebsd*)
--		HOST="FreeBSD"
--		;;
--	*mingw*)
--		HOST="Mingw"
--		LIBS="libvorbisfile.a libmad.a libvorbis.a libogg.a libid3tag.a libz.a libmp3splt.a -lwsock32"
--		;;
--	*solaris*)
--		HOST="Solaris"
--		LIBS="$LIBS -lsocket"
--		;;
- 	*)
- 		HOST="Other"
-                 LIBS="$LIBS"
--#		LIBS="-lmad -logg -lvorbis -lvorbisfile -lm"
- 		;;
- esac
- { echo "$as_me:$LINENO: result: $HOST" >&5
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 9922a09199b..8052bde37eb 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.12 2008/07/14 12:55:58 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/05 22:56:41 schmonz Exp $
 #
 
-DISTNAME=		mp3splt-2.1c-src
-PKGNAME=		${DISTNAME:S/-src//}
+DISTNAME=		mp3splt-2.2.1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mp3splt/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://mp3splt.sourceforge.net/
 COMMENT=		Command line utility to split MP3 (VBR supported) and OGG files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
+GNU_CONFIGURE=	 	yes
+USE_FEATURES= 	 	getopt_long
 
+.include "../../audio/libmp3splt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3splt/PLIST b/audio/mp3splt/PLIST
index f96891dfc1f..9c8ce1f1334 100644
--- a/audio/mp3splt/PLIST
+++ b/audio/mp3splt/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/18 14:05:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/05 22:56:41 schmonz Exp $
 bin/mp3splt
-bin/oggsplt
 man/man1/mp3splt.1
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
index 6da8f3ab4e0..54314be3a27 100644
--- a/audio/mp3splt/distinfo
+++ b/audio/mp3splt/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/03/06 14:26:17 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/10/05 22:56:41 schmonz Exp $
 
-SHA1 (mp3splt-2.1c-src.tar.gz) = 40962d696c2a687569ab55382600178f5c8fd2b1
-RMD160 (mp3splt-2.1c-src.tar.gz) = 857b225ac4645cc43cc0381e5ecfe908d9c01fb9
-Size (mp3splt-2.1c-src.tar.gz) = 131810 bytes
-SHA1 (patch-aa) = f90ac091d136de06b00daee259dcfadd77b68e30
-SHA1 (patch-ab) = 7572d2a026e328f355675b54b258ba262fab1568
+SHA1 (mp3splt-2.2.1.tar.gz) = c20df0c33f8d865f9253b0eb186e862803543402
+RMD160 (mp3splt-2.2.1.tar.gz) = 9272b058743e15f826312f34dce4ce56d42bb8eb
+Size (mp3splt-2.2.1.tar.gz) = 131218 bytes
+SHA1 (patch-aa) = 936252eebac04437f52c74796297cb6c3f61a24b
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);
-