6 files changed, 96 insertions, 119 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 0ded05d6d376..82c361172136 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mp3blaster
-PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTVERSION=	3.2.1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.stack.nl/~brama/mp3blaster/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	MP3 console ncurses-based player
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index 4a6113b272dc..7d744aca9f12 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,2 +1,3 @@
-MD5 (mp3blaster-3.2.0.tar.gz) = d01a36de2ebb5b4f7c407ae6cc7668b1
-SIZE (mp3blaster-3.2.0.tar.gz) = 312991
+MD5 (mp3blaster-3.2.1.tar.gz) = 25e3a441ecd22693d3d346d1fe2d858b
+SHA256 (mp3blaster-3.2.1.tar.gz) = d5c285511c151bc5849dbbfdb9dd1a5faf857bface7352352a7acf8cf092e797
+SIZE (mp3blaster-3.2.1.tar.gz) = 320282
diff --git a/audio/mp3blaster/files/patch-nmixer::Makefile.in b/audio/mp3blaster/files/patch-nmixer::Makefile.in
index 4e9c777a5c9e..babba25c5bf5 100644
--- a/audio/mp3blaster/files/patch-nmixer::Makefile.in
+++ b/audio/mp3blaster/files/patch-nmixer::Makefile.in
@@ -1,45 +1,40 @@
-
-$FreeBSD$
-
---- nmixer/Makefile.in.orig	Sat Nov 29 05:07:25 2003
-+++ nmixer/Makefile.in	Sat Dec  6 00:13:22 2003
-@@ -87,9 +87,8 @@
+--- 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
--
--CXXFLAGS = @NAS_CFLAGS@
+-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
-+CXXFLAGS = @CXXFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -105,8 +104,7 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libnmixer_a_LIBADD = 
--libnmixer_a_OBJECTS =  nmixer.o mixers.o ossmixer.o nasmixer.o getopt.o \
--getopt1.o
-+libnmixer_a_OBJECTS =  nmixer.o mixers.o ossmixer.o nasmixer.o
- AR = ar
- PROGRAMS =  $(bin_PROGRAMS)
  
-@@ -250,13 +248,11 @@
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--getopt.o: getopt.c ../config.h
--getopt1.o: getopt1.c ../config.h getopt.h
--main.o: main.cc nmixer.h ../config.h getopt.h
--mixers.o: mixers.cc nmixer.h ../config.h getopt.h
-+main.o: main.cc nmixer.h ../config.h
-+mixers.o: mixers.cc nmixer.h ../config.h
- nasmixer.o: nasmixer.cc
--nmixer.o: nmixer.cc nmixer.h ../config.h getopt.h
--ossmixer.o: ossmixer.cc nmixer.h ../config.h getopt.h
-+nmixer.o: nmixer.cc nmixer.h ../config.h
-+ossmixer.o: ossmixer.cc nmixer.h ../config.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
  
- info-am:
- info: info-am
+-@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
index 7d6b133058aa..9e03aeab3289 100644
--- a/audio/mp3blaster/files/patch-src::Makefile.in
+++ b/audio/mp3blaster/files/patch-src::Makefile.in
@@ -1,64 +1,45 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Sat Nov 29 05:07:27 2003
-+++ src/Makefile.in	Sat Dec  6 00:10:10 2003
-@@ -83,7 +83,7 @@
+--- 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)
  
