Update to 3.2.5.

* Update MASTER_SITES.
* Add some options.

Changelog:
V3.2.5 2009/01/24
=================

 * minor compilation fixes from freebsd ports maintainer Roman Bogorodskiy

V3.2.4 2009/01/18
=================

 * Fixed bug in buffering code when using SDL as audio output; this fixes
   possible hickups in such cases.

 * When changing back directories in the file browser, jump to the
   position in the file list the user came from.

 * Reduced number of warnings using newer g++ versions

V3.2.3 2006/08/05
=================

 * Fixed parallel build bug, make -j now works

 * Fixed typos in CharsetMap documentation

 * Implemented screen resizing

 * Fixed a race condition which caused 100% CPU consumption at the end of
    each played song

V3.2.2 2006/01/29
=================

 * Added support for audio playback using SDL (mixer is not supported (yet))

 * Added Esound (Enlightened Sound Daemon) support

 * Removed strict dependency on OSS support, now that there are alternatives

 * Cleaned up code to allow compilation on MacOS X Tiger and Cygwin

 * Fixed a couple of minor memory allocation bugs

 * Fixed NAS playback (should work, but untested)

V3.2.1 2005/12/06
=================

 * Made cursor follow the highlighted bar in playlist/filemanager, to aid
   blind people

 * Fixed a bug in mpegsound library that could cause mp3blaster to crash.
   Thanks go to Serge van den Boom for reporting the problem.

21 files changed, 32 insertions, 1263 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index e8f00fc5829..42b2fb3ed9c 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/06/30 00:07:10 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2011/03/07 09:34:32 ryoon Exp $
 
-DISTNAME=	mp3blaster-3.2.0
-PKGREVISION=	3
+DISTNAME=	mp3blaster-3.2.5
 CATEGORIES=	audio
-MASTER_SITES=	http://www.stack.nl/~brama/mp3blaster/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3blaster/}
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://mp3blaster.sourceforge.net/
@@ -11,16 +10,13 @@ COMMENT=	MP3 console curses-based player
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_JOBS_SAFE=		no
+CONFLICTS=		splay-[0-9]*
 
 PTHREAD_OPTS+=	require
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-cxxflags=${CXXFLAGS:Q} \
-		--with-curses \
-		--with-oggvorbis
 
 .include "../../mk/pthread.buildlink3.mk"
 
@@ -28,14 +24,27 @@ CONFIGURE_ARGS+=--with-cxxflags=${CXXFLAGS:Q} \
 CONFIGURE_ARGS+=	--enable-newthreads
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}/getopt
-	${MV} ${WRKSRC}/nmixer/getopt.h ${WRKSRC}/nmixer/getopt.c \
-		${WRKSRC}/nmixer/getopt1.c ${WRKSRC}/getopt
-	${RM} ${WRKSRC}/src/getopt.h ${WRKSRC}/src/getopt.c \
-		${WRKSRC}/src/getopt1.c
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mp3blaster
+PKG_SUPPORTED_OPTIONS=	esound oss sdl
+PKG_SUGGESTED_OPTIONS=	oss
 
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+=	--with-esd=yes
+.include "../../audio/esound/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Moss)
+CONFIGURE_ARGS+=	--with-oss=yes
 .include "../../mk/oss.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--with-sdl=yes
+.include "../../devel/SDL/buildlink3.mk"
+.endif
+
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/PLIST b/audio/mp3blaster/PLIST
index 97948462841..e747527ceae 100644
--- a/audio/mp3blaster/PLIST
+++ b/audio/mp3blaster/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/03/07 09:34:32 ryoon Exp $
 bin/mp3blaster
 bin/mp3tag
 bin/nmixer
+bin/splay
 man/man1/mp3blaster.1
 man/man1/nmixer.1
+man/man1/splay.1
 share/mp3blaster/charmap/README
 share/mp3blaster/charmap/chargen.c
 share/mp3blaster/charmap/koi8-r
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index 1f6d53fa208..1a8f79458e8 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,23 +1,5 @@
-$NetBSD: distinfo,v 1.10 2007/08/08 20:14:52 joerg Exp $
+$NetBSD: distinfo,v 1.11 2011/03/07 09:34:32 ryoon Exp $
 
