Upgrade to version 3.1.3. This upgrade solves the checksum mismatch pointed

out by (one- at inbox dot lv) in PR pkg/19115 as well, as we have a completely
new checksum.  Changes according to the website:

Changes since version 3.1.2:
- Fixed a bug that could cause the playlist repeat to stop (thanks to
  Alex Rasmussen for finding the bug)
- Command line options for nmixer changed, and it's now possible to select a
  different hardware mixer device.
- Fixed a bug that caused mp3blaster to quit when the user's homedir could
  not be determined.

Changes since version 3.1.1:
-Compiles on gcc-3.* without errors
-Trailing slash in HTTP URLs is only appended after the hostname, not in
 URLs that contain a path following the hostname. This means that mp3's can
 now be played straight from an URL again.
- For HTTP streams, HTTP/1.1 is used instead of HTTP/1.0 (this, and previous
 suggestion submitted by Markus Jerger. Thanks!)

5 files changed, 33 insertions, 40 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 942ac247f8a..f88bd6d8b01 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/08/31 13:05:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/11/22 17:02:03 jschauma Exp $
 
-DISTNAME=	mp3blaster-3.1.1
+DISTNAME=	mp3blaster-3.1.3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://mud.stack.nl/pub/mp3blaster/ \
 		http://mp3blaster.linuxave.net/src/
diff --git a/audio/mp3blaster/PLIST b/audio/mp3blaster/PLIST
index 83f3d7689b5..209a7227b78 100644
--- a/audio/mp3blaster/PLIST
+++ b/audio/mp3blaster/PLIST
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/18 14:13:50 rxg Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/22 17:02:04 jschauma Exp $
 bin/mp3blaster
 bin/mp3tag
 bin/nmixer
 man/man1/mp3blaster.1
 man/man1/nmixer.1
-share/mp3blaster/README
-share/mp3blaster/chargen.c
+share/mp3blaster/charmap/README
+share/mp3blaster/charmap/chargen.c
+share/mp3blaster/charmap/koi8-r
+share/mp3blaster/charmap/makefile.charmap
+share/mp3blaster/charmap/maketbl.c
+share/mp3blaster/charmap/win1251
+share/mp3blaster/charmap/win2koi.tbl
 share/mp3blaster/commands.txt
-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/charmap
 @dirrm share/mp3blaster
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index 0f69dc8bc7a..aafb042fed6 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/03/18 14:13:51 rxg Exp $
+$NetBSD: distinfo,v 1.3 2002/11/22 17:02:04 jschauma Exp $
 
-SHA1 (mp3blaster-3.1.1.tar.gz) = 794e87ac78f915bedf72a685080e729bf2f13337
-Size (mp3blaster-3.1.1.tar.gz) = 286621 bytes
-SHA1 (patch-ab) = 02a1245efef23f1807c05aab530bf0ae4502fd5a
-SHA1 (patch-ac) = fb99e0330bbec8c0813eb8a38fe534e090878c43
+SHA1 (mp3blaster-3.1.3.tar.gz) = 516f0b55443c9b7035ef2a82903b369c13a8f001
+Size (mp3blaster-3.1.3.tar.gz) = 273688 bytes
+SHA1 (patch-ab) = 6c0535a5cecba3c28c08e323fc2b3800f40692de
+SHA1 (patch-ac) = 216d44457f7f7d814123e418528acacbef3b5398
diff --git a/audio/mp3blaster/patches/patch-ab b/audio/mp3blaster/patches/patch-ab
index 7ef4698c884..d7c56febab1 100644
--- a/audio/mp3blaster/patches/patch-ab
+++ b/audio/mp3blaster/patches/patch-ab
@@ -1,22 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2002/03/18 14:13:53 rxg Exp $
+$NetBSD: patch-ab,v 1.3 2002/11/22 17:02:05 jschauma Exp $
 
---- src/Makefile.in.orig	Sun Mar 17 04:00:49 2002
-+++ src/Makefile.in
-@@ -85,8 +85,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- src/Makefile.in.orig	Fri Nov 22 11:24:37 2002
++++ src/Makefile.in	Fri Nov 22 11:25:30 2002
+@@ -75,8 +75,7 @@
+ SRCDIRS = @SRCDIRS@
+ VERSION = @VERSION@
  
 -bin_PROGRAMS = mp3blaster mp3tag splay
 -#bin_PROGRAMS		= mp3blaster mp3tag
-+bin_PROGRAMS = mp3blaster mp3tag
- mp3blaster_SOURCES = fileman.cc \
- 			  main.cc \
- 			  scrollwin.cc \
-@@ -131,7 +130,6 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--bin_PROGRAMS = mp3blaster$(EXEEXT) mp3tag$(EXEEXT) splay$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
++bin_PROGRAMS		= mp3blaster mp3tag
+ mp3blaster_SOURCES = fileman.cc 			  main.cc 			  scrollwin.cc 			  getopt.c 			  getopt1.c 			  fileman.h 			  genretab.h 			  getopt.h 				id3parse.cc 			  id3parse.h 			  mp3blaster.h 			  global.cc 			  global.h 			  config.cc 			  scrollwin.h 			  winitem.cc 			  winitem.h 			  mp3win.cc 			  mp3win.h 			  mp3item.cc 			  mp3item.h 				keybindings.h 				history.cc 				history.h 				getinput.cc 				getinput.h 				interface.cc 				interface.h
  
- am_mp3blaster_OBJECTS = fileman.$(OBJEXT) main.$(OBJEXT) \
+ splay_SOURCES = splay.cc splay.h splay_common.cc
diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac
index 8804eafb154..22dcf29fb9a 100644
--- a/audio/mp3blaster/patches/patch-ac
+++ b/audio/mp3blaster/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2002/03/18 14:13:53 rxg Exp $
+$NetBSD: patch-ac,v 1.3 2002/11/22 17:02:05 jschauma Exp $
 
---- Makefile.in.orig	Sun Mar 17 04:00:46 2002
-+++ Makefile.in
-@@ -86,7 +86,7 @@
- install_sh = @install_sh@
+--- Makefile.in.orig	Fri Nov 22 11:21:10 2002
++++ Makefile.in	Fri Nov 22 11:21:24 2002
+@@ -76,7 +76,7 @@
+ VERSION = @VERSION@
  
  SUBDIRS = mpegsound nmixer src doc
 -man_MANS = mp3blaster.1 nmixer.1 splay.1
 +man_MANS = mp3blaster.1 nmixer.1
- EXTRA_DIST = CREDITS TODO FAQ id3scripts/id3name.sh mp3blaster.1 nmixer.1 \
- 	winnt/AUTHORS winnt/README.txt winnt/getopt.c winnt/getopt.h \
- 	winnt/id3parse.cpp winnt/id3parse.h winnt/mp3tag.cpp winnt/mp3tag.mak \
+ EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 	BUGS splay.1 mp3blaster.list mp3blaster.spec
+ 
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4