Upgrade audacity to version 1.2. Notable changes are:

* this is now the stable version
* can now record and edit 24-bit and 32-bit samples
* sound input and output has been improved
* can now record more than two channels at once
* buffering is improved, for lower chances of skipping and buffer underruns
* three new effects change teh pitch and tempo of a track
* most effects now include a preview button
* other new efefcts include compressor, repeat, and normalize
* features a dsp language called nyquist for programming new effects
* improved user interface
* internationalization

21 files changed, 327 insertions, 1134 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index a7c84bf9cf4..f15cbc40e70 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,45 +1,34 @@
-# $NetBSD: Makefile,v 1.24 2004/03/23 04:41:00 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/20 18:02:16 ben Exp $
+# $Id: Makefile,v 1.25 2004/04/20 18:02:16 ben Exp $
 
-DISTNAME=	audacity-src-1.0.0-2
-PKGNAME=	audacity-1.0.0.2
-PKGREVISION=	8
+DISTNAME=	audacity-src-1.2.0
+PKGNAME=	audacity-1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	dotz@irc.pl
 HOMEPAGE=	http://audacity.sourceforge.net/
 COMMENT=	Audio editor
 
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
+DEPENDS+=	zip>=0.0:../../archivers/zip
 
-WRKSRC=		${WRKDIR}/audacity-src-1.0.0
-USE_BUILDLINK3=		yes
-USE_GNU_TOOLS+=		make
+WRKSRC=			${WRKDIR}/audacity-src-1.2.0
+USE_BUILDLINK3=		# defined
 USE_X11=		# defined
+USE_GNU_TOOLS+=		make
+USE_PKGLOCALEDIR=	# defined
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-xaudio
-CONFIGURE_ARGS+=	--with-id3
-CONFIGURE_ARGS+=	--with-libmad
-CONFIGURE_ARGS+=	--with-vorbis
-CONFIGURE_ARGS+=	--with-dev-dsp="${DEVOSSSOUND}"
-CONFIGURE_ARGS+=	--with-helpdir="${PREFIX}/share"
-HAVE_OSS=		NO
+CONFIGURE_ARGS+=	--with-id3=system
+CONFIGURE_ARGS+=	--with-libmad=system
+CONFIGURE_ARGS+=	--with-vorbis=system
+CONFIGURE_ARGS+=	--with-portaudio=system
 
 USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/id3lib/ltconfig
-
-pre-configure:
-	cd ${WRKSRC}/id3lib/include/id3; ${MV} -f strings.h id3_strings.h
-	cd ${WRKSRC}/id3lib; for file in				\
-		`${FIND} . -type f -print |				\
-			${XARGS} ${GREP} -l "\"strings\.h\""`; do	\
-		${SED}	-e "s|\"strings\.h\"|\"id3_strings.h\"|g"	\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	cd ${WRKSRC} && ${AUTOCONF}
+LTCONFIG_OVERRIDE=	${WRKSRC}/lib-src/libsndfile/libtool \
+			${WRKSRC}/lib-src/libsndfile/ltconfig \
+			${WRKSRC}/ltconfig
 
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
@@ -47,6 +36,7 @@ pre-configure:
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 5e336de4256..f2de6cdb4c0 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,6 +1,48 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/04 08:59:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/20 18:02:16 ben Exp $
 bin/audacity
-share/audacity-help.htb
+man/man1/audacity.1
+share/audacity/nyquist/bug.lsp
+share/audacity/nyquist/dspprims.lsp
+share/audacity/nyquist/evalenv.lsp
+share/audacity/nyquist/follow.lsp
+share/audacity/nyquist/init.lsp
+share/audacity/nyquist/misc.lsp
+share/audacity/nyquist/nyinit.lsp
+share/audacity/nyquist/nyqmisc.lsp
+share/audacity/nyquist/nyquist.lsp
+share/audacity/nyquist/printrec.lsp
+share/audacity/nyquist/profile.lsp
+share/audacity/nyquist/seq.lsp
+share/audacity/nyquist/seqfnint.lsp
+share/audacity/nyquist/seqmidi.lsp
+share/audacity/nyquist/sndfnint.lsp
+share/audacity/nyquist/system.lsp
+share/audacity/nyquist/test.lsp
+share/audacity/nyquist/xlinit.lsp
+share/audacity/plug-ins/clicktrack.ny
+share/audacity/plug-ins/crossfadein.ny
+share/audacity/plug-ins/crossfadeout.ny
+share/audacity/plug-ins/delay.ny
+share/audacity/plug-ins/highpass.ny
+share/audacity/plug-ins/lowpass.ny
+share/audacity/plug-ins/pluck.ny
+share/audacity/plug-ins/tremolo.ny
 share/doc/audacity/LICENSE.txt
 share/doc/audacity/README.txt
+share/doc/audacity/audacity-1.2-help.htb
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/audacity.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/audacity.mo
+@dirrm share/audacity/nyquist
+@dirrm share/audacity/plug-ins
+@dirrm share/audacity
 @dirrm share/doc/audacity
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 93b33204d1f..5527f32c728 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,20 +1,12 @@
-$NetBSD: distinfo,v 1.4 2002/10/04 08:59:35 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/04/20 18:02:16 ben Exp $
 
-SHA1 (audacity-src-1.0.0-2.tgz) = 43e8faae6b08b5da05eee1ca196714d4b46c407d
-Size (audacity-src-1.0.0-2.tgz) = 1699503 bytes
-SHA1 (patch-aa) = a06aca17bda18bf5069c6a9110c6b116378f9a63
-SHA1 (patch-ab) = 139a2c31b0972622c0c743060d26c4def96fbfc6
-SHA1 (patch-ac) = 13d3a0f3733d5a155657f4137c1361c07d2f5f54
-SHA1 (patch-ad) = cc23e07d1f72d72fc9751b6370b64da525c4d19f
-SHA1 (patch-ae) = b94af5f25c3d96a9f2113b9a957671c2aaf20512
-SHA1 (patch-af) = 792b7337ef455adbfa935ce6b4923685f48d8b80
-SHA1 (patch-am) = f08098ffda76c7df16e338cde43fc3ae8a4dcb96
-SHA1 (patch-an) = c5ff2eca317134e57c9ce67ace38cf2085d83abb
-SHA1 (patch-ao) = 7e20649a7b56ca7aee66e8a518ec740e8c972c43
-SHA1 (patch-ap) = 0c8fde18fdd12e9986b24df14f4e4c07a2097eb1
-SHA1 (patch-aq) = 00a8ca5e27f0db723c99380193bf5e7fff828a54
-SHA1 (patch-ar) = 3fdc978f37d2f89fde0dcb7ba28f9fc5376d966b
-SHA1 (patch-as) = 1fb481f946bbaaa1b1bb07688bda48fe26702288
-SHA1 (patch-at) = 822621b2bd95cc56a6893a5c16f76317c239b03c
-SHA1 (patch-au) = 1f67a15f24439944e0d9f0c915514e34f696aedc
-SHA1 (patch-av) = 45df7d0d6d67f6ba2c14961f5beea1a656ce52c6
+SHA1 (audacity-src-1.2.0.tar.gz) = 379019855184d8e47809c2c53e384655eda70742
+Size (audacity-src-1.2.0.tar.gz) = 3341562 bytes
+SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
+SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
+SHA1 (patch-ac) = 792ec327195ce105350a4a4d2d96d1a500bdb118
+SHA1 (patch-ad) = 75af90656c6709d5d7f4b166f03a2bf169e3360d
+SHA1 (patch-ae) = 8e22a7a8ce064c8877323e44ffd07286fe3ea02f
+SHA1 (patch-af) = 96cb88cdd9669c9429a61df71e726b727ab1eead
+SHA1 (patch-ag) = 6413d77cbc4e927bf2aa3b40e83b2b45842770eb
+SHA1 (patch-ah) = 5519be7e138fbfc764c8e0f200624a8ab1f0fa10
diff --git a/audio/audacity/patches/patch-aa b/audio/audacity/patches/patch-aa
index 5539944afe5..a12e4c47dbf 100644
--- a/audio/audacity/patches/patch-aa
+++ b/audio/audacity/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2002/10/04 08:59:35 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/20 18:02:16 ben Exp $
 
