Don't use -O6, clang doesn't like it and it doesn't mean anything to gcc

either. Stick to -O3. While here, sync the patches for configure and
configure.in, and give it the ability to recognize OpenBSD as well.
(which might or might not work)

3 files changed, 29 insertions, 12 deletions

diff --git a/audio/amp/distinfo b/audio/amp/distinfo
index 569523b6711..896c1ad2f66 100644
--- a/audio/amp/distinfo
+++ b/audio/amp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/02/01 23:22:44 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/09/04 01:39:21 dholland Exp $
 
 SHA1 (amp-0.7.6.tgz) = 6c49d027754615677ad398c1eea858536ec804c2
 RMD160 (amp-0.7.6.tgz) = 34053f8a050ff3aafb2e723c283ac2aa0f4e2a67
@@ -7,8 +7,8 @@ SHA1 (patch-aa) = 56696e88276b770d24b20076e780bc28798d5f8c
 SHA1 (patch-ab) = ebc50cdbad38f3099c633659ecb47d5b99924bc7
 SHA1 (patch-ac) = 67b9b1e200e901ef7ee98f0e384b062c7a99886b
 SHA1 (patch-ad) = 2ef2d0b7c5357309c462261e2c669cc39a774add
-SHA1 (patch-ae) = c084fa45bc144c29ed7548ffc609fb964d375ac8
-SHA1 (patch-af) = bba8fafa25e516df77905865a677667a9d48a152
+SHA1 (patch-ae) = 02f51831848db99af1b1822a5ae5cb63c1d8527c
+SHA1 (patch-af) = ba1346af447b2f1b67273c0541c5f8dd78ecd3ee
 SHA1 (patch-ag) = 30198a34d1998630c9bea4d7d1242d3e46d099db
 SHA1 (patch-ah) = c0e41494ad4c71be2f8dd63e9fef4d9b1038310f
 SHA1 (patch-ai) = 4146720b6cbff1699b8023dd6955f3e8244ffab4
diff --git a/audio/amp/patches/patch-ae b/audio/amp/patches/patch-ae
index df070e4a1c0..040e53df034 100644
--- a/audio/amp/patches/patch-ae
+++ b/audio/amp/patches/patch-ae
@@ -1,13 +1,28 @@
-$NetBSD: patch-ae,v 1.1 2003/03/22 05:44:38 dillo Exp $
+$NetBSD: patch-ae,v 1.2 2011/09/04 01:39:21 dholland Exp $
 
---- configure.in.old	Sun Oct 26 10:53:03 1997
-+++ configure.in	Sun Oct 26 10:54:32 1997
-@@ -58,7 +58,7 @@
+- recognize NetBSD, OpenBSD, Dragonfly
+- use -O3 (maximum level that means anything), not -O6
+
+--- configure.in.orig	1997-08-23 11:35:41.000000000 +0000
++++ configure.in
+@@ -58,7 +58,7 @@ case "$OS_TYPE" in
      DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
      ;;
  
 -  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
++  Linux|FreeBSD|NetBSD|OpenBSD|Dragonfly)
      CC="gcc"
      if test "$ARCH_TYPE" = "i486" ; then
        CFLAGS_ARCH="-m486"
+@@ -69,7 +69,10 @@ case "$OS_TYPE" in
+     if test "$OS_TYPE" = "FreeBSD" ; then
+       OS_TYPE="BSD"
+     fi
+-    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
++    if test "$OS_TYPE" = "DragonFly" ; then
++      OS_TYPE="BSD"
++    fi
++    CFLAGS="-O3 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
+     DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
+     ;;
+ 
diff --git a/audio/amp/patches/patch-af b/audio/amp/patches/patch-af
index ac4fdfaea0e..92b6334136b 100644
--- a/audio/amp/patches/patch-af
+++ b/audio/amp/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $
+$NetBSD: patch-af,v 1.3 2011/09/04 01:39:21 dholland Exp $
 
 --- configure.orig	1997-08-23 11:11:24.000000000 +0000
 +++ configure
@@ -7,17 +7,19 @@ $NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $
      ;;
  
 -  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD|DragonFly)
++  Linux|FreeBSD|NetBSD|OpenBSD|DragonFly)
      CC="gcc"
      if test "$ARCH_TYPE" = "i486" ; then
        CFLAGS_ARCH="-m486"
-@@ -1409,6 +1409,9 @@ case "$OS_TYPE" in
+@@ -1409,7 +1409,10 @@ case "$OS_TYPE" in
      if test "$OS_TYPE" = "FreeBSD" ; then
        OS_TYPE="BSD"
      fi
+-    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
 +    if test "$OS_TYPE" = "DragonFly" ; then
 +      OS_TYPE="BSD"
 +    fi
-     CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
++    CFLAGS="-O3 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
      DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
      ;;
+