Update to 3.2.6

While here:
- Add license
- Add the missing SDL option to OPTIONS_DEFINE
- Fix ESOUND option
- Fix build of NAS option with Clang < 4.0
- The configure script says this
  configure: WARNING: unrecognized options: --with-cxxflags
  so remove it from CONFIGURE_ARGS
- Regenerate patches

Changes:	http://www.mp3blaster.org/2017/05/its-only-been-8-years.html
PR:		219808
Approved by:	lme (mentor), novel (maintainer)
Differential Revision:	https://reviews.freebsd.org/D11076

5 files changed, 26 insertions, 25 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 9aa02e374e48..61b44c87d27f 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -2,23 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	mp3blaster
-PORTVERSION=	3.2.5
-PORTREVISION=	6
+PORTVERSION=	3.2.6
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	MP3 console ncurses-based player
 
-USES=		gmake ncurses
-GNU_CONFIGURE=	yes
-WANT_GNOME=	yes
-CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+USES=		gmake localbase:ldflags ncurses
+GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	LIRC NAS SIDPLAY VORBIS DOCS ESOUND
+OPTIONS_DEFINE=	DOCS ESOUND LIRC NAS SDL SIDPLAY VORBIS
 OPTIONS_DEFAULT=	SIDPLAY VORBIS
 SIDPLAY_DESC=	Sidplayer support
 
@@ -41,7 +38,7 @@ NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_LDFLAGS=		-laudio
 
 ESOUND_CONFIGURE_WITH=	esd
-ESOUND_GNOME=		esound
+ESOUND_USE=		GNOME=esound
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index dfe084d680dd..fce5f96a4df0 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mp3blaster-3.2.5.tar.gz) = 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29
-SIZE (mp3blaster-3.2.5.tar.gz) = 329407
+TIMESTAMP = 1496705259
+SHA256 (mp3blaster-3.2.6.tar.gz) = 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0
+SIZE (mp3blaster-3.2.6.tar.gz) = 354019
diff --git a/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc b/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc
new file mode 100644
index 000000000000..87f15a3f31d4
--- /dev/null
+++ b/audio/mp3blaster/files/patch-mpegsound_nasplayer.cc
@@ -0,0 +1,14 @@
+nasplayer.cc:37:23: error: out-of-line definition of 'opendevice' does not match any declaration in 'NASplayer'
+NASplayer *NASplayer::opendevice(char *server)
+                      ^~~~~~~~~~
+--- mpegsound/nasplayer.cc.orig	2017-06-06 00:05:37 UTC
++++ mpegsound/nasplayer.cc
+@@ -34,7 +34,7 @@ NASplayer::~NASplayer()
+ 	}
+ }
+ 
+-NASplayer *NASplayer::opendevice(char *server)
++NASplayer *NASplayer::opendevice(const char *server)
+ {
+ 	AuServer *aud;
+ 	char *return_status;
diff --git a/audio/mp3blaster/files/patch-src__global.cc b/audio/mp3blaster/files/patch-src__global.cc
deleted file mode 100644
index d36d66b68b81..000000000000
--- a/audio/mp3blaster/files/patch-src__global.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/global.cc.orig	2016-09-12 14:29:38.335706000 -0400
-+++ src/global.cc	2016-09-12 14:26:46.344490000 -0400
-@@ -371,7 +371,7 @@
- is_sid(const char *filename)
- {
- #ifdef HAVE_SIDPLAYER
--	char *ext = strrchr(filename, '.');
-+	const char *ext = strrchr(filename, '.');
- 	if (ext) {
- 		if (!strcasecmp(ext, ".psid")) return 1;
- 		if (!strcasecmp(ext, ".sid")) return 1;
diff --git a/audio/mp3blaster/files/patch-src__main.cc b/audio/mp3blaster/files/patch-src_main.cc
index 37ac6b1306ef..edd3216bb847 100644
--- a/audio/mp3blaster/files/patch-src__main.cc
+++ b/audio/mp3blaster/files/patch-src_main.cc
@@ -1,6 +1,6 @@
---- src/main.cc.orig	2009-01-24 15:25:10 UTC
+--- src/main.cc.orig	2017-05-15 22:14:13 UTC
 +++ src/main.cc
-@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[
+@@ -5480,7 +5480,7 @@ main(int argc, char *argv[], char *envp[])
  			{ 0, 0, 0, 0}
  		};