Make this correctly compile with gcc3, by reorganizing the way it pulls

up getop_long_only implementation. Patch sent to the author.

Ok'd by seb@.

18 files changed, 1094 insertions, 16 deletions

diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index e596f3c9d98..19e12865ed7 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/30 09:43:59 cube Exp $
 
 DISTNAME=	mp3blaster-3.1.3
 PKGREVISION=	3
@@ -25,6 +25,12 @@ CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \
 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
+
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index aafb042fed6..ec84699c7df 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,6 +1,20 @@
-$NetBSD: distinfo,v 1.3 2002/11/22 17:02:04 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2003/09/30 09:43:59 cube Exp $
 
 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
+SHA1 (patch-aa) = d6a9663d14bcf353e0c78df9d63f3c3565e4b074
+SHA1 (patch-ab) = 285020f22f45c1b0e84b87f67e454de81dd0538a
+SHA1 (patch-ac) = 859ad4b9ea4a501be08672142f1fed462abaa707
+SHA1 (patch-ad) = b181950ed46cb29508f75a9e681038a66444b48d
+SHA1 (patch-ae) = 74e28ada4059863c51eb7590b28c58a3b07bb1c2
+SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
+SHA1 (patch-ag) = 3f8d5320cac1f76c1c43fd53bda1cdf5bc4ae08b
+SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
+SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
+SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
+SHA1 (patch-ak) = d839af2dd8bc09260b67573b7837789a4b718340
+SHA1 (patch-al) = c43b9f42050fd3bfb5943d3c3bc1c3d8814b8eb7
+SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
+SHA1 (patch-an) = 1a29ac76aa9725f7d42f31a4713defafd675c1af
+SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
+SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
diff --git a/audio/mp3blaster/patches/patch-aa b/audio/mp3blaster/patches/patch-aa
new file mode 100644
index 00000000000..ef998c900da
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-aa
@@ -0,0 +1,315 @@
+$NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+
+--- getopt/Makefile.in.orig	2003-09-29 13:46:00.000000000 +0200
++++ getopt/Makefile.in
+@@ -0,0 +1,310 @@
++# 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 = :
++CC = @CC@
++CXX = @CXX@
++LIBGETOPT = @LIBGETOPT@
++LIBMPEGSOUND = @LIBMPEGSOUND@
++LIBMYSQL = @LIBMYSQL@
++LIBNMIXER = @LIBNMIXER@
++LN_S = @LN_S@
++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 = gtar
++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
index d7c56febab1..14fd5a8ce72 100644
--- a/audio/mp3blaster/patches/patch-ab
+++ b/audio/mp3blaster/patches/patch-ab
@@ -1,14 +1,212 @@
-$NetBSD: patch-ab,v 1.3 2002/11/22 17:02:05 jschauma Exp $
+$NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
 
---- 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 @@
+--- src/Makefile.in.orig	2002-10-20 19:05:08.000000000 +0200
++++ src/Makefile.in
+@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ CC = @CC@
+ CXX = @CXX@
++LIBGETOPT = @LIBGETOPT@
+ LIBMPEGSOUND = @LIBMPEGSOUND@
+ LIBMYSQL = @LIBMYSQL@
+ LIBNMIXER = @LIBNMIXER@
+@@ -75,9 +76,9 @@ SID_LIBS = @SID_LIBS@
  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 			  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
++bin_PROGRAMS = mp3blaster mp3tag
+ #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
+@@ -85,9 +86,9 @@ 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@ @NCURSES_LIBS@
++mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
+ EXTRA_DIST = FILES
+ CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -104,9 +105,8 @@ 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 = 
+@@ -124,8 +124,12 @@ DIST_COMMON =  Makefile.am Makefile.in
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = tar
++TAR = gtar
+ GZIP_ENV = --best
++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/splay.P .deps/splay_common.P .deps/winitem.P
+ SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
+ OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
+ 
+@@ -133,9 +137,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 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
+ 
+@@ -165,9 +169,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 $<
+ 
+@@ -216,7 +217,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:
+ 
+@@ -232,6 +233,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 \
+@@ -243,6 +249,56 @@ distdir: $(DISTFILES)
+ 	  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
++
++%.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:
+@@ -280,23 +336,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."
+ 
+@@ -306,12 +363,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
index 22dcf29fb9a..7a7614ed90f 100644
--- a/audio/mp3blaster/patches/patch-ac
+++ b/audio/mp3blaster/patches/patch-ac
@@ -1,13 +1,62 @@
-$NetBSD: patch-ac,v 1.3 2002/11/22 17:02:05 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
 
---- Makefile.in.orig	Fri Nov 22 11:21:10 2002
-+++ Makefile.in	Fri Nov 22 11:21:24 2002
-@@ -76,7 +76,7 @@
+--- Makefile.in.orig	2002-10-20 19:05:07.000000000 +0200
++++ Makefile.in
+@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ CC = @CC@
+ CXX = @CXX@
++LIBGETOPT = @LIBGETOPT@
+ LIBMPEGSOUND = @LIBMPEGSOUND@
+ LIBMYSQL = @LIBMYSQL@
+ LIBNMIXER = @LIBNMIXER@
+@@ -75,8 +76,8 @@ SID_LIBS = @SID_LIBS@
+ SRCDIRS = @SRCDIRS@
  VERSION = @VERSION@
  