-SHA1 (mp3blaster-3.2.0.tar.gz) = edc4538ad233270dd4b17066c5d2267708f1b5e0
-RMD160 (mp3blaster-3.2.0.tar.gz) = 462c75e27c91ac7473103bd0e08882bea3d0db8d
-Size (mp3blaster-3.2.0.tar.gz) = 312991 bytes
-SHA1 (patch-aa) = d869d2acb66edbf569f39fd8d35e66b4651b4f77
-SHA1 (patch-ab) = f4d2486c915e593c81653df1285d532706e4107b
-SHA1 (patch-ac) = 3ad9344d22e511682ad05ab1e2dfbc057fb6cf96
-SHA1 (patch-ad) = 99a3f363c3c6fb084a6790aceeb7b5ecd45cfb9f
-SHA1 (patch-ae) = 65feb8611cea4b0f6e8de593e56972d676fb64d4
-SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
-SHA1 (patch-ag) = 38a3924df2ec474ca82f69d8b6c47a7e9df2bde3
-SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
-SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
-SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
-SHA1 (patch-ak) = 35ec20a47287e0a158b385be3e8fcc133684d40b
-SHA1 (patch-al) = 746d2441b79530f3efa51bcd2bce847f247eec7c
-SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
-SHA1 (patch-an) = 7e801e08c2d5e72ff6dd4215c8d3466362fc54b1
-SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
-SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
-SHA1 (patch-aq) = a1dd9085c242d9050a1d9a3f70d40615f06a217d
-SHA1 (patch-ar) = 29b6d577b2b42c472b4c9daad8e8fb7efdf94620
+SHA1 (mp3blaster-3.2.5.tar.gz) = 6a0fc892e0739a409735e85b18089c0e25fcc577
+RMD160 (mp3blaster-3.2.5.tar.gz) = 8aca362a6212a93cad26e428480b233766b1888b
+Size (mp3blaster-3.2.5.tar.gz) = 329407 bytes
diff --git a/audio/mp3blaster/patches/patch-aa b/audio/mp3blaster/patches/patch-aa
deleted file mode 100644
index 491a44a8a10..00000000000
--- a/audio/mp3blaster/patches/patch-aa
+++ /dev/null
@@ -1,321 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/12/03 12:31:36 cube Exp $
-
---- getopt/Makefile.in.orig	2003-11-29 15:26:17.000000000 +0100
-+++ getopt/Makefile.in
-@@ -0,0 +1,316 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+CC = @CC@
-+CXX = @CXX@
-+HAVE_LIB = @HAVE_LIB@
-+LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
-+LIBMPEGSOUND = @LIBMPEGSOUND@
-+LIBMYSQL = @LIBMYSQL@
-+LIBNMIXER = @LIBNMIXER@
-+LIRC_LIBS = @LIRC_LIBS@
-+LN_S = @LN_S@
-+LTLIB = @LTLIB@
-+MAKEINFO = @MAKEINFO@
-+MP3B_MODULES = @MP3B_MODULES@
-+NAS_CFLAGS = @NAS_CFLAGS@
-+NAS_LIBS = @NAS_LIBS@
-+NCURSES_LIBS = @NCURSES_LIBS@
-+OGG_LIBS = @OGG_LIBS@
-+PACKAGE = @PACKAGE@
-+RANLIB = @RANLIB@
-+SID_LIBS = @SID_LIBS@
-+SRCDIRS = @SRCDIRS@
-+VERSION = @VERSION@
-+
-+noinst_LIBRARIES = libgetopt.a
-+libgetopt_a_SOURCES = gnugetopt.h getopt.c getopt1.c
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = ../config.h
-+CONFIG_CLEAN_FILES = 
-+LIBRARIES =  $(noinst_LIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I..
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+X_CFLAGS = @X_CFLAGS@
-+X_LIBS = @X_LIBS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+libgetopt_a_LIBADD = 
-+libgetopt_a_OBJECTS =  getopt.o getopt1.o
-+AR = ar
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/getopt.P .deps/getopt1.P
-+SOURCES = $(libgetopt_a_SOURCES)
-+OBJECTS = $(libgetopt_a_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .o .s
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu getopt/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-noinstLIBRARIES:
-+
-+clean-noinstLIBRARIES:
-+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+
-+distclean-noinstLIBRARIES:
-+
-+maintainer-clean-noinstLIBRARIES:
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+libgetopt.a: $(libgetopt_a_OBJECTS) $(libgetopt_a_DEPENDENCIES)
-+	-rm -f libgetopt.a
-+	$(AR) cru libgetopt.a $(libgetopt_a_OBJECTS) $(libgetopt_a_LIBADD)
-+	$(RANLIB) libgetopt.a
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = getopt
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu getopt/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am:
-+uninstall: uninstall-am
-+all-am: Makefile $(LIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
-+		clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-tags \
-+		maintainer-clean-depend maintainer-clean-generic \
-+		distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
diff --git a/audio/mp3blaster/patches/patch-ab b/audio/mp3blaster/patches/patch-ab
deleted file mode 100644
index 017a84388eb..00000000000
--- a/audio/mp3blaster/patches/patch-ab
+++ /dev/null
@@ -1,264 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/12/03 12:31:36 cube Exp $
-
---- src/Makefile.in.orig	2003-11-28 21:07:27.000000000 +0100
-+++ src/Makefile.in
-@@ -10,6 +10,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+#bin_PROGRAMS		= mp3blaster mp3tag splay
-+
- 
- SHELL = @SHELL@
- 
-@@ -63,6 +65,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -81,19 +84,15 @@ SID_LIBS = @SID_LIBS@
- SRCDIRS = @SRCDIRS@
- VERSION = @VERSION@
- 
--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
--
--splay_SOURCES = splay.cc splay.h splay_common.cc
--splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
--splay_LDADD = @LIBMPEGSOUND@
-+bin_PROGRAMS = mp3blaster mp3tag
-+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
-+
- mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
--mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
- INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -110,14 +109,11 @@ X_CFLAGS = @X_CFLAGS@
- 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 = 
--splay_OBJECTS =  splay.o splay_common.o
--splay_LDFLAGS = 
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-@@ -132,16 +128,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
--OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
-+DEP_FILES =  .deps/config.P .deps/fileman.P .deps/getinput.P \
-+.deps/global.P .deps/history.P .deps/id3parse.P .deps/interface.P \
-+.deps/main.P .deps/mp3item.P .deps/mp3tag.P .deps/mp3win.P \
-+.deps/scrollwin.P .deps/winitem.P
-+SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES)
-+OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS)
- 
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .cc .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -171,9 +171,6 @@ uninstall-binPROGRAMS:
- 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	done
- 
--.c.o:
--	$(COMPILE) -c $<
--
- .s.o:
- 	$(COMPILE) -c $<
- 
-@@ -197,10 +194,6 @@ mp3blaster: $(mp3blaster_OBJECTS) $(mp3b
- mp3tag: $(mp3tag_OBJECTS) $(mp3tag_DEPENDENCIES)
- 	@rm -f mp3tag
- 	$(CXXLINK) $(mp3tag_LDFLAGS) $(mp3tag_OBJECTS) $(mp3tag_LDADD) $(LIBS)
--
--splay: $(splay_OBJECTS) $(splay_DEPENDENCIES)
--	@rm -f splay
--	$(CXXLINK) $(splay_LDFLAGS) $(splay_OBJECTS) $(splay_LDADD) $(LIBS)
- .cc.o:
- 	$(CXXCOMPILE) -c $<
- 
-@@ -222,7 +215,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
- 
- mostlyclean-tags:
- 
-@@ -238,6 +231,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = src
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -248,33 +246,57 @@ distdir: $(DISTFILES)
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--config.o: config.cc mp3blaster.h ../config.h global.h
--fileman.o: fileman.cc mp3blaster.h ../config.h getopt.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
--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 \
--	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 \
--	../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_common.o: splay_common.cc ../config.h ../mpegsound/mpegsound.h \
--	getopt.h splay.h
--winitem.o: winitem.cc mp3blaster.h ../config.h scrollwin.h winitem.h
- 
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+
-+%.o: %.cc
-+	@echo '$(CXXCOMPILE) -c $<'; \
-+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.cc
-+	@echo '$(LTCXXCOMPILE) -c $<'; \
-+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -312,23 +334,24 @@ distclean-generic:
- 
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
--		mostlyclean-tags mostlyclean-generic
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
--clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
--		mostlyclean-am
-+clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-depend \
-+		clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
--		distclean-generic clean-am
-+		distclean-depend distclean-generic clean-am
- 
- distclean: distclean-am
- 
- maintainer-clean-am:  maintainer-clean-binPROGRAMS \
- 		maintainer-clean-compile maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
-+		maintainer-clean-depend maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -338,12 +361,13 @@ maintainer-clean: maintainer-clean-am
- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
- mostlyclean-compile distclean-compile clean-compile \
- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 			  @MP3B_MODULES@
- 
diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac
deleted file mode 100644
index 457254c025c..00000000000
--- a/audio/mp3blaster/patches/patch-ac
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/12/03 12:31:36 cube Exp $
-
---- Makefile.in.orig	2003-11-28 21:07:22.000000000 +0100
-+++ Makefile.in
-@@ -63,6 +63,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -81,8 +82,8 @@ SID_LIBS = @SID_LIBS@
- SRCDIRS = @SRCDIRS@
- VERSION = @VERSION@
- 
--SUBDIRS = mpegsound nmixer src doc
--man_MANS = mp3blaster.1 nmixer.1 splay.1
-+SUBDIRS = getopt mpegsound nmixer src doc
-+man_MANS = mp3blaster.1 nmixer.1
- EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 	BUGS splay.1 mp3blaster.list mp3blaster.spec
- 
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -106,9 +107,9 @@ GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -265,7 +266,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
- 
- mostlyclean-tags:
- 
-@@ -314,6 +315,11 @@ distdir: $(DISTFILES)
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
- 	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
diff --git a/audio/mp3blaster/patches/patch-ad b/audio/mp3blaster/patches/patch-ad
deleted file mode 100644
index 58565badcdc..00000000000
--- a/audio/mp3blaster/patches/patch-ad
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/11 22:22:37 joerg Exp $
-
---- configure.orig	2003-11-28 20:07:16.000000000 +0000
-+++ configure
-@@ -1591,7 +1591,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
-   fi
- fi
- 
--for ac_func in strdup strstr
-+for ac_func in strdup strstr getopt_long_only
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1598: checking for $ac_func" >&5
-@@ -1665,7 +1665,14 @@ if test "`uname -s`" = "FreeBSD" ; then
-   cat >> confdefs.h <<\EOF
- #define AUDIO_NONBLOCKING 1
- EOF
-+fi
- 
-+if test "`uname -s`" = "DragonFly" ; then
-+  echo "DragonFly detected."
-+  DRAGONFLY=1
-+  cat >> confdefs.h <<\EOF
-+#define AUDIO_NONBLOCKING 1
-+EOF
- fi
- 
- #For NetBSD, look in /usr/pkg/(lib,include) first. Otherwise, the wrong
-@@ -1987,7 +1994,7 @@ fi
- 
- 
- if test "$INCLUDEPTHREAD" = 1 ; then
--	if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
-+	if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
-   	LDFLAGS="$LDFLAGS -pthread"
- 	else
-   	echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-@@ -2542,7 +2549,7 @@ else
- fi
- done
- 
--for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h getopt.h
-+for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3862,7 +3869,7 @@ EOF
- 
- 
- if test "$INCLUDEPTHREAD" = 1 ; then
--  if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 ; then
-+  if test "$FREEBSD" = 1 -o "$OPENBSD" = 1 -o "$DRAGONFLY" = 1 ; then
-     LDFLAGS="$LDFLAGS -pthread"
-     cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
-@@ -3907,13 +3914,15 @@ fi
- 
- 
- 
--LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer"
-+LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer -L../getopt"
- LIBMPEGSOUND="-lmpegsound"
- LIBNMIXER="-lnmixer"
-+LIBGETOPT="-lgetopt"
-+
- 
- 
- 
--SRCDIRS="mpegsound nmixer src doc doc/charmap"
-+SRCDIRS="getopt mpegsound nmixer src doc doc/charmap"
- 
- trap '' 1 2 15
- cat > confcache <<\EOF
-@@ -4016,7 +4025,7 @@ done
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -4079,6 +4088,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
- s%@NCURSES_LIBS@%$NCURSES_LIBS%g
- s%@LIBMPEGSOUND@%$LIBMPEGSOUND%g
- s%@LIBNMIXER@%$LIBNMIXER%g
-+s%@LIBGETOPT@%$LIBGETOPT%g
- s%@SRCDIRS@%$SRCDIRS%g
- 
- CEOF
-@@ -4121,7 +4131,7 @@ EOF
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/audio/mp3blaster/patches/patch-ae b/audio/mp3blaster/patches/patch-ae
deleted file mode 100644
index 780e2986af6..00000000000
--- a/audio/mp3blaster/patches/patch-ae
+++ /dev/null
@@ -1,199 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- nmixer/Makefile.in.orig	2003-11-28 21:07:25.000000000 +0100
-+++ nmixer/Makefile.in
-@@ -63,6 +63,7 @@ CC = @CC@
- CXX = @CXX@
- HAVE_LIB = @HAVE_LIB@
- LIB = @LIB@
-+LIBGETOPT = @LIBGETOPT@
- LIBMPEGSOUND = @LIBMPEGSOUND@
- LIBMYSQL = @LIBMYSQL@
- LIBNMIXER = @LIBNMIXER@
-@@ -83,12 +84,11 @@ VERSION = @VERSION@
- 
- bin_PROGRAMS = nmixer
- nmixer_SOURCES = main.cc
--nmixer_DEPENDENCIES = @LIBNMIXER@
--LDADD = @LIBNMIXER@ @NCURSES_LIBS@
-+nmixer_DEPENDENCIES = @LIBNMIXER@ ../getopt/libgetopt.a
-+LDADD = @LIBNMIXER@ @NCURSES_LIBS@ @LIBGETOPT@
- 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
- CXXFLAGS = @NAS_CFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -105,8 +105,7 @@ X_LIBS = @X_LIBS@
- 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)
- 
-@@ -128,6 +127,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
- 
- TAR = tar
- GZIP_ENV = --best
-+DEP_FILES =  .deps/main.P .deps/mixers.P .deps/nasmixer.P .deps/nmixer.P \
-+.deps/ossmixer.P
- SOURCES = $(libnmixer_a_SOURCES) $(nmixer_SOURCES)
- OBJECTS = $(libnmixer_a_OBJECTS) $(nmixer_OBJECTS)
- 
-@@ -135,9 +136,9 @@ all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .cc .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps nmixer/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu nmixer/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -151,9 +152,6 @@ distclean-noinstLIBRARIES:
- 
- maintainer-clean-noinstLIBRARIES:
- 
--.c.o:
--	$(COMPILE) -c $<
--
- .s.o:
- 	$(COMPILE) -c $<
- 
-@@ -224,7 +222,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
- 
- mostlyclean-tags:
- 
-@@ -240,6 +238,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = nmixer
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu nmixer/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -250,14 +253,57 @@ distdir: $(DISTFILES)
- 	    || 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
--nasmixer.o: nasmixer.cc
--nmixer.o: nmixer.cc nmixer.h ../config.h getopt.h
--ossmixer.o: ossmixer.cc nmixer.h ../config.h getopt.h
- 
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+
-+%.o: %.cc
-+	@echo '$(CXXCOMPILE) -c $<'; \
-+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.cc
-+	@echo '$(LTCXXCOMPILE) -c $<'; \
-+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -296,25 +342,25 @@ distclean-generic:
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
- 		mostlyclean-binPROGRAMS mostlyclean-tags \
--		mostlyclean-generic
-+		mostlyclean-depend mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-noinstLIBRARIES clean-compile clean-binPROGRAMS \
--		clean-tags clean-generic mostlyclean-am
-+		clean-tags clean-depend clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-noinstLIBRARIES distclean-compile \
--		distclean-binPROGRAMS distclean-tags distclean-generic \
--		clean-am
-+		distclean-binPROGRAMS distclean-tags distclean-depend \
-+		distclean-generic clean-am
- 
- distclean: distclean-am
- 
- maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
- 		maintainer-clean-compile maintainer-clean-binPROGRAMS \
--		maintainer-clean-tags maintainer-clean-generic \
--		distclean-am
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -326,8 +372,9 @@ mostlyclean-compile distclean-compile cl
- maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \
- clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
- install-binPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \
--maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
-+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck install-exec-am install-exec \
- install-data-am install-data install-am install uninstall-am uninstall \
- all-redirect all-am all installdirs mostlyclean-generic \
- distclean-generic clean-generic maintainer-clean-generic clean \
diff --git a/audio/mp3blaster/patches/patch-af b/audio/mp3blaster/patches/patch-af
deleted file mode 100644
index dca3582003f..00000000000
--- a/audio/mp3blaster/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- nmixer/main.cc.orig	2002-10-20 16:12:09.000000000 +0200
-+++ nmixer/main.cc
-@@ -4,10 +4,10 @@
- #include "nmixer.h"
- #include <string.h>
- #include <stdlib.h>
--#ifdef HAVE_GETOPT_H
-+#ifdef HAVE_GETOPT_LONG_ONLY
- #  include <getopt.h>
- #else
--#  include "getopt.h"
-+#  include "../getopt/getopt.h"
- #endif
- 
- #ifdef __cplusplus
diff --git a/audio/mp3blaster/patches/patch-ag b/audio/mp3blaster/patches/patch-ag
deleted file mode 100644
index 1fc9d1fdde4..00000000000
--- a/audio/mp3blaster/patches/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2007/01/07 23:53:24 cbiere Exp $
-
---- src/main.cc.orig	2003-09-09 21:22:55.000000000 +0000
-+++ src/main.cc
-@@ -51,10 +51,10 @@
- #include <pth.h>
- #endif
- #include NCURSES
--#ifdef HAVE_GETOPT_H
-+#ifdef HAVE_GETOPT_LONG_ONLY
- #include <getopt.h>
- #else
--#include "getopt.h"
-+#include "../getopt/getopt.h"
- #endif
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
-@@ -2917,7 +2917,7 @@ recsel_files(const char *path, char ***f
- 	while ( (entry = readdir(dir)) )
- 	{
- 		DIR *dir2 = NULL;
--		char *newpath = (char *)malloc((entry->d_reclen + 2 + strlen(path)) *
-+		char *newpath = (char *)malloc((strlen(entry->d_name) + 2 + strlen(path)) *
- 			sizeof(char));
- 
- 		PTH_YIELD;
diff --git a/audio/mp3blaster/patches/patch-ah b/audio/mp3blaster/patches/patch-ah
deleted file mode 100644
index 965c40b09d1..00000000000
--- a/audio/mp3blaster/patches/patch-ah
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/Makefile.am.orig	2003-09-29 13:47:50.000000000 +0200
-+++ getopt/Makefile.am
-@@ -0,0 +1,2 @@
-+noinst_LIBRARIES=		libgetopt.a
-+libgetopt_a_SOURCES=		gnugetopt.h getopt.c getopt1.c
diff --git a/audio/mp3blaster/patches/patch-ai b/audio/mp3blaster/patches/patch-ai
deleted file mode 100644
index 9ee90f27c08..00000000000
--- a/audio/mp3blaster/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- config.h.in.orig	2003-09-29 13:52:57.000000000 +0200
-+++ config.h.in
-@@ -59,6 +59,9 @@
- /* Define if you have the strstr function.  */
- #undef HAVE_STRSTR
- 
-+/* Define if you have the getopt_long_only function.  */
-+#undef HAVE_GETOPT_LONG_ONLY
-+
- /* Define if you have the <bool.h> header file.  */
- #undef HAVE_BOOL_H
- 
-@@ -71,9 +74,6 @@
- /* Define if you have the <fcntl.h> header file.  */
- #undef HAVE_FCNTL_H
- 
--/* Define if you have the <getopt.h> header file.  */
--#undef HAVE_GETOPT_H
--
- /* Define if you have the <machine/soundcard.h> header file.  */
- #undef HAVE_MACHINE_SOUNDCARD_H
- 
diff --git a/audio/mp3blaster/patches/patch-aj b/audio/mp3blaster/patches/patch-aj
deleted file mode 100644
index 18b7672afcc..00000000000
--- a/audio/mp3blaster/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt.h.orig	2003-09-29 14:28:05.000000000 +0200
-+++ getopt/getopt.h
-@@ -97,6 +97,7 @@ struct option
- #define optional_argument	2
- 
- #if defined (__STDC__) && __STDC__
-+#if 0
- #ifdef __GNU_LIBRARY__
- /* Many other libraries have conflicting prototypes for getopt, with
-    differences in the consts, in stdlib.h.  To avoid compilation
-@@ -107,6 +108,7 @@ extern int getopt ();
- #endif /* __GNU_LIBRARY__ */
- extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- 		        const struct option *longopts, int *longind);
-+#endif
- extern int getopt_long_only (int argc, char *const *argv,
- 			     const char *shortopts,
- 		             const struct option *longopts, int *longind);
-@@ -117,8 +119,10 @@ extern int _getopt_internal (int argc, c
- 		             const struct option *longopts, int *longind,
- 			     int long_only);
- #else /* not __STDC__ */
-+#if 0
- extern int getopt ();
- extern int getopt_long ();
-+#endif
- extern int getopt_long_only ();
- 
- extern int _getopt_internal ();
diff --git a/audio/mp3blaster/patches/patch-ak b/audio/mp3blaster/patches/patch-ak
deleted file mode 100644
index 8e5d4bb04a1..00000000000
--- a/audio/mp3blaster/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- Makefile.am.orig	2002-10-20 16:01:47.000000000 +0200
-+++ Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = mpegsound nmixer src doc
--man_MANS = mp3blaster.1 nmixer.1 splay.1
-+SUBDIRS = getopt mpegsound nmixer src doc
-+man_MANS = mp3blaster.1 nmixer.1
- EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 \
- 	BUGS splay.1 mp3blaster.list mp3blaster.spec
diff --git a/audio/mp3blaster/patches/patch-al b/audio/mp3blaster/patches/patch-al
deleted file mode 100644
index 2bca705120d..00000000000
--- a/audio/mp3blaster/patches/patch-al
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-al,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- configure.in.orig	2003-10-26 16:40:37.000000000 +0100
-+++ configure.in
-@@ -17,7 +17,7 @@ AC_C_BIGENDIAN
- 
- dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
--AC_CHECK_FUNCS(strdup strstr)
-+AC_CHECK_FUNCS(strdup strstr getopt_long_only)
- 
- AC_LANG_CPLUSPLUS
- 
-@@ -220,7 +220,7 @@ AC_CHECK_HEADERS(fcntl.h malloc.h sys/io
- AC_CHECK_HEADERS(bool.h)
- AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h pth.h)
- AC_CHECK_HEADERS(curses.h,HAVE_CURSES_H=1)
--AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h soundcard.h getopt.h)
-+AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h soundcard.h)
- AC_CHECK_HEADER(sys/soundcard.h,HAVE_SYS_SOUNDCARD_H=1)
- AC_CHECK_HEADER(machine/soundcard.h,HAVE_MACHINE_SOUNDCARD_H=1)
- AC_CHECK_HEADER(soundcard.h,HAVE_SOUNDCARD_H=1)
-@@ -355,15 +355,17 @@ dnl CXXFLAGS="$CXXFLAGS -D__NO_MATH_INLI
- dnl check for Network Audio System library
- 
- 
--LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer"
-+LDFLAGS="$LDFLAGS -L../mpegsound -L../nmixer -L../getopt"
- LIBMPEGSOUND="-lmpegsound"
- LIBNMIXER="-lnmixer"
-+LIBGETOPT="-lgetopt"
- AC_SUBST(LIBMPEGSOUND)
- AC_SUBST(LIBNMIXER)
-+AC_SUBST(LIBGETOPT)
- 
--SRCDIRS="mpegsound nmixer src doc doc/charmap"
-+SRCDIRS="getopt mpegsound nmixer src doc doc/charmap"
- AC_SUBST(SRCDIRS)
--AC_OUTPUT(src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile)
-+AC_OUTPUT(getopt/Makefile src/Makefile mpegsound/Makefile Makefile nmixer/Makefile doc/Makefile doc/charmap/Makefile)
- 
- PTHREADS_OR_PTH="pthreads"
- if test "$HAVE_PTH" = "yes" ; then PTHREADS_OR_PTH="pth" ; fi
diff --git a/audio/mp3blaster/patches/patch-am b/audio/mp3blaster/patches/patch-am
deleted file mode 100644
index c3883b2be65..00000000000
--- a/audio/mp3blaster/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- nmixer/Makefile.am.orig	2002-10-20 16:11:02.000000000 +0200
-+++ nmixer/Makefile.am
-@@ -1,9 +1,8 @@
- bin_PROGRAMS	= nmixer
- nmixer_SOURCES	= main.cc
--nmixer_DEPENDENCIES = @LIBNMIXER@
--LDADD           = @LIBNMIXER@ @NCURSES_LIBS@
-+nmixer_DEPENDENCIES = @LIBNMIXER@ ../getopt/libgetopt.a
-+LDADD           = @LIBNMIXER@ @NCURSES_LIBS@ @LIBGETOPT@
- 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
- CXXFLAGS = @NAS_CFLAGS@
diff --git a/audio/mp3blaster/patches/patch-an b/audio/mp3blaster/patches/patch-an
deleted file mode 100644
index add85adf719..00000000000
--- a/audio/mp3blaster/patches/patch-an
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-an,v 1.2 2003/12/03 12:31:37 cube Exp $
-
---- src/Makefile.am.orig	2003-09-08 23:48:56.000000000 +0200
-+++ src/Makefile.am
-@@ -1,13 +1,10 @@
--bin_PROGRAMS		= mp3blaster mp3tag splay
--#bin_PROGRAMS		= mp3blaster mp3tag
-+#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 \
-@@ -29,14 +26,11 @@ mp3blaster_SOURCES	= fileman.cc \
- 				interface.cc \
- 				interface.h
- 			  @MP3B_MODULES@
--splay_SOURCES = splay.cc splay.h splay_common.cc
--splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
--splay_LDADD = @LIBMPEGSOUND@
- mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
--mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
-+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
- INCLUDES		= -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS	= @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
diff --git a/audio/mp3blaster/patches/patch-ao b/audio/mp3blaster/patches/patch-ao
deleted file mode 100644
index 5cb2693ba81..00000000000
--- a/audio/mp3blaster/patches/patch-ao
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt.c.orig	2003-09-29 23:27:50.000000000 +0200
-+++ getopt/getopt.c
-@@ -21,17 +21,17 @@
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.  */
- 
--#ifndef HAVE_GETOPT_H
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifndef HAVE_GETOPT_LONG_ONLY
- /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
-    Ditto for AIX 3.2 and <stdlib.h>.  */
- #ifndef _NO_PROTO
- #define _NO_PROTO
- #endif
- 
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
- #if !defined (__STDC__) || !__STDC__
- /* This is a separate conditional since some stdc systems
-    reject `defined (const)'.  */
diff --git a/audio/mp3blaster/patches/patch-ap b/audio/mp3blaster/patches/patch-ap
deleted file mode 100644
index 0ab9286b869..00000000000
--- a/audio/mp3blaster/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/09/30 09:44:00 cube Exp $
-
---- getopt/getopt1.c.orig	2003-09-29 23:28:19.000000000 +0200
-+++ getopt/getopt1.c
-@@ -17,10 +17,10 @@
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.  */
- 
--#ifndef HAVE_GETOPT_H
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#ifndef HAVE_GETOPT_LONG_ONLY
- 
- #include "getopt.h"
- 
diff --git a/audio/mp3blaster/patches/patch-aq b/audio/mp3blaster/patches/patch-aq
deleted file mode 100644
index 62815a81c1c..00000000000
--- a/audio/mp3blaster/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/12/11 22:22:37 joerg Exp $
-
---- src/fileman.cc.orig	2005-12-11 22:08:19.000000000 +0000
-+++ src/fileman.cc
-@@ -212,7 +212,7 @@ fileManager::readDir()
- 		PTH_YIELD;
- 		entries = (char **)realloc (entries, (++diritems) * sizeof(char *));
- 	
--		entries[diritems - 1] = (char *)malloc( ((entry->d_reclen) + 1) *
-+		entries[diritems - 1] = (char *)malloc( (sizeof(*entry) + entry->d_namlen + 1) *
- 			sizeof(char));
- 		strcpy(entries[diritems - 1], entry->d_name);
- 	}
diff --git a/audio/mp3blaster/patches/patch-ar b/audio/mp3blaster/patches/patch-ar
deleted file mode 100644
index 0d83e051719..00000000000
--- a/audio/mp3blaster/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2007/08/08 20:14:52 joerg Exp $
-
---- mpegsound/wavetoraw.cc.orig	2007-08-08 19:56:08.000000000 +0000
-+++ mpegsound/wavetoraw.cc
-@@ -9,11 +9,7 @@
- #include "config.h"
- #endif
- 
--#ifdef __FreeBSD__
- #include <stdlib.h>
--#else
--#include <malloc.h>
--#endif
- 
- #include "mpegsound.h"
-