- bin_PROGRAMS = mp3blaster mp3tag splay
- #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
-+mp3blaster_SOURCES = fileman.cc 			  main.cc 			  scrollwin.cc 			  fileman.h 			  genretab.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
- 
- splay_SOURCES = splay.cc splay.h splay_common.cc
- splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
-@@ -110,9 +110,8 @@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--mp3blaster_OBJECTS =  fileman.o main.o scrollwin.o getopt.o getopt1.o \
--id3parse.o global.o config.o winitem.o mp3win.o mp3item.o history.o \
--getinput.o interface.o
-+mp3blaster_OBJECTS =  fileman.o main.o scrollwin.o id3parse.o global.o \
-+config.o winitem.o mp3win.o mp3item.o history.o getinput.o interface.o
- mp3blaster_LDFLAGS = 
- mp3tag_OBJECTS =  id3parse.o mp3tag.o
- mp3tag_LDFLAGS = 
-@@ -249,30 +248,28 @@
- 	  fi; \
- 	done
- config.o: config.cc mp3blaster.h ../config.h global.h
--fileman.o: fileman.cc mp3blaster.h ../config.h getopt.h fileman.h \
-+fileman.o: fileman.cc mp3blaster.h ../config.h fileman.h \
- 	scrollwin.h winitem.h global.h
- getinput.o: getinput.cc getinput.h ../config.h
--getopt.o: getopt.c ../config.h
--getopt1.o: getopt1.c ../config.h getopt.h
--global.o: global.cc getopt.h mp3blaster.h ../config.h id3parse.h
--history.o: history.cc ../config.h history.h getopt.h
-+global.o: global.cc mp3blaster.h ../config.h id3parse.h
-+history.o: history.cc ../config.h history.h
- id3parse.o: id3parse.cc id3parse.h genretab.h
- interface.o: interface.cc
--main.o: main.cc ../config.h history.h getopt.h mp3blaster.h global.h \
-+main.o: main.cc ../config.h history.h mp3blaster.h global.h \
- 	scrollwin.h winitem.h mp3win.h fileman.h \
- 	../mpegsound/mpegsound.h ../nmixer/nmixer.h keybindings.h \
- 	getinput.h
- mp3item.o: mp3item.cc mp3item.h winitem.h mp3blaster.h ../config.h \
- 	mp3win.h scrollwin.h
--mp3tag.o: mp3tag.cc mp3blaster.h ../config.h getopt.h \
-+mp3tag.o: mp3tag.cc mp3blaster.h ../config.h \
- 	../mpegsound/mpegsound.h id3parse.h
- mp3win.o: mp3win.cc mp3win.h scrollwin.h mp3blaster.h ../config.h \
- 	winitem.h mp3item.h
- scrollwin.o: scrollwin.cc mp3blaster.h ../config.h global.h scrollwin.h \
- 	winitem.h
--splay.o: splay.cc ../config.h getopt.h ../mpegsound/mpegsound.h splay.h
-+splay.o: splay.cc ../config.h ../mpegsound/mpegsound.h splay.h
- splay_common.o: splay_common.cc ../config.h ../mpegsound/mpegsound.h \
--	getopt.h splay.h
-+	splay.h
- winitem.o: winitem.cc mp3blaster.h ../config.h scrollwin.h winitem.h
- 
- info-am:
+ 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@
diff --git a/audio/mp3blaster/pkg-descr b/audio/mp3blaster/pkg-descr
index 8a5d849ab004..3edb003df0bf 100644
--- a/audio/mp3blaster/pkg-descr
+++ b/audio/mp3blaster/pkg-descr
@@ -3,4 +3,4 @@ the unique features of this player is the ability to divide
 a playlist into groups (albums). Therefore, the play order
 can be adjusted with great flexibility.
 						
-WWW: http://www.stack.nl/~brama/mp3blaster.html
+WWW: http://mp3blaster.sourceforge.net/
diff --git a/audio/mp3blaster/pkg-plist b/audio/mp3blaster/pkg-plist
index 147d6f02be54..98acaff369c5 100644
--- a/audio/mp3blaster/pkg-plist
+++ b/audio/mp3blaster/pkg-plist
@@ -3,14 +3,14 @@ bin/mp3blaster
 bin/mp3tag
 bin/nmixer
 bin/splay
-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/sample.mp3blasterrc
-@dirrm share/mp3blaster/charmap
-@dirrm share/mp3blaster
+%%DATADIR%%/charmap/README
+%%DATADIR%%/charmap/chargen.c
+%%DATADIR%%/charmap/koi8-r
+%%DATADIR%%/charmap/makefile.charmap
+%%DATADIR%%/charmap/maketbl.c
+%%DATADIR%%/charmap/win1251
+%%DATADIR%%/charmap/win2koi.tbl
+%%DATADIR%%/commands.txt
+%%DATADIR%%/sample.mp3blasterrc
+@dirrm %%DATADIR%%/charmap
+@dirrm %%DATADIR%%