- SUBDIRS = mpegsound nmixer src doc
+-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
+@@ -94,14 +95,14 @@ configure configure.in install-sh missin
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = tar
++TAR = gtar
+ 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
+ 
+@@ -258,7 +259,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:
+ 
+@@ -307,6 +308,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
new file mode 100644
index 00000000000..b23b5170ac3
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ad
@@ -0,0 +1,66 @@
+$NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- configure.orig	2002-10-20 19:04:59.000000000 +0200
++++ configure
+@@ -1589,7 +1589,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:1596: checking for $ac_func" >&5
+@@ -2420,7 +2420,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
+@@ -3749,13 +3749,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
+@@ -3858,7 +3860,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
+ 
+@@ -3919,6 +3921,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
+@@ -3961,7 +3964,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
new file mode 100644
index 00000000000..997a77ec7a2
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ae
@@ -0,0 +1,194 @@
+$NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- nmixer/Makefile.in.orig	2002-10-20 19:05:08.000000000 +0200
++++ nmixer/Makefile.in
+@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ CC = @CC@
+ CXX = @CXX@
++LIBGETOPT = @LIBGETOPT@
+ LIBMPEGSOUND = @LIBMPEGSOUND@
+ LIBMYSQL = @LIBMYSQL@
+ LIBNMIXER = @LIBNMIXER@
+@@ -77,12 +78,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
+@@ -99,8 +99,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)
+ 
+@@ -120,8 +119,10 @@ Makefile.in
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = tar
++TAR = gtar
+ 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)
+ 
+@@ -129,9 +130,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
+ 
+@@ -145,9 +146,6 @@ distclean-noinstLIBRARIES:
+ 
+ maintainer-clean-noinstLIBRARIES:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -218,7 +216,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:
+ 
+@@ -234,6 +232,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 \
+@@ -245,6 +248,56 @@ distdir: $(DISTFILES)
+ 	  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
++
++%.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:
+@@ -283,25 +336,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."
+ 
+@@ -313,8 +366,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
new file mode 100644
index 00000000000..dca3582003f
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-af
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..85004864393
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- src/main.cc.orig	2002-10-20 16:19:08.000000000 +0200
++++ src/main.cc
+@@ -45,10 +45,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>
diff --git a/audio/mp3blaster/patches/patch-ah b/audio/mp3blaster/patches/patch-ah
new file mode 100644
index 00000000000..965c40b09d1
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ah
@@ -0,0 +1,7 @@
+$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
new file mode 100644
index 00000000000..9ee90f27c08
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ai
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..18b7672afcc
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-aj
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..7daac6de983
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ak
@@ -0,0 +1,10 @@
+$NetBSD: patch-ak,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- Makefile.am.orig	2002-10-20 18:29:01.000000000 +0200
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = mpegsound nmixer src doc
++SUBDIRS = getopt mpegsound nmixer src doc
+ man_MANS = mp3blaster.1 nmixer.1 splay.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
new file mode 100644
index 00000000000..6a38d6471f8
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-al
@@ -0,0 +1,43 @@
+$NetBSD: patch-al,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- configure.in.orig	2002-10-20 18:34:43.000000000 +0200
++++ 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)
+ 
+ #For FreeBSD, look in /usr/local/(lib,include) first, since ncurses4
+ #must be installed as an add-on on these systems in /usr/local
+@@ -201,7 +201,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)
+@@ -336,15 +336,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
new file mode 100644
index 00000000000..c3883b2be65
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-am
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..302b1c7eedd
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-an
@@ -0,0 +1,27 @@
+$NetBSD: patch-an,v 1.1 2003/09/30 09:44:00 cube Exp $
+
+--- src/Makefile.am.orig	2002-09-20 22:40:15.000000000 +0200
++++ src/Makefile.am
+@@ -3,11 +3,8 @@ bin_PROGRAMS		= mp3blaster mp3tag splay
+ mp3blaster_SOURCES	= fileman.cc \
+ 			  main.cc \
+ 			  scrollwin.cc \
+-			  getopt.c \
+-			  getopt1.c \
+ 			  fileman.h \
+ 			  genretab.h \
+-			  getopt.h \
+ 				id3parse.cc \
+ 			  id3parse.h \
+ 			  mp3blaster.h \
+@@ -35,8 +32,8 @@ 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@ @NCURSES_LIBS@
++mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_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
new file mode 100644
index 00000000000..5cb2693ba81
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ao
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 00000000000..0ab9286b869
--- /dev/null
+++ b/audio/mp3blaster/patches/patch-ap
@@ -0,0 +1,16 @@
+$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"
+