Update to 2.2.5. From the changelog:

#mp3splt v. 2.2.5

- added -x option to not write Xing header

mostly libmp3splt (but important for mp3splt users) :
- fixed bug with -g and multiple usages of @o (libmp3splt)
- fixed a small bug with genre in -g
- Xing header is now written even if -n option is used (libmp3splt)
- fixed bug with stdin & id3v2 & xing
- fixed critical bug with overlap splitpoints not working (feature #1530782 => bug)
- fixed critical bug with mp3 stdin (& framemode)
- fixed some warning messages & added some more
- fixed dewrap error message
- fixed dewrap bug to not attempt to create output directories when '-d' option is used
- fixed minor bug #2790952 : time mode creating an empty file (at the end)

#mp3splt v. 2.2.4

- fixed issue with CUE file not being imported correctly : \r and \n
problem (bug #2778717)
- fixed bug #2691576 - CUE file seg fault if no artist
- fixed segfault when output format was empty
- fixed bug with ID3v1 and '@N' (was 1,3,5,... instead of 1,2,3,...)
- fixed time split with '0.0' was infinite looping
- fixed empty output format '' seg fault
- small fixes in the man page
- re-enabled mp3splt ogg symlink configure option
- added options @m,@M,@s,@S,@H,@h + no @h or @H in output filenames if hundreths are 0
- added default custom tags as %[@o,@N=1]
- print to stdout is now on stderr for the '-l' option, except for the filenames
- added --with-mp3splt(-libraries|-includes)?, --disable-mp3splttest configure options
- added overlapping split files with the -O option (feature request #1530782)

4 files changed, 34 insertions, 10 deletions

diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index c8c208a5d63..7c602520ebd 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2009/02/12 22:52:49 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/25 14:58:34 schmonz Exp $
 #
 
-DISTNAME=		mp3splt-2.2.3
+DISTNAME=		mp3splt-2.2.5
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mp3splt/}
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://mp3splt.sourceforge.net/
 COMMENT=		Command line utility to split MP3 (VBR supported) and OGG files
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
index aa041818301..56c542f6b81 100644
--- a/audio/mp3splt/distinfo
+++ b/audio/mp3splt/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2009/02/12 21:35:34 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2009/07/25 14:58:34 schmonz Exp $
 
-SHA1 (mp3splt-2.2.3.tar.gz) = b94d0589477fa3c7b7bfd1993c13a83a6ca44e0b
-RMD160 (mp3splt-2.2.3.tar.gz) = b3823ab5b7bbf4e975724bc208e204db915fdae1
-Size (mp3splt-2.2.3.tar.gz) = 135298 bytes
-SHA1 (patch-aa) = 936252eebac04437f52c74796297cb6c3f61a24b
+SHA1 (mp3splt-2.2.5.tar.gz) = 529fdeed4f9a0677a62e0ca942e6edd29ec00122
+RMD160 (mp3splt-2.2.5.tar.gz) = 99254017ccbf023759904d21824f61a8290f8c58
+Size (mp3splt-2.2.5.tar.gz) = 142549 bytes
+SHA1 (patch-aa) = 123d889458015769481e322833e3c0d69d1b6561
+SHA1 (patch-ab) = 7df19267624ae17060bb2ffa6774dd2483e0576b
diff --git a/audio/mp3splt/patches/patch-aa b/audio/mp3splt/patches/patch-aa
index 1dfb0078d7e..e287a0e89a6 100644
--- a/audio/mp3splt/patches/patch-aa
+++ b/audio/mp3splt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/10/05 22:56:41 schmonz Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/25 14:58:34 schmonz Exp $
 
---- src/mp3splt.c.orig	2006-12-21 16:35:40.000000000 -0500
+--- src/mp3splt.c.orig	2009-05-15 19:14:22.000000000 -0400
 +++ src/mp3splt.c
-@@ -31,7 +31,14 @@
+@@ -36,7 +36,14 @@
  
  #include <libmp3splt/mp3splt.h>
  
diff --git a/audio/mp3splt/patches/patch-ab b/audio/mp3splt/patches/patch-ab
new file mode 100644
index 00000000000..2d4b35fedf6
--- /dev/null
+++ b/audio/mp3splt/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2009/07/25 14:58:34 schmonz Exp $
+
+--- configure.orig	2009-06-24 01:30:32.000000000 -0400
++++ configure
+@@ -3632,7 +3632,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <mp3splt.h>
++#include <libmp3splt/mp3splt.h>
+ 
+ int main ()
+ {
+@@ -3705,7 +3705,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ #include <stdio.h>
+-#include <mp3splt.h>
++#include <libmp3splt/mp3splt.h>
+ 
+ int
+ main ()