* Update to 3.1.1.

* Fix building with gcc3.1 (-CURRENT).
* Add Ogg Vorbis support.

Approved by:	maintainer

8 files changed, 77 insertions, 24 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index c1670010a193..cc22dcfba500 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	mp3blaster
-PORTVERSION=	3.0p8
+PORTVERSION=	3.1.1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://mud.stack.nl/pub/mp3blaster/ \
-		http://mp3blaster.linuxave.net/src/
+MASTER_SITES=	ftp://mud.stack.nl/pub/mp3blaster/
 
 MAINTAINER=	greid@FreeBSD.org
 
@@ -20,8 +19,24 @@ LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	"--with-cxxflags=${CXXFLAGS}"
+CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}" \
+		--without-sidplay
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS+=	vorbisfile.3:${PORTSDIR}/audio/libvorbis
+.else
+CONFIGURE_ARGS+= --without-oggvorbis
+.endif
 
 MAN1=		mp3blaster.1 nmixer.1 splay.1
 
+.if !defined(WITHOUT_VORBIS)
+pre-everything:
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can disable support for Ogg Vorbis by defining WITHOUT_VORBIS."
+	@${ECHO_MSG}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index b7e0ea1529f9..1dd377c3cb4e 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1 +1 @@
-MD5 (mp3blaster-3.0p8.tar.gz) = ac8d30b18cfd7b67efe1a3847c62fe17
+MD5 (mp3blaster-3.1.1.tar.gz) = 6713385086fdfdb91ba08e536f5db12e
diff --git a/audio/mp3blaster/files/patch-ab b/audio/mp3blaster/files/patch-ab
index 0ceb3f9178ae..eeb1af95c042 100644
--- a/audio/mp3blaster/files/patch-ab
+++ b/audio/mp3blaster/files/patch-ab
@@ -1,17 +1,9 @@
---- configure.orig	Sun Jun 17 18:30:26 2001
-+++ configure	Thu Aug 16 04:34:42 2001
-@@ -1557,8 +1557,8 @@
- if test "`uname -s`" = "FreeBSD" ; then
-   echo "FreeBSD detected."
-   FREEBSD=1
--  LDFLAGS="-L/usr/local/lib $LDFLAGS"
--  CPPFLAGS="-I/usr/local/include $CPPFLAGS"
-+  LDFLAGS="-L${libdir} $LDFLAGS"
-+  CPPFLAGS="-I${includedir} $CPPFLAGS"
-   cat >> confdefs.h <<\EOF
- #define AUDIO_NONBLOCKING 1
- EOF
-@@ -2289,7 +2289,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sat Mar 16 21:00:46 2002
++++ configure	Sun Jul 21 17:31:27 2002
+@@ -2652,7 +2652,7 @@
  fi
  done
  
diff --git a/audio/mp3blaster/files/patch-src_getopt.h b/audio/mp3blaster/files/patch-src_getopt.h
new file mode 100644
index 000000000000..2e54ef719e36
--- /dev/null
+++ b/audio/mp3blaster/files/patch-src_getopt.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/getopt.h.orig	Sun Jul 21 13:54:13 2002
++++ src/getopt.h	Sun Jul 21 13:54:27 2002
+@@ -103,7 +103,7 @@
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++/* extern int getopt (); */
+ #endif /* __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
diff --git a/audio/mp3blaster/files/patch-src_history.h b/audio/mp3blaster/files/patch-src_history.h
new file mode 100644
index 000000000000..e6f2b4e3d49a
--- /dev/null
+++ b/audio/mp3blaster/files/patch-src_history.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/history.h.orig	Sun Jul 21 13:54:56 2002
++++ src/history.h	Sun Jul 21 13:55:04 2002
+@@ -21,7 +21,7 @@
+ 	const char *element();
+ 
+ private:
+-	vector<char *> v;
++	std::vector<char *> v;
+ 	unsigned int curpos;
+ 	std::vector<char *>::iterator it;
+ };
diff --git a/audio/mp3blaster/files/patch-src_main.cc b/audio/mp3blaster/files/patch-src_main.cc
new file mode 100644
index 000000000000..9603d84d5800
--- /dev/null
+++ b/audio/mp3blaster/files/patch-src_main.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/main.cc.orig	Sun Jul 21 13:55:40 2002
++++ src/main.cc	Sun Jul 21 13:55:52 2002
+@@ -3945,7 +3945,7 @@
+ 
+ /* called when someone presses '/' in filemanager */
+ void
+-fw_start_search(int timeout=2)
++fw_start_search(int timeout)
+ {
+ 	signal(SIGALRM, &fw_search_timeout);
+ 	fw_set_search_timeout(timeout);
diff --git a/audio/mp3blaster/pkg-descr b/audio/mp3blaster/pkg-descr
index a194a2a881a3..8a5d849ab004 100644
--- a/audio/mp3blaster/pkg-descr
+++ b/audio/mp3blaster/pkg-descr
@@ -4,6 +4,3 @@ a playlist into groups (albums). Therefore, the play order
 can be adjusted with great flexibility.
 						
 WWW: http://www.stack.nl/~brama/mp3blaster.html
-
-- Michael Vasilenko
-acid@stu.cn.ua
diff --git a/audio/mp3blaster/pkg-plist b/audio/mp3blaster/pkg-plist
index a5c34d9aad6c..0c70a60f9d4f 100644
--- a/audio/mp3blaster/pkg-plist
+++ b/audio/mp3blaster/pkg-plist
@@ -1,8 +1,15 @@
-bin/nmixer
+@comment $FreeBSD$
 bin/mp3blaster
 bin/mp3tag
+bin/nmixer
 bin/splay
+share/mp3blaster/README
+share/mp3blaster/chargen.c
 share/mp3blaster/commands.txt
-share/mp3blaster/sample.mp3blasterrc_for_x
+share/mp3blaster/koi8-r
+share/mp3blaster/makefile
+share/mp3blaster/maketbl.c
 share/mp3blaster/sample.mp3blasterrc
+share/mp3blaster/win1251
+share/mp3blaster/win2koi.tbl
 @dirrm share/mp3blaster