Update lame to 3.97, using diff provided by wiz.

LAME 3.97   September 24 2006

    * 3.97 beta 3 becomes 3.97


LAME 3.97 beta 3   August 19 2006

    * Gabriel Bouvigne:
          o Workaround against a short blocks detection issue


LAME 3.97 beta 2   November 26 2005

    * Gabriel Bouvigne:
          o Fixed an initialization error when input is not using a standard sampling frequency
          o Fixed a possible assertion failure in very low bitrate encoding
          o Slight change regarding ATH adjustment with V5
          o Reinstated bit reservoir for 320kbps CBR
          o ReplayGain analysis should now be faster when encountering silent parts
    * Takehiro Tominaga:
          o Fixed a possible link problem of assembly code


LAME 3.97 beta 1   September 12 2005

    * Takehiro Tominaga:
          o Fixed an out of array access in mp3rtp
          o Fixed a quality setting in DLL
          o Fixed display when using --silent
    * Vitaly Ivanov:
          o Updated DirectShow interface
    * Robert Hegemann:
          o Fixed an out of array access
          o Fixed some small rounding problem in vbr-new quantization routines
          o Fixed a bug in vbr-new regarding high frequencies (sfb21) when using -Y
          o Fixed a few bugs in vbr-new when using -Y
          o Updated scalefactors allocation scheme in vbr-new
          o Fixed mingw32 configure problems
          o Resolved some compiler warnings
          o Updated command-line visualisation
    * Gabriel Bouvigne:
          o Changed some FLOAT8 to FLOAT
          o Added project files for VC7
          o Reworked -q1 and -q0
          o Updated presets
          o Fixed an error in ISO quantization on systems not using the IEEE754 hack
          o Faster quantization
          o SSE version of init_xrpow
    * Rog�io Brito:
          o Updated Debian packaging
          o Documentation work
    * Chris Miller:
          o Support for x64 platform SDK in makefile.msvc

7 files changed, 40 insertions, 45 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index c90752f61f4..93dbe5d5a2a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2006/08/27 02:25:49 ben Exp $
+# $NetBSD: Makefile,v 1.55 2006/10/23 01:30:34 ben Exp $
 #
 
 DISTNAME=	lame-${VERS}
-PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/} \
 		http://hive.me.gu.edu.au/not_lame/
@@ -11,7 +10,7 @@ MAINTAINER=	ben@NetBSD.org
 HOMEPAGE=	http://lame.sourceforge.net/
 COMMENT=	Fast, high quality MP3 encoder
 
-VERS=		3.96.1
+VERS=		3.97
 
 LICENSE=	lame-license
 
@@ -40,7 +39,7 @@ CFLAGS+=	-O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
 		-finline-functions -DFLOAT=double -DFLOAT_MAX=DBL_MAX
 .endif
 
