Override CONFIG_GUESS_OVERRIDE and CONFIG_SUB_OVERRIDE, since the

default deals only with two level hierachies.
Add explicit saving of %ebp around cpuid, since GCC 3.4 doesn't like the
register clobbering.
Add DragonFly and OpenBSD conditionals. The latter are not tested, but
wiz@ suggested them as most likely correct.

6 files changed, 52 insertions, 8 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 6f79eb5a114..218194a1ebe 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/07 11:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/10/03 20:42:58 joerg Exp $
 
 DISTNAME=	audacity-src-1.2.3
 PKGNAME=	audacity-1.2.3
@@ -28,6 +28,10 @@ CONFIGURE_ENV+=		WX_CONFIG=${LOCALBASE}/bin/wx24-config
 LTCONFIG_OVERRIDE=	${WRKSRC}/lib-src/libsndfile/libtool \
 			${WRKSRC}/lib-src/libsndfile/ltconfig \
 			${WRKSRC}/ltconfig
+CONFIG_GUESS_OVERRIDE?=		\
+	config.guess */config.guess */*/config.guess */*/*/config.guess
+CONFIG_SUB_OVERRIDE?=		\
+	config.sub */config.sub */*/config.sub */*/*/config.sub
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 6c5ee25200f..4e5a049c06a 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 20:39:43 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/10/03 20:42:58 joerg Exp $
 
 SHA1 (audacity-src-1.2.3.tar.gz) = 98c3a171c1f5735df7c63baf1fcef52e5c38ceb8
 RMD160 (audacity-src-1.2.3.tar.gz) = 87b24db9252554ac5a9386efe1390d7c13927196
 Size (audacity-src-1.2.3.tar.gz) = 4175943 bytes
 SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
 SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
-SHA1 (patch-ac) = 792ec327195ce105350a4a4d2d96d1a500bdb118
-SHA1 (patch-ad) = 75af90656c6709d5d7f4b166f03a2bf169e3360d
+SHA1 (patch-ac) = 00698c284e513e20f28ac536b206139ad87ab6d2
+SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046
 SHA1 (patch-ae) = 8e22a7a8ce064c8877323e44ffd07286fe3ea02f
 SHA1 (patch-af) = 54450e915cabde52e4276196d6eb8da331c8eedd
 SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
+SHA1 (patch-ai) = f8c1cf877177f29981c83f209da9b5c67e52963b
+SHA1 (patch-aj) = 34b4cdd266345f04954983cc14e4b762f09f4df8
diff --git a/audio/audacity/patches/patch-ac b/audio/audacity/patches/patch-ac
index eeaf359b317..8ebfd73827d 100644
--- a/audio/audacity/patches/patch-ac
+++ b/audio/audacity/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2004/04/20 18:02:16 ben Exp $
+$NetBSD: patch-ac,v 1.3 2005/10/03 20:42:59 joerg Exp $
 
 --- lib-src/libnyquist/snd/sndconfig.h.orig	Sat Feb 28 11:19:39 2004
 +++ lib-src/libnyquist/snd/sndconfig.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2004/04/20 18:02:16 ben Exp $
    #include "sndirix.h"
  
 -#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
    #include "sndfreebsd.h"
  
  #elif defined(_WIN32)
diff --git a/audio/audacity/patches/patch-ad b/audio/audacity/patches/patch-ad
index 04084c9f35c..e6219d63365 100644
--- a/audio/audacity/patches/patch-ad
+++ b/audio/audacity/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2004/04/20 18:02:16 ben Exp $
+$NetBSD: patch-ad,v 1.4 2005/10/03 20:42:59 joerg Exp $
 
 --- lib-src/libnyquist/snd/sndio.c.orig	Sat Feb 28 11:19:39 2004
 +++ lib-src/libnyquist/snd/sndio.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 2004/04/20 18:02:16 ben Exp $
  #include <sys/stat.h>
  #include "io.h"
 -#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
  #include <sys/stat.h>
  #else
  #endif
diff --git a/audio/audacity/patches/patch-ai b/audio/audacity/patches/patch-ai
new file mode 100644
index 00000000000..0a996579b15
--- /dev/null
+++ b/audio/audacity/patches/patch-ai
@@ -0,0 +1,25 @@
+$NetBSD: patch-ai,v 1.3 2005/10/03 20:42:59 joerg Exp $
+
+--- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig	2005-07-22 17:07:42.000000000 +0000
++++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp
+@@ -83,6 +83,7 @@ uint detectCPUextensions(void)

+     if (_dwDisabledISA == 0xffffffff) return 0;

+ 

+     asm volatile(

++	"\n\tpushl   %%ebx"
+         "\n\txor     %%esi, %%esi"       // clear %%esi = result register

+         // check if 'cpuid' instructions is available by toggling eflags bit 21

+ 

+@@ -131,10 +132,11 @@ uint detectCPUextensions(void)

+     "\n\tend:"

+ 

+         "\n\tmov     %%esi, %0"

++	"\n\tpopl   %%ebx"
+ 

+       : "=rm" (res)

+       : /* no inputs */

+-      : "%edx", "%eax", "%ecx", "%ebx", "%esi" );

++      : "%edx", "%eax", "%ecx", "%esi" );

+       

+     return res & ~_dwDisabledISA;

+ #endif

diff --git a/audio/audacity/patches/patch-aj b/audio/audacity/patches/patch-aj
new file mode 100644
index 00000000000..e373cae068a
--- /dev/null
+++ b/audio/audacity/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.3 2005/10/03 20:42:59 joerg Exp $
+
+--- lib-src/libnyquist/snd/sndcvt.c.orig	2005-07-22 17:15:57.000000000 +0000
++++ lib-src/libnyquist/snd/sndcvt.c
+@@ -16,7 +16,7 @@
+ #ifdef WIN32
+ #include <sys/stat.h>
+ #include "io.h"
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+ #include <sys/stat.h>
+ #endif /* WIN32 */
+ #define L_SET SEEK_SET