5 files changed, 18 insertions, 105 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 82c361172136..05fffb72f005 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mp3blaster
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +18,7 @@ USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
 
@@ -57,8 +58,19 @@ CONFIGURE_ARGS+=	--without-oggvorbis
 LIB_DEPENDS+=	vorbisfile.4:${PORTSDIR}/audio/libvorbis
 .endif
 
-post-extract:
-	@${FIND} ${WRKSRC} -name "getopt*" -delete
+.if !defined(WITHOUT_SDL)
+CONFIGURE_ARGS+=	--with-sdl
+USE_SDL=	yes
+.else
+CONFIGURE_ARGS+=	--without-sdl
+.endif
+
+.if ${HAVE_GNOME:Mesound} != ""
+USE_GNOME+=     esound
+CONFIGURE_ARGS+=	--with-esd
+.else
+CONFIGURE_ARGS+=	--without-esd
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index 7d744aca9f12..1bb5807797ad 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (mp3blaster-3.2.1.tar.gz) = 25e3a441ecd22693d3d346d1fe2d858b
-SHA256 (mp3blaster-3.2.1.tar.gz) = d5c285511c151bc5849dbbfdb9dd1a5faf857bface7352352a7acf8cf092e797
-SIZE (mp3blaster-3.2.1.tar.gz) = 320282
+MD5 (mp3blaster-3.2.2.tar.gz) = 36408f3d7ac10db50e6c9df202adc071
+SHA256 (mp3blaster-3.2.2.tar.gz) = be95eb6508b727736f054152a34c4f28f812257166d65a950016cd480f9c175d
+SIZE (mp3blaster-3.2.2.tar.gz) = 327121
diff --git a/audio/mp3blaster/files/patch-mpegsound::oggplayer.cc b/audio/mp3blaster/files/patch-mpegsound::oggplayer.cc
deleted file mode 100644
index 60cbb8ccb4f5..000000000000
--- a/audio/mp3blaster/files/patch-mpegsound::oggplayer.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- mpegsound/oggplayer.cc.orig	Mon Dec  1 21:30:07 2003
-+++ mpegsound/oggplayer.cc	Mon Dec  1 21:30:17 2003
-@@ -23,7 +23,7 @@
- /* Martijn suggests that big endiannes is already taken care of in the rawplayer
-  * class.
-  */
--#if 0 && defined(WORDS_BIGENDIAN)
-+#if defined(WORDS_BIGENDIAN)
- 	bigendian = 1;
- #endif
- 	//TODO: On what hardware is data unsigned, and how do I know?
diff --git a/audio/mp3blaster/files/patch-nmixer::Makefile.in b/audio/mp3blaster/files/patch-nmixer::Makefile.in
deleted file mode 100644
index babba25c5bf5..000000000000
--- a/audio/mp3blaster/files/patch-nmixer::Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- nmixer/Makefile.in.orig	Tue Jan 10 11:33:30 2006
-+++ nmixer/Makefile.in	Tue Jan 10 11:33:59 2006
-@@ -134,8 +134,7 @@
- LDADD = @LIBNMIXER@ @NCURSES_LIBS@
- INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
- noinst_LIBRARIES = libnmixer.a
--libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
--                      getopt.c getopt1.c getopt.h
-+libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h
- 
- subdir = nmixer
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -147,8 +146,7 @@
- libnmixer_a_AR = $(AR) cru
- libnmixer_a_LIBADD =
- am_libnmixer_a_OBJECTS = nmixer.$(OBJEXT) mixers.$(OBJEXT) \
--	ossmixer.$(OBJEXT) nasmixer.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT)
-+	ossmixer.$(OBJEXT) nasmixer.$(OBJEXT)
- libnmixer_a_OBJECTS = $(am_libnmixer_a_OBJECTS)
- bin_PROGRAMS = nmixer$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
-@@ -161,7 +159,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
-+@AMDEP_TRUE@DEP_FILES = \
- @AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/mixers.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/nasmixer.Po ./$(DEPDIR)/nmixer.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/ossmixer.Po
-@@ -231,8 +229,6 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mixers.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nasmixer.Po@am__quote@
diff --git a/audio/mp3blaster/files/patch-src::Makefile.in b/audio/mp3blaster/files/patch-src::Makefile.in
deleted file mode 100644
index 9e03aeab3289..000000000000
--- a/audio/mp3blaster/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/Makefile.in.orig	Tue Jan 10 11:35:46 2006
-+++ src/Makefile.in	Tue Jan 10 11:37:07 2006
-@@ -133,12 +133,9 @@
- mp3blaster_SOURCES = fileman.cc \
- 			  main.cc \
- 			  scrollwin.cc \
--			  getopt.c \
--			  getopt1.c \
- 			  fileman.h \
- 			  genretab.h \
--			  getopt.h \
--				id3parse.cc \
-+			  id3parse.cc \
- 			  id3parse.h \
- 			  mp3blaster.h \
- 			  global.cc \
-@@ -176,7 +173,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- 
- am_mp3blaster_OBJECTS = fileman.$(OBJEXT) main.$(OBJEXT) \
--	scrollwin.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \
-+	scrollwin.$(OBJEXT) \
- 	id3parse.$(OBJEXT) global.$(OBJEXT) config.$(OBJEXT) \
- 	winitem.$(OBJEXT) mp3win.$(OBJEXT) mp3item.$(OBJEXT) \
- 	history.$(OBJEXT) getinput.$(OBJEXT)
-@@ -193,8 +190,8 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config.Po ./$(DEPDIR)/fileman.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/getinput.Po ./$(DEPDIR)/getopt.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/global.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/getinput.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/global.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/history.Po ./$(DEPDIR)/id3parse.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/mp3item.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/mp3tag.Po ./$(DEPDIR)/mp3win.Po \
-@@ -265,8 +262,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileman.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getinput.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3parse.Po@am__quote@