update to 0.96

pkgsrc related changes:
  use libmpeg3 from pkgsrc
from the announcement:
                    Mute and Solo buttons!
                    MP3 Exporting (including ID3 support)!
                    Improved Amplify effect!
                    New FFT Filter effect!
                    New Phaser effect!
                    New Wahwah effect!
                    Improved Preferences!

13 files changed, 96 insertions, 217 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 185da7a947c..0471b922a4d 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,27 +1,33 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/02 17:45:32 drochner Exp $
 #
 
-DISTNAME=	audacity-src-0.95
-PKGNAME=	audacity-0.95
+DISTNAME=	audacity-src-0.96
+PKGNAME=	audacity-0.96
 CATEGORIES=	audio
 MASTER_SITES=	http://prdownloads.sourceforge.net/audacity/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.cs.cmu.edu/~music/audacity/
+HOMEPAGE=	http://audacity.sourceforge.net/
 COMMENT=	audio editor
 
 DEPENDS+=	wxGTK-*:../../x11/wxGTK
+DEPENDS+=	pth-*:../../devel/pth
+DEPENDS+=	id3lib-*:../../audio/id3lib
+DEPENDS+=	libmpeg3-*:../../devel/libmpeg3
+DEPENDS+=	lame>=3.89:../../audio/lame
 BUILD_DEPENDS+=	zip-*:../../archivers/zip
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--without-xaudio --with-libmpeg3
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 USE_GMAKE=	yes
 
 post-patch:
 	${SED} "s|XXXHELPDIRXXX|${PREFIX}/share|" \
 		<${WRKSRC}/Help.cpp >${WRKSRC}/Help.cpp.tmp \
 	&& ${MV} ${WRKSRC}/Help.cpp.tmp ${WRKSRC}/Help.cpp
+	${RM} -rf ${WRKSRC}/mpeg3
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 179bdbfb0f8..f012d933711 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,19 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: distinfo,v 1.2 2001/08/02 17:45:32 drochner Exp $
 
-SHA1 (audacity-src-0.95.tgz) = 4ce8105137dde4ee0a68680e4a1af18aebf1b77c
-Size (audacity-src-0.95.tgz) = 1202110 bytes
-SHA1 (patch-aa) = 4aee75c1e52e961209aecde6b6c670b69c69a45c
+SHA1 (audacity-src-0.96.tgz) = 77ea8e263fcf72f0b3e42af9e5ee40a3ac83be80
+Size (audacity-src-0.96.tgz) = 1820114 bytes
+SHA1 (patch-aa) = d2ac74e7e82db6e2b23a43d809cb304d60458da1
 SHA1 (patch-ab) = e506c4b4732653f80a745123dbb65ac7bb023516
 SHA1 (patch-ac) = 13d3a0f3733d5a155657f4137c1361c07d2f5f54
 SHA1 (patch-ad) = 73f5d6df3d990de5aefd6ee00ac1af371573e783
-SHA1 (patch-ae) = 34a14a0b75c9574b2da05d2875d2c5d9823a59f7
+SHA1 (patch-ae) = ff23f196a511403806060bbb59efa6465176d619
 SHA1 (patch-af) = bee0d29ef3e420cc3e55d61589d1f43939c57e6c
-SHA1 (patch-ag) = ceaea04349a2ec8be1091f85fa4e63cd4bd23ee3
-SHA1 (patch-ah) = ebe113f695dc2ccdcf388c96392aa43e7473e2df
-SHA1 (patch-ai) = c37fffd4eaf88d586d4fcc55a26044392bcd9b31
-SHA1 (patch-aj) = 90d5194db878eb6c4490dcbb96d5c4994629e3f0
-SHA1 (patch-ak) = 72893f3a7dd381d5f3b561af431add9be15c8752
-SHA1 (patch-al) = ad82a199df4a184ab134e2660b0b30accfaad866
-SHA1 (patch-am) = e43ae5603085943bcb847a4d9e1e51f0eb021756
-SHA1 (patch-an) = 1f5155e47a3dab416552b8c6c902ef4e315d4031
-SHA1 (patch-ao) = a5e2cd13cf1f4fae5ed6f92200cf3abc4507ae28
+SHA1 (patch-am) = 0bc51e734a382f056c31571dd6cc5c7b0a4ae63e
+SHA1 (patch-an) = eed703ca9d2aeaf3ed7d841bb6b7f13ba8b886d7
+SHA1 (patch-ao) = db05833c6f9ce6bf00d0e682a9099ffd583b147c
diff --git a/audio/audacity/patches/patch-aa b/audio/audacity/patches/patch-aa
index d9aa2e21b0e..fc3214db423 100644
--- a/audio/audacity/patches/patch-aa
+++ b/audio/audacity/patches/patch-aa
@@ -1,27 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/02 17:45:32 drochner Exp $
 
