- Update to 2.2.9

- Remove WITHOUT_NLS patch which was applied upstream

Changes:
- allow auto adjusting when splitting in equal parts

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

3 files changed, 4 insertions, 66 deletions

diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index da617b22dd77..60be01fb2486 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mp3splt
-PORTVERSION=	2.2.8
-PORTREVISION=	1
+PORTVERSION=	2.2.9
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
index 5f076821e71d..f241d22015b2 100644
--- a/audio/mp3splt/distinfo
+++ b/audio/mp3splt/distinfo
@@ -1,3 +1,3 @@
-MD5 (mp3splt-2.2.8.tar.gz) = 2e6f53d6385912c7e8395813048cd28c
-SHA256 (mp3splt-2.2.8.tar.gz) = e5581d953fad596cb6fb22f220414e8aa69cb5324aa123a6b7b9b7a2142225d8
-SIZE (mp3splt-2.2.8.tar.gz) = 218621
+MD5 (mp3splt-2.2.9.tar.gz) = 1f2d3c42504774c5178ce97dcf173a19
+SHA256 (mp3splt-2.2.9.tar.gz) = 990465fda706da61d5f61874616bfaf470c3b95d95b13a38eebeffc4d0074c41
+SIZE (mp3splt-2.2.9.tar.gz) = 223544
diff --git a/audio/mp3splt/files/patch-disable-nls b/audio/mp3splt/files/patch-disable-nls
deleted file mode 100644
index 32c610f3d2bf..000000000000
--- a/audio/mp3splt/files/patch-disable-nls
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/mp3splt.c.orig	2010-04-22 14:06:08.000000000 +0400
-+++ src/mp3splt.c	2010-04-22 14:16:50.000000000 +0400
-@@ -30,7 +30,6 @@
- #include <ctype.h>
- #include <getopt.h>
- #include <locale.h>
--#include <libintl.h>
- 
- #ifdef __WIN32__
- #include <windows.h>
-@@ -46,6 +45,10 @@
- #define PACKAGE_NAME "mp3splt"
- #endif
- 
-+#ifdef ENABLE_NLS
-+#include <libintl.h>
-+#endif
-+
- #define MP3SPLT_DATE "17/02/10"
- #define MP3SPLT_AUTHOR1 "Matteo Trotta"
- #define MP3SPLT_AUTHOR2 "Alexandru Munteanu"
-@@ -54,7 +57,11 @@
- #define MP3SPLT_CDDBFILE "query.cddb"
- 
- #define MP3SPLT_GETTEXT_DOMAIN "mp3splt"
-+#ifdef ENABLE_NLS
- #define _(STR) gettext(STR)
-+#else
-+#define _(STR) STR
-+#endif
- 
- //in case of STDIN/STDOUT usage, we change the console file handle
- //-yeah indeed, global variables might suck
-@@ -1801,9 +1808,11 @@ split:
- //main program starts here
- int main(int argc, char **orig_argv)
- {
-+#ifdef ENABLE_NLS
-   //gettext
-   setlocale(LC_ALL, "");
-   textdomain(MP3SPLT_GETTEXT_DOMAIN);
-+#endif
- 
-   console_out = stdout;
-   console_err = stderr;
-@@ -1814,6 +1823,7 @@ int main(int argc, char **orig_argv)
- 
-   main_data *data = create_main_struct(argc, orig_argv);
- 
-+#ifdef ENABLE_NLS
- #ifdef __WIN32__
-   char mp3splt_uninstall_file[2048] = { '\0' };
-   DWORD dwType, dwSize = sizeof(mp3splt_uninstall_file) - 1;
-@@ -1873,6 +1883,7 @@ int main(int argc, char **orig_argv)
- #endif
- 
-   bind_textdomain_codeset(MP3SPLT_GETTEXT_DOMAIN, "UTF-8");
-+#endif
- 
-   data->state = mp3splt_new_state(&err);
-   process_confirmation_error(err, data);