-.if (${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin")
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 CONFIGURE_ARGS+=	--enable-nasm
 .endif
diff --git a/audio/lame/PLIST b/audio/lame/PLIST
index 5260a0cec2d..70937b8144c 100644
--- a/audio/lame/PLIST
+++ b/audio/lame/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/10/23 01:30:34 ben Exp $
 bin/lame
 include/lame/lame.h
 lib/libmp3lame.la
 man/man1/lame.1
-share/doc/html/lame/basic.html
-share/doc/html/lame/contributors.html
-share/doc/html/lame/examples.html
-share/doc/html/lame/history.html
-share/doc/html/lame/id3.html
-share/doc/html/lame/index.html
-share/doc/html/lame/lame.css
-share/doc/html/lame/modes.html
-share/doc/html/lame/node6.html
-share/doc/html/lame/presets.html
-share/doc/html/lame/switchs.html
-@dirrm share/doc/html/lame
+share/doc/lame/basic.html
+share/doc/lame/contributors.html
+share/doc/lame/examples.html
+share/doc/lame/history.html
+share/doc/lame/id3.html
+share/doc/lame/index.html
+share/doc/lame/lame.css
+share/doc/lame/modes.html
+share/doc/lame/node6.html
+share/doc/lame/presets.html
+share/doc/lame/switchs.html
+@dirrm share/doc/lame
 @dirrm include/lame
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index e1575e68e07..4de4af3f1fa 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.14 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.15 2006/10/23 01:30:34 ben Exp $
 
-SHA1 (lame-3.96.1.tar.gz) = 3a8e6d17c8b1d3558e817a5bf9b70ed68f93988f
-RMD160 (lame-3.96.1.tar.gz) = 14eee3328706141d5546f33592aaabfb681b4e9d
-Size (lame-3.96.1.tar.gz) = 1255629 bytes
-SHA1 (patch-aa) = 67d632d648fe7c370ef0c75fe2689948b75e9bf8
-SHA1 (patch-ab) = da88c3c130e8b1420baf52c36e657378bdb58a36
-SHA1 (patch-ac) = 8e1495493c534943608baeab18c1063c66509dbc
-SHA1 (patch-ad) = 976c3364ca70f90a5f7b3aabfa3b228dcf0d010f
-SHA1 (patch-ae) = 52d847040fbebe2aabe704390eb6d66e7fb53984
+SHA1 (lame-3.97.tar.gz) = acf56065f4e31ce023b0f99002d537adb1ec09df
+RMD160 (lame-3.97.tar.gz) = 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873
+Size (lame-3.97.tar.gz) = 1328058 bytes
+SHA1 (patch-ab) = 0d018fa85580f1653deaa61689c901af3e17b42c
+SHA1 (patch-ac) = dc1fe7bccdf15b293a0c655c2ddf651d25fada43
+SHA1 (patch-ad) = c6012f720b0d24775539dd915a1466ebbf065c62
+SHA1 (patch-ae) = 09935a5a63ba2e474cedc439b58dad18397d4a19
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
index 859b63f9f4b..68c839b26ab 100644
--- a/audio/lame/patches/patch-ab
+++ b/audio/lame/patches/patch-ab
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2004/01/20 15:46:12 adam Exp $
+$NetBSD: patch-ab,v 1.8 2006/10/23 01:30:34 ben Exp $
 
---- doc/html/Makefile.in.orig	2004-01-11 11:16:19.000000000 +0000
+--- doc/html/Makefile.in.orig	2006-09-24 13:53:31.000000000 +0000
 +++ doc/html/Makefile.in
-@@ -164,9 +164,9 @@ target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign ansi2knr
- 
+@@ -189,7 +189,7 @@ AUTOMAKE_OPTIONS = foreign ansi2knr
  docdir = $(datadir)/doc
--pkgdocdir = $(docdir)/$(PACKAGE)
-+pkgdocdir = $(docdir)
+ pkgdocdir = $(docdir)/$(PACKAGE)
  htmldir = $(docdir)/html
 -pkghtmldir = $(pkgdocdir)/html
-+pkghtmldir = $(pkgdocdir)/html/$(PACKAGE)
- 
++pkghtmldir = $(pkgdocdir)
  pkghtml_DATA = \
          basic.html \
+ 	contributors.html \
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
index dca2040eb12..2130cec5843 100644
--- a/audio/lame/patches/patch-ac
+++ b/audio/lame/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/01/20 15:46:12 adam Exp $
+$NetBSD: patch-ac,v 1.7 2006/10/23 01:30:34 ben Exp $
 
---- frontend/Makefile.in.orig	2004-01-11 11:16:21.000000000 +0000
+--- frontend/Makefile.in.orig	2006-09-24 13:53:31.000000000 +0000
 +++ frontend/Makefile.in
-@@ -91,7 +91,7 @@ LDADD = @LDADD@ \
+@@ -156,7 +156,7 @@ LDADD = @LDADD@ \
  	$(top_builddir)/libmp3lame/libmp3lame.la \
  	@FRONTEND_LDADD@
  
diff --git a/audio/lame/patches/patch-ad b/audio/lame/patches/patch-ad
index 3c2ff4e5f4a..5887e4771fa 100644
--- a/audio/lame/patches/patch-ad
+++ b/audio/lame/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/03/27 17:33:28 he Exp $
+$NetBSD: patch-ad,v 1.2 2006/10/23 01:30:34 ben Exp $
 
---- libmp3lame/machine.h.orig	2004-03-27 18:23:04.000000000 +0100
+--- libmp3lame/machine.h.orig	2006-09-24 13:53:32.000000000 +0000
 +++ libmp3lame/machine.h
-@@ -113,6 +113,7 @@ char *strchr (), *strrchr ();
+@@ -111,6 +111,7 @@ char *strchr (), *strrchr ();
  # include <float.h>
  # define FLOAT_MAX FLT_MAX
  #else
diff --git a/audio/lame/patches/patch-ae b/audio/lame/patches/patch-ae
index 1decfc970cb..10f07c4ff90 100644
--- a/audio/lame/patches/patch-ae
+++ b/audio/lame/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/11/15 15:30:30 sketch Exp $
+$NetBSD: patch-ae,v 1.2 2006/10/23 01:30:34 ben Exp $
 
---- libmp3lame/gain_analysis.c.orig	2004-11-15 15:21:54.010807000 +0000
-+++ libmp3lame/gain_analysis.c	2004-11-15 15:22:08.332150000 +0000
-@@ -247,7 +247,7 @@
+--- libmp3lame/gain_analysis.c.orig	2006-09-24 13:53:32.000000000 +0000
++++ libmp3lame/gain_analysis.c
+@@ -248,7 +248,7 @@ InitGainAnalysis (replaygain_t* rgData, 
  
  /* returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not */