Update lame to 3.87; retire lame-gui package, use LAME_USE_GTK variable

instead; install more documentation.
Lame isn't any longer a patch against the ISO source, but stand-alone.
Other changes:
MP3 decoding support, ID3V2 support, vorbis support (not compiled in
right now), MPEG2.5 support; lots of bugfixes and speedups (for
details, see installed history.html).

17 files changed, 116 insertions, 135 deletions

diff --git a/audio/Makefile b/audio/Makefile
index e5c6d705f61..50dd05130bf 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2000/10/17 01:33:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.73 2000/11/15 13:52:57 wiz Exp $
 #
 
     SUBDIR += ac3dec
@@ -50,7 +50,6 @@
     SUBDIR += id3ed
     SUBDIR += kdemultimedia
     SUBDIR += lame
-    SUBDIR += lame-gui
     SUBDIR += libac3
     SUBDIR += libaudiofile
     SUBDIR += libcdaudio
diff --git a/audio/lame-gui/Makefile b/audio/lame-gui/Makefile
deleted file mode 100644
index ec2293188d1..00000000000
--- a/audio/lame-gui/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 1999/11/09 16:52:04 hubertf Exp $
-#
-
-.include "../lame/Makefile.common"
-
-PKGNAME=	lame-gui-${VERS}
-
-DEPENDS=	gtk+-1.2.*:../../x11/gtk
-
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://hive.me.gu.edu.au/not_lame/
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin/lame-gui
-	${INSTALL_DATA} ${WRKSRC}/doc/man/lame.1 ${PREFIX}/man/man1/lame-gui.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame-gui/files/md5 b/audio/lame-gui/files/md5
deleted file mode 100644
index bda42ca8c8b..00000000000
--- a/audio/lame-gui/files/md5
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: md5,v 1.4 2000/07/04 21:08:27 pooka Exp $
-
-MD5 (notlame/dist10.tar.gz.a) = b9df3d398de203710fec8f9f876f3e23
-MD5 (notlame/dist10.tar.gz.b) = c7e28e805a6f203dfd616eaa06a9914e
-MD5 (notlame/lame3.70.patch.gz) = 67d0b8443be46badd7ff6341ab9dcee1
diff --git a/audio/lame-gui/files/patch-sum b/audio/lame-gui/files/patch-sum
deleted file mode 100644
index 7f58d22c7c3..00000000000
--- a/audio/lame-gui/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.3 1999/11/03 23:57:06 hubertf Exp $
-
-MD5 (patch-gtk) = 424d4fd423e474746874fc6de2c82fa2
diff --git a/audio/lame-gui/patches/patch-gtk b/audio/lame-gui/patches/patch-gtk
deleted file mode 100644
index 4a17eb21ba6..00000000000
--- a/audio/lame-gui/patches/patch-gtk
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gtk,v 1.2 1999/12/26 00:32:10 wiz Exp $
---- Makefile.orig	Tue Sep 28 22:35:33 1999
-+++ Makefile	Wed Sep 29 12:44:42 1999
-@@ -113,6 +113,17 @@
- 
- endif
- 
-+##########################################################################
-+# NetBSD
-+##########################################################################
-+ifeq ($(UNAME),NetBSD)
-+#  remove if you do not have GTK or do not want the GTK frame analyzer
-+   GTK = -DHAVEGTK `gtk-config --cflags`
-+   GTKLIBS = `gtk-config --libs` 
-+# Comment out next 2 lines if you want to remove VBR histogram capability
-+   BRHIST_SWITCH = -DBRHIST
-+   LIBTERMCAP = -lcurses
-+endif
- 
- ##########################################################################
- # SunOS
diff --git a/audio/lame-gui/pkg/COMMENT b/audio/lame-gui/pkg/COMMENT
deleted file mode 100644
index f9fff781def..00000000000
--- a/audio/lame-gui/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Fast, high quality MP3 encoder based on the LAME patch (with gtk gui)
diff --git a/audio/lame-gui/pkg/DESCR b/audio/lame-gui/pkg/DESCR
deleted file mode 100644
index 87270280aae..00000000000
--- a/audio/lame-gui/pkg/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-NotLame is a high quality and fast MP3 encoder, based on the LAME
-patch. The quality is almost as good as the FhG encoder. LAME is
-a patch (it actually stands for LAME Ain't an MP3 Encoder), while
-NotLame is the executable after the patch has been applied to ISO
-sources and compiled.
diff --git a/audio/lame-gui/pkg/PLIST b/audio/lame-gui/pkg/PLIST
deleted file mode 100644
index 351e9440517..00000000000
--- a/audio/lame-gui/pkg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 1999/11/09 16:52:04 hubertf Exp $
-bin/lame-gui
-man/man1/lame-gui.1
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 407dacda0df..1f415f760aa 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,13 +1,50 @@
-# $NetBSD: Makefile,v 1.10 1999/11/09 16:52:03 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/11/15 13:52:58 wiz Exp $
 #
 
-.include 	"Makefile.common"
+VERS=		3.87
+DISTNAME=	lame${VERS}beta
+PKGNAME=	lame-${VERS}
+WRKSRC=		${WRKDIR}/lame${VERS}
+CATEGORIES=	audio
+MASTER_SITES=	http://lame.sourceforge.net/download/beta/
 
-MAINTAINER=     hubertf@netbsd.org
-HOMEPAGE=       http://hive.me.gu.edu.au/not_lame/
+MAINTAINER=	hubertf@netbsd.org
+HOMEPAGE=	http://www.mp3dev.org/mp3/
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+LICENSE=	fee-based-commercial-use
+
+CONFIGURE_ARGS+=	--without-vorbis
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/doc/man/lame.1 ${PREFIX}/man/man1/lame.1
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/lame
+	for f in contributors.html examples.html history.html id3.html	\
+		index.html lame.css modes.html node5.html node6.html	\
+		node7.html switchs.html; do				\
+		${INSTALL_DATA} ${WRKSRC}/doc/html/$$f			\
+			${PREFIX}/share/doc/html/lame;  		\
+	done
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(LAME_USE_GTK)
+DEPENDS=		gtk+-1.2.*:../../x11/gtk
+.else
+CONFIGURE_ARGS+=	--enable-analyzer=no
+.endif
+
+.if (${MACHINE_ARCH} == "alpha")
+DEPENDS+=	libffm-*:../../math/libffm
+# double is faster than float on Alpha
+CFLAGS+=	-O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
+		-mfp-regs -fschedule-insns -fschedule-insns2 		  \
+		-finline-functions -DFLOAT=double
+# optimized libffm (free fast math library)
+LIBS+=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lffm -lm
+CONFIGURE_ENV+=	LIBS="${LIBS}"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/Makefile.common b/audio/lame/Makefile.common
deleted file mode 100644
index 3393529fdcc..00000000000
--- a/audio/lame/Makefile.common
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2000/07/04 21:08:25 pooka Exp $
-#
-
-#
-# Common Makefile for lame and lame-gui
-#
-
-VERS=		3.70
-DISTNAME=	lame-${VERS}
-CATEGORIES=	audio
-MASTER_SITES=	http://hive.me.gu.edu.au/not_lame/
-DISTFILES=	dist10.tar.gz.a dist10.tar.gz.b
-PATCHFILES=	lame${VERS}.patch.gz
-PATCH_SITES=	${MASTER_SITES}
-
-.include "../../mk/bsd.prefs.mk"
-.if (${MACHINE_ARCH} == "alpha")
-DEPENDS+=	libffm-*:../../math/libffm
-MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH}
-.endif
-
-WRKSRC=		${WRKDIR}/lame${VERS}
-DIST_SUBDIR=	notlame
-USE_GMAKE=	yes
-ALL_TARGET=	lame
-MIRROR_DISTFILE=no
-LICENSE=	fee-based-commercial-use
-EXTRACT_ONLY=
-PATCH_DIST_STRIP= -p1
-
-#.if !make(makepatchsum)
-#PATCHDIR=       ${WRKDIR}/.patches
-#.endif
-
-post-extract:
-	${CAT} ${_DISTDIR}/dist* | ( cd ${WRKDIR} ; ${GTAR} plzxf - )
-	${MV} ${WRKDIR}/dist10/lsf/encoder ${WRKSRC}
diff --git a/audio/lame/files/md5 b/audio/lame/files/md5
index 899e697a618..8bd2537fec8 100644
--- a/audio/lame/files/md5
+++ b/audio/lame/files/md5
@@ -1,5 +1,3 @@
-$NetBSD: md5,v 1.6 2000/07/04 21:08:26 pooka Exp $
+$NetBSD: md5,v 1.7 2000/11/15 13:52:59 wiz Exp $
 