---- WaveTrack.cpp.orig	Wed Jun  5 00:51:19 2002
-+++ WaveTrack.cpp
-@@ -907,7 +907,9 @@ bool WaveTrack::Load(wxTextFile * in, Di
-          numSamples = 0;
-          block->Clear();
+--- lib-src/libnyquist/cmt/cext.h.orig	Sat Mar  6 16:02:24 2004
++++ lib-src/libnyquist/cmt/cext.h
+@@ -52,6 +52,8 @@ EXIT(n)  -- calls exit(n) after shutting
  
-+#if wxUSE_THREADS
-          blockMutex->Unlock();
-+#endif
- 
-          wxString msg;
-          msg.Printf("One or more data files is missing from this project.");
-@@ -919,7 +921,9 @@ bool WaveTrack::Load(wxTextFile * in, Di
-       block->Add(w);
-    }
- 
-+#if wxUSE_THREADS
-    blockMutex->Unlock();
-+#endif
- 
-    return true;
+ #if HAS_SYS_TYPES_H
+ #include <sys/types.h>
++#define ulong u_long
++#undef NEED_ULONG
+ #endif
  
+ #if HAS_MALLOC_H
diff --git a/audio/audacity/patches/patch-ab b/audio/audacity/patches/patch-ab
index 808c6433038..fce800c6bc2 100644
--- a/audio/audacity/patches/patch-ab
+++ b/audio/audacity/patches/patch-ab
@@ -1,27 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/10/04 08:59:36 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2004/04/20 18:02:16 ben Exp $
 
---- snd/audiooss.c.orig	Wed Jun  5 00:51:19 2002
-+++ snd/audiooss.c
-@@ -16,7 +16,13 @@
- #include <pthread.h>
+--- lib-src/libnyquist/sys/term.c.orig	Sat Mar  6 16:02:50 2004
++++ lib-src/libnyquist/sys/term.c
+@@ -40,7 +40,7 @@ int term_testchar()
+ #else
  
- #include <sys/ioctl.h>
-+#if defined(HAVE_SYS_SOUNDCARD_H)
- #include <sys/soundcard.h>
-+#elif defined(HAVE_SOUNDCARD_H)
-+#include <soundcard.h>
-+#else
-+#error "No OSS soundcard.h header found."
-+#endif
- #include <sys/time.h>
- 
- /* snd includes */
-@@ -187,7 +193,7 @@ int audio_open(snd_type snd, long *flags
-    int channels;
-    int rate;
-    oss_info dp;
--   const char *device = "/dev/dsp";
-+   const char *device = DEV_DSP;
-    pthread_t thread;
- 
-    snd->u.audio.descriptor = (oss_info) malloc(sizeof(oss_info_struct));
+ #include <termios.h>
+-#ifndef __APPLE__
++#ifdef __LINUX__
+ #include <asm/ioctls.h>
+ #endif
+ #include <signal.h>
diff --git a/audio/audacity/patches/patch-ac b/audio/audacity/patches/patch-ac
index 6da0c412658..eeaf359b317 100644
--- a/audio/audacity/patches/patch-ac
+++ b/audio/audacity/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/20 18:02:16 ben Exp $
 
---- snd/sndconfig.h.orig	Fri Jun 15 13:48:58 2001
-+++ snd/sndconfig.h	Fri Jun 15 13:49:22 2001
-@@ -59,7 +59,7 @@
+--- lib-src/libnyquist/snd/sndconfig.h.orig	Sat Feb 28 11:19:39 2004
++++ lib-src/libnyquist/snd/sndconfig.h
+@@ -60,7 +60,7 @@ void snd_free(void *a);
  #elif defined(IRIX)
    #include "sndirix.h"
  
diff --git a/audio/audacity/patches/patch-ad b/audio/audacity/patches/patch-ad
index 67f875a8803..04084c9f35c 100644
--- a/audio/audacity/patches/patch-ad
+++ b/audio/audacity/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2002/10/04 08:59:36 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2004/04/20 18:02:16 ben Exp $
 
---- snd/sndio.c.orig	Wed Jun  5 00:51:19 2002
-+++ snd/sndio.c
+--- lib-src/libnyquist/snd/sndio.c.orig	Sat Feb 28 11:19:39 2004
++++ lib-src/libnyquist/snd/sndio.c
 @@ -20,7 +20,7 @@
  #ifdef WIN32
  #include <sys/stat.h>
@@ -10,4 +10,4 @@ $NetBSD: patch-ad,v 1.2 2002/10/04 08:59:36 jlam Exp $
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
  #include <sys/stat.h>
  #else
- #ifndef __WXMAC__
+ #endif
diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae
index 373fed3c30a..ad849c0d6af 100644
--- a/audio/audacity/patches/patch-ae
+++ b/audio/audacity/patches/patch-ae
@@ -1,43 +1,97 @@
-$NetBSD: patch-ae,v 1.4 2002/10/04 08:59:36 jlam Exp $
+$NetBSD: patch-ae,v 1.5 2004/04/20 18:02:16 ben Exp $
 
---- Makefile.in.orig	Fri Jun  7 23:00:04 2002
-+++ Makefile.in
-@@ -8,7 +8,10 @@
- # from Makefile.in
- #
+--- configure.in.orig	Sat Feb 28 11:19:39 2004
++++ configure.in
+@@ -556,8 +556,8 @@ if [[ "$use_portaudio" = "v19" ]] ; then
  
--LIBS = @LIBS@
-+HELPDIR = @HELPDIR@
-+DEV_DSP = @DEV_DSP@
-+EXTRA_CPPFLAGS = -DHELPDIR=\"$(HELPDIR)\" -DDEV_DSP=\"$(DEV_DSP)\"
-+LIBS = @LIBS@ ${LIBOSSAUDIO}
- CFLAGS = @CFLAGS@ @CPPFLAGS@ -Iallegro
- CCC = @CXX@
- CC = @CC@
-@@ -106,10 +109,11 @@ audacity: $(OBJS) Makefile
- #
- #
- install:
-+	-test -d $(HELPDIR) || mkdir -m 755 -p $(HELPDIR)
-+	-test -f audacity-help.htb && $(INSTALL) -m 644 audacity-help.htb \
-+		$(HELPDIR)/audacity-help.htb
- 	-test -d $(PREFIX)/share/doc/audacity || \
- 		mkdir -m 755 -p $(PREFIX)/share/doc/audacity
--	-test -f audacity-help.htb && $(INSTALL) -m 644 audacity-help.htb \
--		$(PREFIX)/share/doc/audacity/audacity-help.htb
- 	$(INSTALL) -m 644 README.txt $(PREFIX)/share/doc/audacity/README.txt
- 	$(INSTALL) -m 644 LICENSE.txt $(PREFIX)/share/doc/audacity/LICENSE.txt
- 	-test -d $(PREFIX)/bin || \
-@@ -175,10 +179,10 @@ $(DIRS): %: 
- #
+ 	AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
  
- $(OBJDIR)/%.cpp.o: %.cpp
--	$(CCC) -c $(CFLAGS) $< -o $@
-+	$(CCC) -c $(CFLAGS) $(EXTRA_CPPFLAGS) $< -o $@
+-else
+-
++fi
++if [[ "$use_portaudio" = "v18" ]] ; then
+ 	CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
  
- $(OBJDIR)/%.c.o: %.c
--	$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $(EXTRA_CPPFLAGS) $< -o $@
+ 	case "${host_os}" in
+@@ -625,6 +625,81 @@ else
  
- #
- # Include ".depend" if it exists (run "make dep" to generate it)
+ 		BUILDLIBS="$BUILDLIBS portaudio/pa_unix_oss/portaudio.a"
+ 		EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a"
++
++	   if [[ "$use_portmixer" = "yes" ]] ; then
++			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
++			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"		
++	   fi
++
++		if [[ "$use_ladspa" = "default" ]] ; then
++			use_ladspa="yes";
++		fi
++
++		AFTERBUILD=""
++
++	esac
++fi
++if [[ "$use_portaudio" = "system" ]] ; then
++
++	LIBS="$LIBS -lportaudio"
++
++	case "${host_os}" in
++	  darwin* | rhapsody*)
++		dnl Mac OS X configuration
++
++		CONFIGHEADER="configunix.h"
++
++		dnl CoreAudio
++
++		CXXFLAGS="-I../mac $CXXFLAGS"
++
++	   if [[ "$use_portmixer" = "yes" ]] ; then
++			BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
++			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"		
++	   fi
++
++		LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
++		LIBS="-framework CoreAudio $LIBS -lz"
++
++		EXTRATARGETS="../Audacity.app"
++
++		if [[ "$use_ladspa" = "default" ]] ; then
++			use_ladspa="yes";
++		fi
++
++		dnl VST
++		
++		OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
++		OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
++
++	;;
++
++	cygwin*)
++ 	dnl Windows/CygWin configuration
++ 	
++ 	LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
++	LIBS="$LIBS -Wl,--subsystem,windows"
++ 	CONFIGHEADER="configwin.h"
++ 
++    if [[ "$use_portmixer" = "yes" ]] ; then
++ 		BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
++ 		EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
++    fi
++ 
++ 	if [[ "$use_ladspa" = "default" ]] ; then
++ 		use_ladspa="yes";
++ 	fi
++ 
++ 	AC_DEFINE(__CYGWIN__,1,[We're using cygwin])
++ 	AC_DEFINE(_FILE_OFFSET_BITS,32,[Placeholder for large file support])
++ 
++ 	AFTERBUILD=""
++	;;
++
++	  *)
++		dnl Unix OSS configuration
++
++		CONFIGHEADER="configunix.h"
+ 
+ 	   if [[ "$use_portmixer" = "yes" ]] ; then
+ 			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af
index 877b4a0c3e7..188b70f5460 100644
--- a/audio/audacity/patches/patch-af
+++ b/audio/audacity/patches/patch-af
@@ -1,13 +1,99 @@
-$NetBSD: patch-af,v 1.2 2002/10/04 08:59:36 jlam Exp $
+$NetBSD: patch-af,v 1.3 2004/04/20 18:02:16 ben Exp $
 
---- snd/sndcvt.c.orig	Wed Jun  5 00:51:19 2002
-+++ snd/sndcvt.c
-@@ -16,7 +16,7 @@
- #ifdef WIN32
- #include <sys/stat.h>
- #include "io.h"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/stat.h>
- #else
- #ifndef __WXMAC__
+--- configure.orig	Sat Feb 28 11:19:39 2004
++++ configure
+@@ -5869,7 +5869,8 @@ fi
+ subdirs="$subdirs lib-src/portaudio-v19"
+ 
+ 
+-else
++fi
++if [ "$use_portaudio" = "v18" ] ; then
+ 
+ 	CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
+ 
+@@ -5941,6 +5942,84 @@ _ACEOF
+ 
+ 		BUILDLIBS="$BUILDLIBS portaudio/pa_unix_oss/portaudio.a"
+ 		EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a"
++
++	   if [ "$use_portmixer" = "yes" ] ; then
++			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
++			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
++	   fi
++
++		if [ "$use_ladspa" = "default" ] ; then
++			use_ladspa="yes";
++		fi
++
++		AFTERBUILD=""
++
++	esac
++fi
++if [ "$use_portaudio" = "system" ] ; then
++
++	LIBS="$LIBS -lportaudio"
++
++	case "${host_os}" in
++	  darwin* | rhapsody*)
++
++		CONFIGHEADER="configunix.h"
++
++
++		CXXFLAGS="-I../mac $CXXFLAGS"
++
++	   if [ "$use_portmixer" = "yes" ] ; then
++			BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
++			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
++	   fi
++
++		LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
++		LIBS="-framework CoreAudio $LIBS -lz"
++
++		EXTRATARGETS="../Audacity.app"
++
++		if [ "$use_ladspa" = "default" ] ; then
++			use_ladspa="yes";
++		fi
++
++
++		OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
++		OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
++
++	;;
++
++	cygwin*)
++
++ 	LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
++	LIBS="$LIBS -Wl,--subsystem,windows"
++ 	CONFIGHEADER="configwin.h"
++
++    if [ "$use_portmixer" = "yes" ] ; then
++ 		BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
++ 		EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
++    fi
++
++ 	if [ "$use_ladspa" = "default" ] ; then
++ 		use_ladspa="yes";
++ 	fi
++
++
++cat >>confdefs.h <<\_ACEOF
++#define __CYGWIN__ 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
++#define _FILE_OFFSET_BITS 32
++_ACEOF
++
++
++ 	AFTERBUILD=""
++	;;
++
++	  *)
++
++		CONFIGHEADER="configunix.h"
+ 
+ 	   if [ "$use_portmixer" = "yes" ] ; then
+ 			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
diff --git a/audio/audacity/patches/patch-ag b/audio/audacity/patches/patch-ag
new file mode 100644
index 00000000000..45eca4b5c08
--- /dev/null
+++ b/audio/audacity/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.3 2004/04/20 18:02:16 ben Exp $
+
+--- locale/sv.po.orig	Thu Apr  8 18:41:06 2004
++++ locale/sv.po
+@@ -5,11 +5,11 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: Audicity Swedish Translation.\n"
+ "POT-Creation-Date: 2004-02-01 07:48-0800\n"
+ "PO-Revision-Date: 2004-02-04 15:19+0100\n"
+ "Last-Translator: Lars Carlsson <musselasse@hotmail.com>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: Swedish <sv@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/audio/audacity/patches/patch-ah b/audio/audacity/patches/patch-ah
new file mode 100644
index 00000000000..c9d9b9bb7a7
--- /dev/null
+++ b/audio/audacity/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.3 2004/04/20 18:02:16 ben Exp $
+
+--- Makefile.in.orig	Sat Feb 28 11:19:39 2004
++++ Makefile.in
+@@ -36,9 +36,9 @@ install: audacity
+ 
+ 	# install manpage
+ 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+-	-test -f help/audacity.1.gz && \
+-		$(INSTALL) -m 644 help/audacity.1.gz \
+-		$(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
++	-test -f help/audacity.1 && \
++		$(INSTALL) -m 644 help/audacity.1 \
++		$(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1
+ 
+ 	# install nyquist
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
diff --git a/audio/audacity/patches/patch-am b/audio/audacity/patches/patch-am
deleted file mode 100644
index dcd5ace2a6e..00000000000
--- a/audio/audacity/patches/patch-am
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/10/04 08:59:36 jlam Exp $
-
---- AudioIO.cpp.orig	Wed Jun  5 00:51:19 2002
-+++ AudioIO.cpp
-@@ -27,7 +27,7 @@ AudioIO *gAudioIO;
- 
- #ifdef __WXGTK__
- bool gLinuxFirstTime = true;
--char gLinuxDevice[256] = "/dev/dsp";
-+char gLinuxDevice[256] = DEV_DSP;
- #endif
- 
- #ifdef BOUNCE
-@@ -68,7 +68,7 @@ bool AudioIO::OpenPlaybackDevice(Audacit
-    wxString deviceStr = gPrefs->Read("/AudioIO/PlaybackDevice", "");
- #ifdef __WXGTK__
-    if (deviceStr == "")
--      deviceStr = "/dev/dsp";
-+      deviceStr = DEV_DSP;
- #endif
-    strcpy(mPlayNode.u.audio.devicename, deviceStr.c_str());
-    strcpy(mPlayNode.u.audio.interfacename, "");
-@@ -177,7 +177,7 @@ bool AudioIO::StartRecord(AudacityProjec
-    wxString deviceStr = gPrefs->Read("/AudioIO/RecordingDevice", "");
- #ifdef __WXGTK__
-    if (deviceStr == "")
--      deviceStr = "/dev/dsp";
-+      deviceStr = DEV_DSP;
- #endif
-    strcpy(mRecordNode.u.audio.devicename, deviceStr.c_str());
-    strcpy(mRecordNode.u.audio.interfacename, "");
diff --git a/audio/audacity/patches/patch-an b/audio/audacity/patches/patch-an
deleted file mode 100644
index ab2c70fc630..00000000000
--- a/audio/audacity/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.3 2002/10/04 08:59:36 jlam Exp $
-
---- Help.cpp.orig	Wed Jun  5 00:51:19 2002
-+++ Help.cpp
-@@ -106,6 +106,10 @@ void InitHelp(wxWindow * parent)
- 
-       paths.Add(wxGetCwd() + wxFILE_SEP_PATH + "audacity-help.htb");
- 
-+      #ifdef HELPDIR
-+      paths.Add(wxString(HELPDIR) + wxFILE_SEP_PATH + "audacity-help.htb");
-+      #endif
-+
-       #ifdef __WXGTK__
-       paths.Add("/usr/local/share/doc/audacity/audacity-help.htb");
-       paths.Add("/usr/share/doc/audacity/audacity-help.htb");
diff --git a/audio/audacity/patches/patch-ao b/audio/audacity/patches/patch-ao
deleted file mode 100644
index 54db980e25b..00000000000
--- a/audio/audacity/patches/patch-ao
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2002/10/04 08:59:37 jlam Exp $
-
---- prefs/AudioIOPrefs.cpp.orig	Wed Jun  5 00:51:19 2002
-+++ prefs/AudioIOPrefs.cpp
-@@ -74,8 +74,8 @@ AudioIOPrefs::AudioIOPrefs(wxWindow * pa
- PrefsPanel(parent)
- {
- #ifdef __WXGTK__
--   wxString defaultPlaybackDevice = "/dev/dsp";
--   wxString defaultRecordingDevice = "/dev/dsp";
-+   wxString defaultPlaybackDevice = DEV_DSP;
-+   wxString defaultRecordingDevice = DEV_DSP;
- #endif // __WXGTK__
- 
- #ifdef __WXMSW__
-@@ -565,7 +565,7 @@ void AudioIOPrefs::SetPlaybackDeviceDefa
- {
-    /* TODO: attempt autodetection? */
- #ifdef __WXGTK__
--   mPlaybackDeviceCtrl->SetValue("/dev/dsp");
-+   mPlaybackDeviceCtrl->SetValue(DEV_DSP);
- #endif                          // __WXGTK__
- }
- 
-@@ -576,7 +576,7 @@ void AudioIOPrefs::TestRecordingDevice(w
- void AudioIOPrefs::SetRecordingDeviceDefault(wxCommandEvent & event)
- {
- #ifdef __WXGTK__
--   mRecordingDeviceCtrl->SetValue("/dev/dsp");
-+   mRecordingDeviceCtrl->SetValue(DEV_DSP);
- #endif                          // __WXGTK__
- }
- 
diff --git a/audio/audacity/patches/patch-ap b/audio/audacity/patches/patch-ap
deleted file mode 100644
index a443ea56754..00000000000
--- a/audio/audacity/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2002/10/04 08:59:37 jlam Exp $
-
---- snd/sndhead.h.orig	Wed Jun  5 00:51:19 2002
-+++ snd/sndhead.h
-@@ -1,7 +1,7 @@
- /* sndhead.h -- header info */
- 
- /* NeXT sound headers */
--#define NEXT_SND_MAGIC (*((int32_t *) ".snd"))  // was: ((int)0x2e736e64)
-+#define NEXT_SND_MAGIC (sndmagic.i[0])          // was: ((int)0x2e736e64)
- #define NEXT_SND_FORMAT_UNSPECIFIED		(0)
- #define	NEXT_SND_FORMAT_ULAW_8			(1)
- #define NEXT_SND_FORMAT_LINEAR_8		(2)
diff --git a/audio/audacity/patches/patch-aq b/audio/audacity/patches/patch-aq
deleted file mode 100644
index f9e1520c160..00000000000
--- a/audio/audacity/patches/patch-aq
+++ /dev/null
@@ -1,741 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/10/04 08:59:37 jlam Exp $
-
---- snd/sndheader.c.orig	Wed Jun  5 00:51:19 2002
-+++ snd/sndheader.c
-@@ -52,8 +52,12 @@
- 
- #endif
- 
--#if defined(MAC) && !defined(__MACOSX__)
--typedef long int32_t;
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(LINUX) || defined(__MACOSX__)
-+#  include <sys/types.h>
-+#else
-+typedef short		int16_t;
-+typedef long		int32_t;
-+typedef unsigned long	u_int32_t;
- #endif
- 
- #ifndef min
-@@ -75,16 +79,23 @@ typedef long int32_t;
- #define htonl(x) (x)
- #endif
- 
-+const union {
-+	char c[12];
-+	int32_t i[3];
-+} sndmagic = {
-+	".sndFORMRIFF"
-+};
-+
- /* AIFF file Marker declaration */
- typedef struct {
--    short id;
--    long position;
-+    int16_t id;
-+    int32_t position;
- } marker_node, *marker_type;
- 
- /*  instrument definitions */
--typedef short marker_id;
-+typedef int16_t marker_id;
- typedef struct {
--    short   play_mode;
-+    int16_t play_mode;
-     marker_id  begin_loop;
-     marker_id  end_loop;
- } aiff_loop_node, *aiff_loop_type;
-@@ -97,13 +108,13 @@ typedef struct {
-     char	high_note;
-     char	low_velocity;
-     char	high_velocity;
--    short	gain;
-+    int16_t	gain;
-     aiff_loop_node	sustain_loop;
-     aiff_loop_node	release_loop;
- } inst_node;
- 
- 
--long snd_read_header(snd_type snd, long *flags);
-+int32_t snd_read_header(snd_type snd, long *flags);
- void snd_write_header(snd_type snd, long *flags);
- 
- double read_ieee_extended(snd_type snd);
-@@ -132,7 +143,7 @@ void resetfile(int file)
- 																	   }
- 
- 
--char readchar(int file, long *read_in)
-+char readchar(int file, int32_t *read_in)
- {
-     char c = 0;
-     readitem(file, &c, char);
-@@ -140,23 +151,23 @@ char readchar(int file, long *read_in)
- }
- 
- 
--long readlong(int file, long *read_in)
-+int32_t read32(int file, int32_t *read_in)
- {
--    long l = 0;
-+    int32_t l = 0;
-     readitem(file, &l, int32_t);
-     return ntohl(l);
- }
- 
- 
--short readshort(int file, long *read_in)
-+int16_t read16(int file, int32_t *read_in)
- { 
--    short s = 0;
--    readitem(file, &s, short);
-+    int16_t s = 0;
-+    readitem(file, &s, int16_t);
-     return ntohs(s);
- }
- 
- 
--int32_t revlong(int32_t l)
-+int32_t rev32(int32_t l)
- {
-     return (((l >> 0) & 0xFF) << 24) |
- 	(((l >> 8) & 0xFF) << 16) |
-@@ -165,32 +176,32 @@ int32_t revlong(int32_t l)
- }
- 
- 
--long readrevlong(int file, long *read_in)
-+int32_t readrev32(int file, int32_t *read_in)
- {
--    return revlong(readlong(file, read_in));
-+    return rev32(read32(file, read_in));
- }
- 
- 
--short revshort(short s)
-+int16_t rev16(int16_t s)
- {
-     return ((s & 0xFF) << 8) | ((s >> 8) & 0xFF);
- }
- 
- 
--short readrevshort(int file, long *read_in)
-+int16_t readrev16(int file, int32_t *read_in)
- {
--    return revshort(readshort(file, read_in));
-+    return rev16(read16(file, read_in));
- }
- 
- 
--float readfloat(int file, long *read_in)
-+float readfloat(int file, int32_t *read_in)
- {
-     float f = 0.0F;
-     readitem(file, &f, float);
-     return f;
- }
- 
--unsigned char readuchar(int file, long *read_in)
-+unsigned char readuchar(int file, int32_t *read_in)
- {
-     unsigned char c = 0;
-     readitem(file, &c, unsigned char);
-@@ -204,27 +215,27 @@ unsigned char readuchar(int file, long *
- #define writeitem(F,L,T) snd_file_write(F, (char *) L, sizeof(T));
- 
- 
--void writelong(int file, int32_t l)
-+void write32(int file, int32_t l)
- {
-     l = htonl(l);
-     writeitem(file, &l, int32_t);
- }
- 
--void writeshort(int file, short s)
-+void write16(int file, int16_t s)
- {
-     s = htons(s);
--    writeitem(file, &s, short);
-+    writeitem(file, &s, int16_t);
- }
- 
--void writerevlong(int file, long l)
-+void writerev32(int file, int32_t l)
- {
--    writelong(file, revlong(l));
-+    write32(file, rev32(l));
- }
- 
- 
--void writerevshort(int file, short s)
-+void writerev16(int file, int16_t s)
- {
--    writeshort(file, revshort(s));
-+    write16(file, rev16(s));
- }
- 
- 
-@@ -344,9 +355,9 @@ int snd_open_file(snd_type snd, long *fl
- 
- int snd_seek(snd_type snd, double skip)
- {
--    long offset_in_bytes = ((long) (skip * snd->format.srate + 0.5)) *
-+    int32_t offset_in_bytes = ((int32_t) (skip * snd->format.srate + 0.5)) *
- 	snd_bytes_per_frame(snd);
--    long new_offset = snd->u.file.byte_offset + offset_in_bytes;
-+    int32_t new_offset = snd->u.file.byte_offset + offset_in_bytes;
-     
-     if (new_offset > snd->u.file.end_offset) return !SND_SUCCESS;
-     snd->u.file.byte_offset = new_offset;
-@@ -356,11 +367,11 @@ int snd_seek(snd_type snd, double skip)
-     return SND_SUCCESS;
- }
- 
--void readloop(aiff_loop_type loop, int file, long *read_in)
-+void readloop(aiff_loop_type loop, int file, int32_t *read_in)
- {
--    loop->play_mode = readshort(file, read_in);
--    loop->begin_loop = readshort(file, read_in);
--    loop->end_loop = readshort(file, read_in);
-+    loop->play_mode = read16(file, read_in);
-+    loop->begin_loop = read16(file, read_in);
-+    loop->end_loop = read16(file, read_in);
- }
- 
- 
-@@ -393,44 +404,44 @@ static double StepToHz(double step) 
- #define AIFF_SND_MAGIC (*((int32_t *) "FORM"))
- #define WAVE_SND_MAGIC (*((int32_t *) "RIFF"))
- 
--long snd_read_header(snd_type snd, long *flags)
-+int32_t snd_read_header(snd_type snd, long *flags)
- {
--    long read_in = 0;
--    long magic, bytemode, len;
--    short type=IRCAM_SND_COMMENT, size=0, encoding;
-+    int32_t read_in = 0;
-+    int32_t magic, bytemode, len;
-+    int16_t type=IRCAM_SND_COMMENT, size=0, encoding;
-     unsigned char buf[SIZEOF_IRCAM_HEADER];
-     
-     snd->u.file.loop_info = FALSE;
-     len = snd_file_len(snd->u.file.file);  /* get length of file */
--    magic = readlong(snd->u.file.file, &read_in);
--    magic = htonl(magic);   /* undo what readlong did */
-+    magic = read32(snd->u.file.file, &read_in);
-+    magic = htonl(magic);   /* undo what read32 did */
-     if (magic == IRCAM_SND_MAGIC) {
- 	snd->u.file.header = SND_HEAD_IRCAM;
- 	snd->format.srate = (double) readfloat(snd->u.file.file, &read_in);
--	snd->format.channels = readlong(snd->u.file.file, &read_in);
--	bytemode = readlong(snd->u.file.file, &read_in);
-+	snd->format.channels = read32(snd->u.file.file, &read_in);
-+	bytemode = read32(snd->u.file.file, &read_in);
- 	(*flags) |= SND_HEAD_SRATE | SND_HEAD_CHANNELS;
- 	/* now SF_ULAW, SF_SHORT, SF_FLOAT,AE_CHAR, AE_ALAW, AE_ULAW, AE_SHORT, AE_LONG, AE_FLOAT or other */
- 	while (type != IRCAM_SND_END && type != IRCAM_SND_AUDIOENCODE) {
--	    type = readshort(snd->u.file.file, &read_in);
--	    size = readshort(snd->u.file.file, &read_in);
--	    if (size > 2 * sizeof(short)) {
-+	    type = read16(snd->u.file.file, &read_in);
-+	    size = read16(snd->u.file.file, &read_in);
-+	    if (size > 2 * sizeof(int16_t)) {
- 		int rc;
- 		/* make sure we don't overflow buffer */
- 		if (size < SIZEOF_IRCAM_HEADER) {
--		    rc = snd_file_read(snd->u.file.file, (char *) buf, (size - 2 * sizeof(short)));
-+		    rc = snd_file_read(snd->u.file.file, (char *) buf, (size - 2 * sizeof(int16_t)));
- 		} else {
- 		    rc = 0; /* force error */
- 		}
--		if (rc != (size - 2 * (int) sizeof(short))) {
-+		if (rc != (size - 2 * (int) sizeof(int16_t))) {
- 		    return fail(snd, "bad IRCAM header");
- 		}
--		read_in += size - 2 * sizeof(short);
-+		read_in += size - 2 * sizeof(int16_t);
- 	    }
- 	}
- 	if (type == IRCAM_SND_AUDIOENCODE) {
- 	    /* printf("Got IRCAM sound format\n"); */
--	    encoding = *((short *)(buf));
-+	    encoding = *((int16_t *)(buf));
- 	    (*flags) |= SND_HEAD_MODE | SND_HEAD_BITS;
- 	    switch (encoding) {
- 	      case IRCAM_SND_CHAR:
-@@ -469,7 +480,7 @@ long snd_read_header(snd_type snd, long 
- 		(*flags) |= SND_HEAD_MODE;
- 		snd->format.mode = SND_MODE_ULAW;
- 		break;
--	      case sizeof(short):
-+	      case sizeof(int16_t):
- 		snd->format.mode = SND_MODE_PCM;
- 		break;
- 	      case sizeof(float):
-@@ -487,13 +498,13 @@ long snd_read_header(snd_type snd, long 
- 	snd->u.file.current_offset = snd->u.file.byte_offset;
- 	
-     } else if (magic == NEXT_SND_MAGIC) {
--	long hdr_size, trash, rate;
-+	int32_t hdr_size, trash, rate;
- 	snd->u.file.header = SND_HEAD_NEXT;
--	hdr_size = readlong(snd->u.file.file, &read_in);	/* dataLocation */
--	trash = readlong(snd->u.file.file, &read_in); 	/* dataSize */
--	bytemode = readlong(snd->u.file.file, &read_in);	/* dataFormat */
--	rate = readlong(snd->u.file.file, &read_in);		/* samplingRate */
--	snd->format.channels = readlong(snd->u.file.file, &read_in);	/* channelCount */
-+	hdr_size = read32(snd->u.file.file, &read_in);	/* dataLocation */
-+	trash = read32(snd->u.file.file, &read_in); 	/* dataSize */
-+	bytemode = read32(snd->u.file.file, &read_in);	/* dataFormat */
-+	rate = read32(snd->u.file.file, &read_in);		/* samplingRate */
-+	snd->format.channels = read32(snd->u.file.file, &read_in);	/* channelCount */
- 	
- 	snd->format.srate = (double) rate;
- 	(*flags) = SND_HEAD_SRATE | SND_HEAD_CHANNELS;
-@@ -565,20 +576,20 @@ long snd_read_header(snd_type snd, long 
- 	}
- 	snd->u.file.byte_offset = read_in;
-     } else if (magic == AIFF_SND_MAGIC) {
--	unsigned long totalsize;
--	unsigned long ssnd_start = 0;
-+	u_int32_t totalsize;
-+	u_int32_t ssnd_start = 0;
- 	char buf[4];
--	long blocksize;
--	long offset;
--	long chunksize;
--	long ssnd_chunksize;
-+	int32_t blocksize;
-+	int32_t offset;
-+	int32_t chunksize;
-+	int32_t ssnd_chunksize;
- 	inst_node inst;
--	short nmarkers;
-+	int16_t nmarkers;
- 	marker_type markers = NULL;
- 	int inst_read = FALSE;
- 	
- 	snd->u.file.header = SND_HEAD_AIFF;
--	totalsize = (unsigned long) readlong(snd->u.file.file, &read_in);
-+	totalsize = (u_int32_t) read32(snd->u.file.file, &read_in);
- 	if (snd_file_read(snd->u.file.file, buf, 4) != 4 || strncmp(buf, "AIFF", 4) != 0) {
- 	    return fail(snd, 
- 			"AIFF 'FORM' chunk does not specify 'AIFF' as type\n");
-@@ -602,15 +613,15 @@ long snd_read_header(snd_type snd, long 
- #endif
- 	    if (strncmp(buf, "COMM", 4) == 0) {
- 		/* COMM chunk */
--		long chunksize;
--		long frames;
--		chunksize = readlong(snd->u.file.file, &read_in);
-+		int32_t chunksize;
-+		int32_t frames;
-+		chunksize = read32(snd->u.file.file, &read_in);
- 		if (chunksize != 18) {
- 		    return fail(snd, "AIFF COMM chunk has bad size\n");
- 		}
--		snd->format.channels = (long) readshort(snd->u.file.file, &read_in);
--		frames = readlong(snd->u.file.file, &read_in);
--		snd->format.bits = readshort(snd->u.file.file, &read_in);
-+		snd->format.channels = (int32_t) read16(snd->u.file.file, &read_in);
-+		frames = read32(snd->u.file.file, &read_in);
-+		snd->format.bits = read16(snd->u.file.file, &read_in);
- 		snd->format.mode = SND_MODE_PCM;
- 		snd->format.srate = read_ieee_extended(snd);
- 		snd->u.file.end_offset = frames * snd_bytes_per_frame(snd) +
-@@ -619,9 +630,9 @@ long snd_read_header(snd_type snd, long 
- 		    SND_HEAD_CHANNELS | SND_HEAD_LEN;
- 	    } else if (strncmp(buf, "SSND", 4) == 0) {
- 		/* SSND chunk */
--		ssnd_chunksize = readlong(snd->u.file.file, &read_in);
--		offset = readlong(snd->u.file.file, &read_in);
--		blocksize = readlong(snd->u.file.file, &read_in);
-+		ssnd_chunksize = read32(snd->u.file.file, &read_in);
-+		offset = read32(snd->u.file.file, &read_in);
-+		blocksize = read32(snd->u.file.file, &read_in);
- 		/* remember the file offset, there may be more chunks */
- 		ssnd_start = snd_file_lseek(snd->u.file.file, 0, SND_SEEK_CUR);
- 		chunksize = ssnd_chunksize;
-@@ -630,31 +641,31 @@ long snd_read_header(snd_type snd, long 
- 		snd_file_lseek(snd->u.file.file, chunksize - 8, SND_SEEK_CUR);
- 		read_in += chunksize - 8;
- 	    } else if (strncmp(buf, "MARK", 4) == 0) {
--		long chunksize = readlong(snd->u.file.file, &read_in);
-+		int32_t chunksize = read32(snd->u.file.file, &read_in);
- 		int i;
- 		
--		nmarkers = readshort(snd->u.file.file, &read_in);
-+		nmarkers = read16(snd->u.file.file, &read_in);
- 		markers = (marker_type) snd_alloc(nmarkers * sizeof(marker_node));
- 		for (i = 0; i < nmarkers; i++) {
- 		    unsigned char label[256];
- 		    int len;
--		    markers[i].id = readshort(snd->u.file.file, &read_in);
--		    markers[i].position = readlong(snd->u.file.file, &read_in);
--		    if (snd_file_read(snd->u.file.file, (char *)label, (long)1) != 1) 
-+		    markers[i].id = read16(snd->u.file.file, &read_in);
-+		    markers[i].position = read32(snd->u.file.file, &read_in);
-+		    if (snd_file_read(snd->u.file.file, (char *)label, (int32_t)1) != 1) 
- 			return fail(snd, "problem reading AIFF file\n");
- 		    len = label[0] | 1;
--		    if (snd_file_read(snd->u.file.file, (char *)label, (long)len) != len)
-+		    if (snd_file_read(snd->u.file.file, (char *)label, (int32_t)len) != len)
- 			return fail(snd, "problam reading AIFF file\n");
- 		}
- 	    } else if (strncmp(buf, "INST", 4) == 0) {
--		chunksize = readlong(snd->u.file.file, &read_in);
-+		chunksize = read32(snd->u.file.file, &read_in);
- 		inst.base_note = readchar(snd->u.file.file, &read_in);
- 		inst.detune = readchar(snd->u.file.file, &read_in);
- 		inst.low_note = readchar(snd->u.file.file, &read_in);
- 		inst.high_note = readchar(snd->u.file.file, &read_in);
- 		inst.low_velocity = readchar(snd->u.file.file, &read_in);
- 		inst.high_velocity = readchar(snd->u.file.file, &read_in);
--		inst.gain = readshort(snd->u.file.file, &read_in);
-+		inst.gain = read16(snd->u.file.file, &read_in);
- 		readloop(&inst.sustain_loop, snd->u.file.file, &read_in);
- 		readloop(&inst.release_loop, snd->u.file.file, &read_in);
- 		
-@@ -673,7 +684,7 @@ long snd_read_header(snd_type snd, long 
- 		snd->u.file.high_velocity = inst.high_velocity;
- 		inst_read = TRUE;
- 	    } else {
--		long chunksize = readlong(snd->u.file.file, &read_in);
-+		int32_t chunksize = read32(snd->u.file.file, &read_in);
- 		if (chunksize & 1) chunksize ++;  /* round up to even number */
- 		read_in += chunksize;
- 		/* skip the chunk */
-@@ -722,13 +733,13 @@ long snd_read_header(snd_type snd, long 
- 	snd->u.file.current_offset = snd->u.file.byte_offset;
- 	snd->u.file.end_offset = snd->u.file.byte_offset + ssnd_chunksize - 8;
-     } else if (magic == WAVE_SND_MAGIC) {
--	long size;
-+	int32_t size;
- 	char buf[4];
--	short format;
-+	int16_t format;
- 	
- 	snd->u.file.header = SND_HEAD_WAVE;
- 	/* RIFF WAVE uses little-endian format -- be careful! */
--	size = readrevlong(snd->u.file.file, &read_in);
-+	size = readrev32(snd->u.file.file, &read_in);
- 	if (snd_file_read(snd->u.file.file, buf,  4) != 4 || strncmp(buf, "WAVE", 4) != 0) {
- 	    return fail(snd, 
- 			"RIFF file does not specify 'WAVE' as type\n");
-@@ -736,19 +747,19 @@ long snd_read_header(snd_type snd, long 
- 	
- 	/* Skip to the next "fmt " or end of file */
- 	while (1) {
--	    long siz;
-+	    int32_t siz;
- 	    if (snd_file_read(snd->u.file.file, buf, 4) != 4) {
- 		return fail(snd, "WAVE file missing fmt spec");
- 	    }
- 	    if (strncmp("fmt ", buf, 4) == 0) break;
--	    siz = readrevlong(snd->u.file.file, &read_in);
-+	    siz = readrev32(snd->u.file.file, &read_in);
- 	    while (siz > 0) {
- 		snd_file_read(snd->u.file.file, buf, 1);
- 		siz--;
- 	    }
- 	}
--	size = readrevlong(snd->u.file.file, &read_in);
--	format = readrevshort(snd->u.file.file, &read_in);
-+	size = readrev32(snd->u.file.file, &read_in);
-+	format = readrev16(snd->u.file.file, &read_in);
- 	switch (format) {
- 	  case WAVE_FORMAT_UNKNOWN:
- 	    return fail(snd, "file in Microsoft Official Unknown format");
-@@ -775,11 +786,11 @@ long snd_read_header(snd_type snd, long 
- 	  default:
- 	    return fail(snd, "file in unknown format");
- 	}	
--	snd->format.channels = readrevshort(snd->u.file.file, &read_in);
--	snd->format.srate = (double) readrevlong(snd->u.file.file, &read_in);
--	readrevlong(snd->u.file.file, &read_in);  /* Average bytes/second */
--	readrevshort(snd->u.file.file, &read_in); /* Block align */
--	snd->format.bits = readrevshort(snd->u.file.file, &read_in);
-+	snd->format.channels = readrev16(snd->u.file.file, &read_in);
-+	snd->format.srate = (double) readrev32(snd->u.file.file, &read_in);
-+	readrev32(snd->u.file.file, &read_in);  /* Average bytes/second */
-+	readrev16(snd->u.file.file, &read_in); /* Block align */
-+	snd->format.bits = readrev16(snd->u.file.file, &read_in);
- 	snd->format.mode = SND_MODE_PCM;
- 	if (snd->format.bits == 8) snd->format.mode = SND_MODE_UPCM;	/* unsigned */
- 	*flags = SND_HEAD_MODE | SND_HEAD_BITS | SND_HEAD_SRATE |
-@@ -791,19 +802,19 @@ long snd_read_header(snd_type snd, long 
- 	    snd_file_lseek(snd->u.file.file, size - 16, SND_SEEK_CUR);
- 	/* skip over any other forms until you find "data" */
- 	while (1) {
--	    long n = snd_file_read(snd->u.file.file, buf, 4);
-+	    int32_t n = snd_file_read(snd->u.file.file, buf, 4);
- 	    if (n != 4) {
- 		return fail(snd, "missing data portion");
- 	    }
- 	    if (strncmp("data", buf, 4) == 0) break;
--	    n = readrevlong(snd->u.file.file, &read_in);    /* length of form */
-+	    n = readrev32(snd->u.file.file, &read_in);    /* length of form */
- 	    snd->u.file.byte_offset = 
-           snd_file_lseek(snd->u.file.file, n, SND_SEEK_CUR);
- 	}
- 	snd->u.file.byte_offset += 8; /* "data" and length use 8 bytes */
- 	snd->u.file.current_offset = snd->u.file.byte_offset;
- 	snd->u.file.end_offset = snd->u.file.byte_offset + 
--	    readrevlong(snd->u.file.file, &read_in);
-+	    readrev32(snd->u.file.file, &read_in);
-     } else {
- 	snd->u.file.header = SND_HEAD_NONE;
- 	(*flags) = 0;
-@@ -825,15 +836,15 @@ long snd_read_header(snd_type snd, long 
- 
- /* write_zeros -- add zeros to end of file */
- /**/
--void write_zeros(int fout, long n)
-+void write_zeros(int fout, int32_t n)
- {
--    long zero = 0;
-+    int32_t zero = 0;
-     while (n > 0) {
- 	/* don't put min() in the arg list of write on an RS6K */
- 	/* there seems to be a compiler bug */
--	long len = min(n, sizeof(long));
-+	int32_t len = min(n, sizeof(int32_t));
- 	snd_file_write(fout, (char *) &zero, len);
--	n -= sizeof(long);
-+	n -= sizeof(int32_t);
-     }
- }
- 
-@@ -844,17 +855,17 @@ void write_zeros(int fout, long n)
-  * SIZEOF_IRCAM_HEADER, but in the case of the hybrid CMIX headers, length
-  * will be shorter to accommodate the NeXT header prefix
-  */
--void write_ircam_start(snd_type snd, long length)
-+void write_ircam_start(snd_type snd, int32_t length)
- {
--    short encoding;
-+    int16_t encoding;
-     
--    writelong(snd->u.file.file, IRCAM_SND_MAGIC);
-+    write32(snd->u.file.file, IRCAM_SND_MAGIC);
-     writefloat(snd->u.file.file, (float) snd->format.srate);
--    writelong(snd->u.file.file, snd->format.channels);
--    writelong(snd->u.file.file, snd->format.bits >> 3);
-+    write32(snd->u.file.file, snd->format.channels);
-+    write32(snd->u.file.file, snd->format.bits >> 3);
-     /* now write the "CODE" section */
--    writeshort(snd->u.file.file, IRCAM_SND_AUDIOENCODE);
--    writeshort(snd->u.file.file, 3 * sizeof(short));    /* size of this record */
-+    write16(snd->u.file.file, IRCAM_SND_AUDIOENCODE);
-+    write16(snd->u.file.file, 3 * sizeof(int16_t));    /* size of this record */
-     if (snd->format.bits == 8) {
- 	encoding = IRCAM_SND_CHAR;
- 	if (snd->format.mode == SND_MODE_ULAW) encoding = IRCAM_SND_ULAW;
-@@ -867,11 +878,11 @@ void write_ircam_start(snd_type snd, lon
- 	encoding = IRCAM_SND_FLOAT;
- 	if (snd->format.mode == SND_MODE_PCM) encoding = IRCAM_SND_LONG;
-     }
--    writeshort(snd->u.file.file, encoding);
-+    write16(snd->u.file.file, encoding);
-     
-     /* end the "CODE" section */
--    writeshort(snd->u.file.file, IRCAM_SND_END);
--    writeshort(snd->u.file.file, 2 * sizeof(short));
-+    write16(snd->u.file.file, IRCAM_SND_END);
-+    write16(snd->u.file.file, 2 * sizeof(int16_t));
-     
-     /* write filler */
-     length -= ( 16 /* head */ + 6 /* AudioEncode */ + 4 /* End */ );
-@@ -885,14 +896,14 @@ void write_ircam_start(snd_type snd, lon
-  * Note: uses length for Length field, but does not fill with zeros.
-  * Instead, this routine writes only the NeXT 24 byte header.
-  */
--void write_next_start(snd_type snd, long length)
-+void write_next_start(snd_type snd, int32_t length)
- {
--    short encoding;
-+    int16_t encoding;
-     
--    writelong(snd->u.file.file, NEXT_SND_MAGIC);
-+    write32(snd->u.file.file, NEXT_SND_MAGIC);
-     /* header size matches cmix's bsd format */
--    writelong(snd->u.file.file, length);
--    writelong(snd->u.file.file, 0); /* data size, 0 -> unspecified */
-+    write32(snd->u.file.file, length);
-+    write32(snd->u.file.file, 0); /* data size, 0 -> unspecified */
-     if (snd->format.bits == 8) {
- 	encoding = NEXT_SND_FORMAT_LINEAR_8;
- 	if (snd->format.mode == SND_MODE_ULAW)
-@@ -907,9 +918,9 @@ void write_next_start(snd_type snd, long
- 	if (snd->format.mode == SND_MODE_PCM)
- 	    encoding = NEXT_SND_FORMAT_LINEAR_32;
-     }
--    writelong(snd->u.file.file, encoding);
--    writelong(snd->u.file.file, (long) (snd->format.srate + 0.5));
--    writelong(snd->u.file.file, snd->format.channels);
-+    write32(snd->u.file.file, encoding);
-+    write32(snd->u.file.file, (int32_t) (snd->format.srate + 0.5));
-+    write32(snd->u.file.file, snd->format.channels);
- }
- 
- 
-@@ -917,8 +928,8 @@ void write_next_start(snd_type snd, long
- /**/
- void snd_write_header(snd_type snd, long *flags)
- {
--    long nframes = 0x7f000000;
--    long bytes_per_frame = snd_bytes_per_frame(snd);
-+    int32_t nframes = 0x7f000000;
-+    int32_t bytes_per_frame = snd_bytes_per_frame(snd);
-     
-     /* end_offset will keep track of how much data written so far */
-     snd->u.file.end_offset = 0;
-@@ -939,23 +950,23 @@ void snd_write_header(snd_type snd, long
- 	}
- 	snd_file_write(snd->u.file.file, "FORM", 4); /* IFF header */
- 	/* (bogus) file size: */
--	writelong(snd->u.file.file, 
-+	write32(snd->u.file.file, 
- 		  hsize + nframes * bytes_per_frame);
- 	snd_file_write(snd->u.file.file, "AIFF", 4); /* File type */
- 	
- 	/* COMM chunk -- describes encoding (and #frames) */
- 	snd_file_write(snd->u.file.file, "COMM", 4);
--	writelong(snd->u.file.file, 18); /* COMM chunk size */
--	writeshort(snd->u.file.file, (short) snd->format.channels); /* nchannels */
--	writelong(snd->u.file.file, nframes); /* number of frames */
--	writeshort(snd->u.file.file, (short) snd->format.bits); /* sample width, in bits */
-+	write32(snd->u.file.file, 18); /* COMM chunk size */
-+	write16(snd->u.file.file, (int16_t) snd->format.channels); /* nchannels */
-+	write32(snd->u.file.file, nframes); /* number of frames */
-+	write16(snd->u.file.file, (int16_t) snd->format.bits); /* sample width, in bits */
- 	write_ieee_extended(snd->u.file.file, snd->format.srate);
- 	/* SSND chunk -- describes data */
- 	snd_file_write(snd->u.file.file, "SSND", 4);
--	writelong(snd->u.file.file, 
-+	write32(snd->u.file.file, 
- 		  8 + nframes * bytes_per_frame); /* chunk size */
--	writelong(snd->u.file.file, 0); /* offset */
--	writelong(snd->u.file.file, 0); /* block size */
-+	write32(snd->u.file.file, 0); /* offset */
-+	write32(snd->u.file.file, 0); /* block size */
- 	snd->u.file.byte_offset = hsize;
- 	/*	printf("snd_write_header AIFF, byte_offset = %ld\n",
- 		snd_lseek(snd->u.file.file, (off_t) 0, SND_SEEK_CUR)); */
-@@ -974,39 +985,39 @@ void snd_write_header(snd_type snd, long
- 	break;
-       case SND_HEAD_WAVE:
- 	snd_file_write(snd->u.file.file, "RIFF", 4);
--	writerevlong(snd->u.file.file, 12+18+8 + nframes * bytes_per_frame);
-+	writerev32(snd->u.file.file, 12+18+8 + nframes * bytes_per_frame);
- 	snd_file_write(snd->u.file.file, "WAVE", 4);
- 	snd_file_write(snd->u.file.file, "fmt ", 4);
--	writerevlong(snd->u.file.file, 18L);
-+	writerev32(snd->u.file.file, 18L);
- 	switch (snd->format.mode) /* Format type */
- 	{
- 	    case SND_MODE_ADPCM:
--		writerevshort(snd->u.file.file, 2);
-+		writerev16(snd->u.file.file, 2);
- 		break;
- 	    case SND_MODE_PCM:
- 	    case SND_MODE_UPCM:
--		writerevshort(snd->u.file.file, 1);
-+		writerev16(snd->u.file.file, 1);
- 		break;
- 	    case SND_MODE_ULAW:
--		writerevshort(snd->u.file.file, 7);
-+		writerev16(snd->u.file.file, 7);
- 		break;
- 	    case SND_MODE_ALAW:
--		writerevshort(snd->u.file.file, 6);
-+		writerev16(snd->u.file.file, 6);
- 		break;
- 	    case SND_MODE_UNKNOWN:
- 	    case SND_MODE_FLOAT:
- 	    default:
--		writerevshort(snd->u.file.file, 0);
-+		writerev16(snd->u.file.file, 0);
- 		break;
- 	}
--	writerevshort(snd->u.file.file, (short) snd->format.channels); /* Number of channels */
--	writerevlong(snd->u.file.file, (long) (snd->format.srate + 0.5)); /* Samples per second */
--	writerevlong(snd->u.file.file,  (((long) snd->format.srate) * bytes_per_frame)); /* Bytes per second*/
--	writerevshort(snd->u.file.file, (short) bytes_per_frame); /* Block alignment */
--	writerevshort(snd->u.file.file, (short) snd->format.bits); /* Bits per sample */
--	writerevshort(snd->u.file.file, (short) 0); /* Size of needed extra data */
-+	writerev16(snd->u.file.file, (int16_t) snd->format.channels); /* Number of channels */
-+	writerev32(snd->u.file.file, (int32_t) (snd->format.srate + 0.5)); /* Samples per second */
-+	writerev32(snd->u.file.file,  (((int32_t) snd->format.srate) * bytes_per_frame)); /* Bytes per second*/
-+	writerev16(snd->u.file.file, (int16_t) bytes_per_frame); /* Block alignment */
-+	writerev16(snd->u.file.file, (int16_t) snd->format.bits); /* Bits per sample */
-+	writerev16(snd->u.file.file, (int16_t) 0); /* Size of needed extra data */
- 	snd_file_write(snd->u.file.file, "data", 4);
--	writerevlong(snd->u.file.file, (long) (nframes * bytes_per_frame));
-+	writerev32(snd->u.file.file, (int32_t) (nframes * bytes_per_frame));
- 	snd->u.file.byte_offset = 46;
- 	break;
-       default:
-@@ -1018,7 +1029,7 @@ void snd_write_header(snd_type snd, long
- 
- void write_sndheader_finish(snd_type snd)
- {
--    long n;
-+    int32_t n;
-     switch (snd->u.file.header) {
-       case SND_HEAD_NONE:
- 	break;
-@@ -1039,20 +1050,20 @@ void write_sndheader_finish(snd_type snd
- 	}
- 	/* write filesize in the header */
- 	snd_file_lseek(snd->u.file.file, 4, SND_SEEK_SET);
--	writelong(snd->u.file.file, n - 8 /* 'FORM'+size do not count */);
-+	write32(snd->u.file.file, n - 8 /* 'FORM'+size do not count */);
- 	
- 	/* write number of frames in COMM chunk */
- 	snd_file_lseek(snd->u.file.file, (4 /* 'AIFF' */ + 4 /* 'COMM' */ + 
- 					 4 /* size */ + 2 /* channels */), 
- 	      SND_SEEK_CUR);
--	writelong(snd->u.file.file, 
-+	write32(snd->u.file.file, 
- 		  (n - (hsize + 8)) / snd_bytes_per_frame(snd));
- 	
- 	/* write size in SSND chunk */
- 	snd_file_lseek(snd->u.file.file, (2 /* snd->format.bits */ + 
- 					 10 /* sr */ + 4 /* 'SSND' */), 
- 	      SND_SEEK_CUR);
--	writelong(snd->u.file.file, 8 + datasize); /* chunk size */
-+	write32(snd->u.file.file, 8 + datasize); /* chunk size */
- 	break; }
-       case SND_HEAD_IRCAM:
- 	break;
-@@ -1063,9 +1074,9 @@ void write_sndheader_finish(snd_type snd
- 	n = snd_file_lseek(snd->u.file.file, 0, SND_SEEK_CUR);
- 	/* back to the top */
- 	snd_file_lseek(snd->u.file.file, 4, SND_SEEK_SET);
--	writerevlong(snd->u.file.file, n - 8);	/* file size - ['RIFF', len] */
-+	writerev32(snd->u.file.file, n - 8);	/* file size - ['RIFF', len] */
- 	snd_file_lseek(snd->u.file.file, 42, SND_SEEK_SET);
--	writerevlong(snd->u.file.file, n - 46); /* data size */
-+	writerev32(snd->u.file.file, n - 46); /* data size */
- 	break;
-       default:
- 	break;
-@@ -1076,7 +1087,7 @@ void write_sndheader_finish(snd_type snd
- double read_ieee_extended(snd_type snd)
- {
-     unsigned char buf[10];
--    if (snd_file_read(snd->u.file.file, (char *)buf, (long)10) != 10)
-+    if (snd_file_read(snd->u.file.file, (char *)buf, (int32_t)10) != 10)
- 	fail(snd, "EOF while reading IEEE extended number");
-     return ConvertFromIeeeExtended(buf);
- }
-@@ -1099,7 +1110,7 @@ void write_ieee_extended(int file, doubl
- 
- char *mode_string[] = { "ADPCM", "PCM", "ULAW", "ALAW", "Float", "UPCM", "Unknown" };
- 
--char *mode_to_string(long mode)
-+char *mode_to_string(int32_t mode)
- {
-     if (mode < 0 || mode >= SND_NUM_MODES) return "InvalidData";
-     else return mode_string[mode];
diff --git a/audio/audacity/patches/patch-ar b/audio/audacity/patches/patch-ar
deleted file mode 100644
index cedead838ae..00000000000
--- a/audio/audacity/patches/patch-ar
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2002/10/04 08:59:38 jlam Exp $
-
---- configure.in.orig	Wed Jun  5 00:51:19 2002
-+++ configure.in
-@@ -34,6 +34,16 @@ AC_ARG_WITH(oss,
-       [use Open Sound System (OSS) for Audio I/O [default=yes]])],
- 	use_oss=$withval,
- 	use_oss="default")
-+AC_ARG_WITH(dev-dsp,
-+	[AC_HELP_STRING([--with-dev-dsp],
-+      [the path to the audio device [default="/dev/dsp"]])],
-+	DEV_DSP=$withval,
-+	DEV_DSP="/dev/dsp")
-+AC_ARG_WITH(helpdir,
-+	[AC_HELP_STRING([--with-helpdir],
-+      [the path to the audacity help file [default=empty]])],
-+	HELPDIR=$withval,
-+	HELPDIR="$prefix/share/doc/audacity")
- AC_ARG_WITH(arts-soundserver,
- 	[AC_HELP_STRING([--with-arts-soundserver],
-       [use the KDE/aRts soundserver instead of OSS [default=no]])],
-@@ -65,6 +75,9 @@ AC_ARG_WITH(help,
- 	use_help=$withval,
- 	use_help="yes")
- 
-+AC_SUBST(DEV_DSP)
-+AC_SUBST(HELPDIR)
-+
- dnl check to make sure that all the user's options are valid
- AC_CANONICAL_HOST
- host_cpu=`echo "$host_cpu" | sed "s/i.86/i386/"`
-@@ -161,12 +174,26 @@ if [[ $use_vorbis = "yes" ]] ; then
- fi
- 
- if [[ $use_id3lib = "yes" ]] ; then
-+
-+   dnl check for both headers and libraries
-+
-+   AC_CHECK_LIB(z, compress)
-+   AC_CHECK_LIB(id3-3.8, main, id3lib_found="-lid3-3.8",
-+	AC_CHECK_LIB(id3, main, id3lib_found="-lid3",
-+	    id3lib_found=no))
-+
-+   AC_CHECK_HEADER(id3.h, id3inc_found=yes, id3inc_found=no)
-+
-+   if [[ $id3lib_found = "no" ]] || [[ $id3inc_found = "no" ]] ; then
- 	EXTRAOBJS="$EXTRAOBJS id3lib/src/.libs/libid3.a"
- 	MAKEALL="$MAKEALL id3lib/src/.libs/libid3.a"
- 	CFLAGS="$CFLAGS -Iid3lib/include"
-+   elif [[ $id3lib_found != "no" ]] ; then
-+	LIBS="$LIBS $id3lib_found"
-+   fi
- 		
- 	AC_DEFINE(USE_ID3LIB, 1,
--      [Define if id3lib is present])
-+		[Define if id3lib is present])
- fi
- 
- if [[ $use_help = "yes" ]] ; then
-@@ -174,6 +201,24 @@ if [[ $use_help = "yes" ]] ; then
- fi
- 
- if [[ $use_oss = "yes" ]] ; then
-+	AC_CHECK_HEADER(sys/soundcard.h, [
-+	    CFLAGS="$CFLAGS -DHAVE_SYS_SOUNDCARD_H=1"
-+	    AC_EGREP_CPP(yes, [
-+#include <sys/soundcard.h>
-+#if defined(OPEN_SOUND_SYSTEM) || defined(UNIX_SOUND_SYSTEM)
-+yes
-+#endif
-+	    ],, [
-+		AC_CHECK_FUNC(_oss_ioctl,,
-+		    [AC_CHECK_LIB(ossaudio,_oss_ioctl)])
-+	    ])
-+	], [
-+	    AC_CHECK_HEADER(soundcard.h, [
-+		CFLAGS="$CFLAGS -DHAVE_SOUNDCARD_H=1"
-+		AC_CHECK_FUNC(_oss_ioctl,,
-+		    [AC_CHECK_LIB(ossaudio,_oss_ioctl)])])
-+	])
-+
- 	EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/snd/audiooss.c.o"
- 
- 	AC_DEFINE(USE_OSS, 1,
diff --git a/audio/audacity/patches/patch-as b/audio/audacity/patches/patch-as
deleted file mode 100644
index 9f9d10bef80..00000000000
--- a/audio/audacity/patches/patch-as
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/10/04 08:59:38 jlam Exp $
-
---- DiskFunctions.cpp.orig	Wed Jun  5 00:51:19 2002
-+++ DiskFunctions.cpp
-@@ -18,6 +18,11 @@
- #include <sys/vfs.h>
- #endif
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#endif
-+
- #include <iostream.h>
- #include <stdio.h>              //the std I/O stuff
- #include <wx/longlong.h>
-@@ -167,7 +172,7 @@ wxLongLong GetFreeDiskSpace(const char *
-    return freeBytes;
- }
- #elif defined(__WXGTK__)
--#ifdef linux
-+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
- wxLongLong GetFreeDiskSpace(const char *path)
- {
-    struct statfs theStats;
diff --git a/audio/audacity/patches/patch-at b/audio/audacity/patches/patch-at
deleted file mode 100644
index 66cf8db4143..00000000000
--- a/audio/audacity/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2002/10/04 08:59:38 jlam Exp $
-
---- id3lib/include/id3/Makefile.in.orig	Fri Oct  4 00:57:56 2002
-+++ id3lib/include/id3/Makefile.in
-@@ -108,7 +108,7 @@ the_headers =    field.h                
- id3includedir = $(includedir)/id3
- id3include_HEADERS = $(the_headers)
- 
--noinst_HEADERS =    helpers.h                       io_decorators.h                 io_helpers.h                    io_strings.h                    strings.h                     
-+noinst_HEADERS =    helpers.h                       io_decorators.h                 io_helpers.h                    io_strings.h                    id3_strings.h                     
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/audio/audacity/patches/patch-au b/audio/audacity/patches/patch-au
deleted file mode 100644
index 5b9e696ae6e..00000000000
--- a/audio/audacity/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2002/10/04 08:59:39 jlam Exp $
-
---- id3lib/include/id3/reader.h.orig	Wed Jun  5 00:51:19 2002
-+++ id3lib/include/id3/reader.h
-@@ -33,7 +33,7 @@
- class ID3_CPP_EXPORT ID3_Reader
- {
-  public:
--  typedef uint32 size_type;
-+  typedef size_t size_type;
-   typedef uint8  char_type;
-   typedef uint32 pos_type;
-   typedef  int32 off_type;
diff --git a/audio/audacity/patches/patch-av b/audio/audacity/patches/patch-av
deleted file mode 100644
index 4a77f5e5286..00000000000
--- a/audio/audacity/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2002/10/04 08:59:39 jlam Exp $
-
---- id3lib/include/id3/writer.h.orig	Wed Jun  5 00:51:19 2002
-+++ id3lib/include/id3/writer.h
-@@ -33,7 +33,7 @@
- class ID3_CPP_EXPORT ID3_Writer
- {
-  public:
--  typedef uint32 size_type;
-+  typedef size_t size_type;
-   typedef uint8  char_type;
-   typedef uint32 pos_type;
-   typedef  int32 off_type;