---- WaveTrack.cpp.orig	Fri Jun 15 13:36:03 2001
-+++ WaveTrack.cpp	Fri Jun 15 13:37:40 2001
-@@ -848,7 +848,9 @@
-   	  numSamples = 0;
-   	  block->Clear();
+--- WaveTrack.cpp.orig	Sun Jul 29 03:17:54 2001
++++ WaveTrack.cpp	Mon Jul 30 13:33:15 2001
+@@ -898,7 +898,9 @@
+          numSamples = 0;
+          block->Clear();
  
--  	  blockMutex->Unlock();	  
 +#if wxUSE_THREADS
-+  	  blockMutex->Unlock();
+          blockMutex->Unlock();
 +#endif
  
-   	  wxString msg;
-   	  msg.Printf("The file named \"%s\" is missing from the project.",
-@@ -861,8 +863,10 @@
-   	block->Add(w);
-   }
+          wxString msg;
+          msg.Printf("The file named \"%s\" is missing from the project.",
+@@ -911,7 +913,9 @@
+       block->Add(w);
+    }
  
 +#if wxUSE_THREADS
-   blockMutex->Unlock();
--  
+    blockMutex->Unlock();
 +#endif
-+
-   return true;
  
- readWaveTrackError:
+    return true;
+ 
diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae
index 9a0db940a9f..65b9df4d5a6 100644
--- a/audio/audacity/patches/patch-ae
+++ b/audio/audacity/patches/patch-ae
@@ -1,22 +1,20 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- Makefile.in.orig	Mon Apr 30 01:07:29 2001
-+++ Makefile.in	Fri Jun 15 14:44:55 2001
+--- Makefile.in.orig	Sun Jul 29 03:17:54 2001
++++ Makefile.in	Tue Jul 31 19:28:20 2001
 @@ -8,7 +8,7 @@
  # from Makefile.in
  #
  
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lossaudio
++LIBS = @LIBS@ -lmpeg3 -lossaudio
  CFLAGS = @CFLAGS@ @CPPFLAGS@ -Iallegro
  CCC = @CXX@
  CC = @CC@
-@@ -101,7 +101,7 @@
- # rule for building libmpeg3 -- however, it's only built if selected in
- # the configure script
- mpeg3/libmpeg3.a:
--	make -C mpeg3
-+	$(MAKE) -C mpeg3
+@@ -82,7 +82,7 @@
+ 	$(OBJDIR)/prefs/SampleRatePrefs.cpp.o \
+ 	$(OBJDIR)/prefs/FileFormatPrefs.cpp.o \
+ 	$(OBJDIR)/prefs/DirectoriesPrefs.cpp.o \
+-	$(OBJDIR)/prefs/SpectrumPrefs.cpp.o @EXTRAOBJS@
++	$(OBJDIR)/prefs/SpectrumPrefs.cpp.o
  