-MD5 (notlame/dist10.tar.gz.a) = b9df3d398de203710fec8f9f876f3e23
-MD5 (notlame/dist10.tar.gz.b) = c7e28e805a6f203dfd616eaa06a9914e
-MD5 (notlame/lame3.70.patch.gz) = 67d0b8443be46badd7ff6341ab9dcee1
+MD5 (lame3.87beta.tar.gz) = 0c0f6f4aab5963be12509657d5dccd5c
diff --git a/audio/lame/files/patch-sum b/audio/lame/files/patch-sum
index c80748bd082..e43595fd891 100644
--- a/audio/lame/files/patch-sum
+++ b/audio/lame/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.9 2000/07/04 21:08:26 pooka Exp $
+$NetBSD: patch-sum,v 1.10 2000/11/15 13:52:59 wiz Exp $
 
-MD5 (patch-ab) = 7f395bc3cdc10e354a1354d280a96c12
+MD5 (patch-aa) = de37aec3634d06e88a69c1510d741bef
diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa
new file mode 100644
index 00000000000..6b5d155ff58
--- /dev/null
+++ b/audio/lame/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.6 2000/11/15 13:52:59 wiz Exp $
+
+--- configure.orig	Mon Sep 25 23:23:23 2000
++++ configure
+@@ -970,8 +970,9 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-CONFIG_LIBS=
+-CONFIG_OPTS=
++# pass CFLAGS and LIBS (else they get ignored)
++CONFIG_LIBS="$LIBS"
++CONFIG_OPTS="$CFLAGS"
+ CONFIG_LDFLAGS=
+ 
+ 
+@@ -1055,6 +1056,8 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++# we don't want to use ncurses, curses are good enough
++if false; then
+ echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
+ echo "configure:1060: checking for initscr in -lncurses" >&5
+ ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
+@@ -1094,6 +1097,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
++fi
+ 
+ echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6
+ echo "configure:1100: checking for cos in -lm" >&5
+@@ -1681,7 +1685,8 @@
+ fi
+ echo "$ac_t""$CONFIG_BRHIST" 1>&6
+ 
+-CONFIG_LIBS="$HAVE_LIBM $CONFIG_LIBS"
++# take care that -lm appears after -lffm (for alpha)
++CONFIG_LIBS="$CONFIG_LIBS $HAVE_LIBM"
+ 
+ 
+ 
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
deleted file mode 100644
index dbbae9f1fe5..00000000000
--- a/audio/lame/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/07/04 21:08:26 pooka Exp $
-
---- Makefile.orig	Tue Jul  4 23:29:58 2000
-+++ Makefile	Tue Jul  4 23:30:05 2000
-@@ -64,6 +64,17 @@
- #GTK = -DHAVEGTK `gtk-config --cflags`
- #GTKLIBS = `gtk-config --libs` 
- 
-+ifeq ($(MACHINE_ARCH),alpha)
-+# double is faster than float on Alpha
-+CC_OPTS =       -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
-+                -mfp-regs -fschedule-insns -fschedule-insns2 \
-+                -finline-functions \
-+                -DFLOAT=double
-+# optimized libffm (free fast math library)
-+LIBS	=	-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lffm -lm
-+# Compaq's fast math library
-+#LIBS    =       -lcpml 
-+endif
- 
- ##########################################################################
- # LINUX   
diff --git a/audio/lame/pkg/COMMENT b/audio/lame/pkg/COMMENT
index e3576610f10..e4bc3895833 100644
--- a/audio/lame/pkg/COMMENT
+++ b/audio/lame/pkg/COMMENT
@@ -1 +1 @@
-Fast, high quality MP3 encoder, based on the LAME patch
+Fast, high quality MP3 encoder
diff --git a/audio/lame/pkg/DESCR b/audio/lame/pkg/DESCR
index 83f4c89ad2a..33dcbf2f417 100644
--- a/audio/lame/pkg/DESCR
+++ b/audio/lame/pkg/DESCR
@@ -1,8 +1,14 @@
-NotLame is a high quality and fast MP3 encoder, based on the LAME
-patch. The quality is almost as good as the FhG encoder. LAME is
-a patch (it actually stands for LAME Ain't an MP3 Encoder), while
-NotLame is the executable after the patch has been applied to ISO
-sources and compiled.
+Following the great history of GNU naming, LAME originally stood for
+LAME Ain't an Mp3 Encoder. LAME started life as a GPL'd patch against
+the dist10 ISO demonstration source, and thus was incapable of
+producing an mp3 stream or even being compiled by itself. But in May
+2000, the last remnants of the ISO source code were replaced, and now
+LAME is the source code for a fully GPL'd MP3 encoder, with speed and
+quality to rival all commercial competitors.
 
-This version does not have the gtk based gui.  That can be obtained
-from the lame-gui package.
+LAME is an educational tool to be used for learning about MP3
+encoding. The goal of the LAME project is to use the open source model
+to improve the psycho acoustics, noise shaping and speed of
+MP3. Another goal of the LAME project is to use these improvements for
+the basis of a patent free audio compression codec for the GNU
+project.
diff --git a/audio/lame/pkg/PLIST b/audio/lame/pkg/PLIST
index 2efcf722587..893b7385284 100644
--- a/audio/lame/pkg/PLIST
+++ b/audio/lame/pkg/PLIST
@@ -1,3 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 1999/11/09 16:52:04 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/11/15 13:52:59 wiz Exp $
 bin/lame
 man/man1/lame.1
+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/node5.html
+share/doc/html/lame/node6.html
+share/doc/html/lame/node7.html
+share/doc/html/lame/switchs.html
+@dirrm share/doc/html/lame