- Update to 0.6

- Remove WITHOUT_NLS patch which was applied upstream

Changes:
- fixed bug #3028775 & #3028078: naming conventions for files > 100 minutes confuses sort
- fixed bug #3025671: getting original ID3v2 tags was not working on Windows
- fixed bug #3012688: wrong include and lib path using --with-mp3splt
- fixed bug #2969968: build failed with --disable-nls
- fixed bug #2969223: 'invalid dir I:'
- added > 2Gb support on Windows

PR:		ports/151114
Submitted by:	sunpoet (myself)
Approved by:	Anton Yuzhaninov <citrin at citrin.ru> (maintainer), pgollucci (mentor)

4 files changed, 15 insertions, 45 deletions

diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 7b8c84a6c336..5ff448f50795 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libmp3splt
-PORTVERSION=	0.5.9
-PORTREVISION=	2
+PORTVERSION=	0.6
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
diff --git a/audio/libmp3splt/distinfo b/audio/libmp3splt/distinfo
index 57531b2c848c..ee038f1e2f9f 100644
--- a/audio/libmp3splt/distinfo
+++ b/audio/libmp3splt/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmp3splt-0.5.9.tar.gz) = 2a29c8a8965d45ae89582a3f112f48e3
-SHA256 (libmp3splt-0.5.9.tar.gz) = ea25c307ff5ceab720eb1ce03d14f7ade43dda6f0f1f08dfcbba5a05e25a248a
-SIZE (libmp3splt-0.5.9.tar.gz) = 506810
+MD5 (libmp3splt-0.6.tar.gz) = 92e2e51857588a1d5f967ffd9bf90c28
+SHA256 (libmp3splt-0.6.tar.gz) = 2c23ba80b1334f30484f2e031224997f2b031193904ad49ddfdbe15203bba9f9
+SIZE (libmp3splt-0.6.tar.gz) = 502239
diff --git a/audio/libmp3splt/files/patch-disable-nls b/audio/libmp3splt/files/patch-disable-nls
deleted file mode 100644
index e5ccefd56da7..000000000000
--- a/audio/libmp3splt/files/patch-disable-nls
+++ /dev/null
@@ -1,40 +0,0 @@
---- include/libmp3splt/splt.h.orig	2010-04-22 12:28:38.000000000 +0400
-+++ include/libmp3splt/splt.h	2010-04-22 12:31:02.000000000 +0400
-@@ -52,7 +52,9 @@
- #endif
- 
- #include <limits.h>
-+#ifdef ENABLE_NLS
- #include <libintl.h>
-+#endif
- #include <locale.h>
- 
- #if !HAVE_FSEEKO
-@@ -60,7 +62,11 @@
- #define ftello ftell
- #endif
- 
-+#ifdef ENABLE_NLS
- #define _(STR) dgettext(MP3SPLT_LIB_GETTEXT_DOMAIN, STR)
-+#else
-+#define _(STR) STR
-+#endif
- 
- /**********************************/
- /* splt normal or syncerror split */
---- src/mp3splt.c.orig	2010-04-22 12:48:29.000000000 +0400
-+++ src/mp3splt.c	2010-04-22 12:49:02.000000000 +0400
-@@ -58,11 +58,13 @@ splt_state *mp3splt_new_state(int *error
-   }
-   else
-   {
-+#ifdef ENABLE_NLS
- #ifndef __WIN32__
-     bindtextdomain(MP3SPLT_LIB_GETTEXT_DOMAIN, LOCALEDIR);
- #endif
- 
-     bind_textdomain_codeset(MP3SPLT_LIB_GETTEXT_DOMAIN, "UTF-8");
-+#endif
- 
-     state = splt_t_new_state(state, err);
-   }
diff --git a/audio/libmp3splt/files/patch-src-oformat_parser.c b/audio/libmp3splt/files/patch-src-oformat_parser.c
new file mode 100644
index 000000000000..7761f694bbcd
--- /dev/null
+++ b/audio/libmp3splt/files/patch-src-oformat_parser.c
@@ -0,0 +1,11 @@
+--- src/oformat_parser.c.orig	2010-09-07 05:12:05.000000000 +0800
++++ src/oformat_parser.c	2010-09-29 16:12:11.000000000 +0800
+@@ -760,7 +760,7 @@
+   if (total_time > 0)
+   {
+     long minutes = total_time / 100 / 60;
+-    int i = (int) (log10l((long double) minutes));
++    int i = (int) (log10(minutes));
+     char number_of_digits = (char) (i + '1');
+     if (number_of_digits == '1')
+     {