- #
- # You can optionally "make dep" to make dependencies.
+ ########################################
+ # DEPENDENCIES
diff --git a/audio/audacity/patches/patch-ag b/audio/audacity/patches/patch-ag
deleted file mode 100644
index b04210dc085..00000000000
--- a/audio/audacity/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/mpeg3ifo.c.orig	Sat Jun 16 14:39:15 2001
-+++ mpeg3/mpeg3ifo.c	Sat Jun 16 15:02:27 2001
-@@ -1,9 +1,13 @@
--#include <byteswap.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+
-+#include <sys/endian.h>
-+#include <machine/bswap.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
- 
- #include "ifo.h"
- #include "mpeg3private.h"
diff --git a/audio/audacity/patches/patch-ah b/audio/audacity/patches/patch-ah
deleted file mode 100644
index 57d62c8dd9a..00000000000
--- a/audio/audacity/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/ifo.h.orig	Sat Jun 16 14:41:28 2001
-+++ mpeg3/ifo.h	Sat Jun 16 14:42:10 2001
-@@ -206,7 +206,7 @@
- 	u_char *data[10];
- 	
- 	int fd;		// file descriptor
--	__off64_t pos;	// offset of ifo file on device 
-+	off_t pos;	// offset of ifo file on device 
- } ifo_t;
- 
- 
-@@ -234,7 +234,7 @@
-  * Prototypes
-  */
- 
--ifo_t *ifoOpen (int fd, __off64_t pos);
-+ifo_t *ifoOpen (int fd, off_t pos);
- int ifoClose (ifo_t *ifo);
- 
- u_int ifoGetVOBStart	(ifo_t *ifo);
diff --git a/audio/audacity/patches/patch-ai b/audio/audacity/patches/patch-ai
deleted file mode 100644
index 0f56170cfe3..00000000000
--- a/audio/audacity/patches/patch-ai
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/mpeg3io.c.orig	Mon Apr 30 01:07:29 2001
-+++ mpeg3/mpeg3io.c	Sat Jun 16 14:53:37 2001
-@@ -1,7 +1,7 @@
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
- 
--#include <mntent.h>
-+/*#include <mntent.h>*/
- #include <sys/stat.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -86,6 +86,7 @@
- 	return (result && bytes);
- }
- 
-+#if 0
- int mpeg3io_device(char *path, char *device)
- {
- 	struct stat file_st, device_st;
-@@ -112,6 +113,7 @@
- 
- 	return 0;
- }
-+#endif
- 
- int mpeg3io_seek(mpeg3_fs_t *fs, long byte)
- {
diff --git a/audio/audacity/patches/patch-aj b/audio/audacity/patches/patch-aj
deleted file mode 100644
index 8bcc4f24bf0..00000000000
--- a/audio/audacity/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/video/reconstruct.c.orig	Mon Apr 30 01:07:29 2001
-+++ mpeg3/video/reconstruct.c	Sat Jun 16 14:57:22 2001
-@@ -572,7 +572,7 @@
- 	}
- }
- 
--static inline void recv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
-+static inline void xxrecv(unsigned char *s, unsigned char *d, int lx, int lx2, int h)
- {
- 	unsigned char *dp,*sp,*sp2;
- 	int j;
-@@ -971,7 +971,7 @@
- 			case 0x0:	recc(s, d, lx2, h);       break;
- 			case 0x7:   recva(s, d, lx, lx2, h);  break;
- 			case 0x6:   recvac(s, d, lx, lx2, h); break;
--			case 0x5:	recv(s, d, lx, lx2, h);   break;
-+			case 0x5:	xxrecv(s, d, lx, lx2, h);   break;
- 			case 0x4:	recvc(s, d, lx, lx2, h);  break;
- 			case 0x9:	rech(s, d, lx2, h);       break;
- 			case 0x8:   rechc(s, d, lx2, h);      break;
diff --git a/audio/audacity/patches/patch-ak b/audio/audacity/patches/patch-ak
deleted file mode 100644
index 4b6eda3c5da..00000000000
--- a/audio/audacity/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/global_config.orig	Mon Apr 30 01:07:29 2001
-+++ mpeg3/global_config	Sat Jun 16 18:00:39 2001
-@@ -1,5 +1,3 @@
- # DO NOT EDIT.  EDIT ./configure INSTEAD AND RERUN IT.
--CFLAGS = -O2 -D_FILE_OFFSET_BITS=64 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include
--CC = gcc
--NASM = nasm
-+CFLAGS += -D_FILE_OFFSET_BITS=64
- CFLAGS += -DHAVE_CSS
diff --git a/audio/audacity/patches/patch-al b/audio/audacity/patches/patch-al
deleted file mode 100644
index 060c0964218..00000000000
--- a/audio/audacity/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
-
---- mpeg3/Makefile.orig	Sat Jun 16 17:58:23 2001
-+++ mpeg3/Makefile	Sat Jun 16 17:59:26 2001
-@@ -44,7 +44,7 @@
- 
- OUTPUT = libmpeg3.a
- UTILS = dump mpeg3cat mpeg3toc mpeg3split
--LIBS = -lm -lpthread
-+LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm -lpthread
- 
- all: $(OUTPUT) util
- 
diff --git a/audio/audacity/patches/patch-am b/audio/audacity/patches/patch-am
index 2fc870e4b29..f23b0288d83 100644
--- a/audio/audacity/patches/patch-am
+++ b/audio/audacity/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: patch-am,v 1.2 2001/08/02 17:45:35 drochner Exp $
 
---- AudioIO.cpp.orig	Mon Apr 30 01:07:29 2001
-+++ AudioIO.cpp	Sat Jun 16 21:29:10 2001
+--- AudioIO.cpp.orig	Sun Jul 29 03:17:54 2001
++++ AudioIO.cpp	Mon Jul 30 14:01:18 2001
 @@ -33,7 +33,7 @@
  
  #ifdef __WXGTK__
@@ -11,21 +11,21 @@ $NetBSD: patch-am,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
  #endif
  
  #ifdef BOUNCE
-@@ -71,7 +71,7 @@
-   mPlayNode.format.bits = 16;
-   mPlayNode.format.srate = project->GetRate();
+@@ -74,7 +74,7 @@
+    wxString deviceStr = gPrefs->Read("/AudioIO/PlaybackDevice", "");
  #ifdef __WXGTK__
--  wxString linuxDevice = gPrefs->Read("/AudioIO/PlaybackDevice", "/dev/dsp");
-+  wxString linuxDevice = gPrefs->Read("/AudioIO/PlaybackDevice", "/dev/sound");
-   strcpy(mPlayNode.u.audio.devicename,linuxDevice.c_str());
- #else
-   strcpy(mPlayNode.u.audio.devicename,"");
-@@ -202,7 +202,7 @@
-   mRecordNode.format.bits = 16;
-   mRecordNode.format.srate = project->GetRate();
+    if (deviceStr == "")
+-      deviceStr = "/dev/dsp";
++      deviceStr = "/dev/sound";
+ #endif
+    strcpy(mPlayNode.u.audio.devicename, deviceStr.c_str());
+    strcpy(mPlayNode.u.audio.interfacename, "");
+@@ -207,7 +207,7 @@
+    wxString deviceStr = gPrefs->Read("/AudioIO/RecordingDevice", "");
  #ifdef __WXGTK__
--  wxString linuxDevice = gPrefs->Read("/AudioIO/RecordingDevice", "/dev/dsp");
-+  wxString linuxDevice = gPrefs->Read("/AudioIO/RecordingDevice", "/dev/sound");
-   strcpy(mRecordNode.u.audio.devicename,linuxDevice.c_str());
- #else
-   strcpy(mRecordNode.u.audio.devicename,"");
+    if (deviceStr == "")
+-      deviceStr = "/dev/dsp";
++      deviceStr = "/dev/sound";
+ #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
index 73c7d3910ff..cb69e0d9d1c 100644
--- a/audio/audacity/patches/patch-an
+++ b/audio/audacity/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: patch-an,v 1.2 2001/08/02 17:45:35 drochner Exp $
 
---- Help.cpp.orig	Mon Apr 30 01:07:29 2001
-+++ Help.cpp	Sat Jun 16 21:06:53 2001
-@@ -49,7 +49,7 @@
- void InitHelp(wxWindow *parent)
+--- Help.cpp.orig	Sun Jul 29 03:17:54 2001
++++ Help.cpp	Mon Jul 30 14:13:57 2001
+@@ -61,7 +61,7 @@
+ void InitHelp(wxWindow * parent)
  {
-   if (!gHelp) {
--	wxString defaultLoc = wxGetCwd() + "/audacity-help.htb";
-+	wxString defaultLoc = "XXXHELPDIRXXX/audacity-help.htb";
- 
- 	wxString helpFilePath = gPrefs->Read("/Help/HelpFilePath", defaultLoc);
+    if (!gHelp) {
+-      wxString defaultLoc = wxGetCwd() + wxFILE_SEP_PATH + "audacity-help.htb";
++      wxString defaultLoc = "XXXHELPDIRXXX/audacity-help.htb";
  
+       wxString helpFilePath =
+           gPrefs->Read("/Help/HelpFilePath", defaultLoc);
diff --git a/audio/audacity/patches/patch-ao b/audio/audacity/patches/patch-ao
index c89c15c0a78..ffbc4516146 100644
--- a/audio/audacity/patches/patch-ao
+++ b/audio/audacity/patches/patch-ao
@@ -1,33 +1,33 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/06/17 19:13:52 drochner Exp $
+$NetBSD: patch-ao,v 1.2 2001/08/02 17:45:35 drochner Exp $
 
---- prefs/AudioIOPrefs.cpp.orig	Sun Jun 17 09:15:01 2001
-+++ prefs/AudioIOPrefs.cpp	Sun Jun 17 09:15:47 2001
-@@ -45,8 +45,8 @@
- 									GetSize());
- 
- 	gPrefs->SetPath("/AudioIO");
--	wxString playDevice = gPrefs->Read("PlaybackDevice", "/dev/dsp");
--	wxString recDevice  = gPrefs->Read("RecordingDevice", "/dev/dsp");
-+	wxString playDevice = gPrefs->Read("PlaybackDevice", "/dev/sound");
-+	wxString recDevice  = gPrefs->Read("RecordingDevice", "/dev/sound");
- 	bool recordStereo;
- 	gPrefs->Read("RecordStereo", &recordStereo, false);
- 	bool duplex;
-@@ -173,7 +173,7 @@
+--- prefs/AudioIOPrefs.cpp.orig	Sun Jul 29 03:17:54 2001
++++ prefs/AudioIOPrefs.cpp	Mon Jul 30 14:20:42 2001
+@@ -52,8 +52,8 @@
+ PrefsPanel(parent)
  {
- 	/* TODO: attempt autodetection? */
  #ifdef __WXGTK__
--	mPlaybackDeviceCtrl->SetValue("/dev/dsp");
-+	mPlaybackDeviceCtrl->SetValue("/dev/sound");
+-   wxString defaultPlaybackDevice = "/dev/dsp";
+-   wxString defaultRecordingDevice = "/dev/dsp";
++   wxString defaultPlaybackDevice = "/dev/sound";
++   wxString defaultRecordingDevice = "/dev/sound";
  #endif // __WXGTK__
+ 
+ #ifdef __WXMSW__
+@@ -513,7 +513,7 @@
+ {
+    /* TODO: attempt autodetection? */
+ #ifdef __WXGTK__
+-   mPlaybackDeviceCtrl->SetValue("/dev/dsp");
++   mPlaybackDeviceCtrl->SetValue("/dev/sound");
+ #endif                          // __WXGTK__
  }
  
-@@ -184,7 +184,7 @@
- void AudioIOPrefs::SetRecordingDeviceDefault(wxCommandEvent& event)
+@@ -524,7 +524,7 @@
+ void AudioIOPrefs::SetRecordingDeviceDefault(wxCommandEvent & event)
  {
  #ifdef __WXGTK__
--	mRecordingDeviceCtrl->SetValue("/dev/dsp");
-+	mRecordingDeviceCtrl->SetValue("/dev/sound");
- #endif // __WXGTK__
+-   mRecordingDeviceCtrl->SetValue("/dev/dsp");
++   mRecordingDeviceCtrl->SetValue("/dev/sound");
+ #endif                          // __WXGTK__
  }