Update to V3.50.

While there, split (again...) into lame and lame-gui package.

Many speed ups, bug fixes, quality improvements and
added functionality (eg. ID3 tags, VBR histogram).

5 files changed, 40 insertions, 62 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index a9e6de8488c..c67e2cdebd8 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,45 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1999/10/22 23:55:49 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/03 23:50:08 hubertf Exp $
 #
 
-#
-# This file is included from ../lame-gui/Makefile to get most of the things
-# to match up.  It will define LAME_GUI before including.
-#
-
-DISTNAME=	lame-3.33beta
-CATEGORIES=	audio
-MASTER_SITES=	http://www.sulaco.org/mp3/download/beta/
-DISTFILES=	lame3.33beta.tar.gz
-
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.sulaco.org/mp3/
-
-DEPENDS=	ncurses-4.2:../../devel/ncurses
-
-CONFLICTS=	lame-*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(LAME_USE_GTK) || ${LAME_USE_GTK} == YES
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-.endif
-
-WRKSRC=		${WRKDIR}/lame3.33
-USE_GMAKE=	yes
-ALL_TARGET=	lame
-MIRROR_DISTFILE=no
-LICENSE=	fee-based-commercial-use
-
-.if !make(makepatchsum)
-PATCHDIR=       ${WRKDIR}/.patches
-.endif
+.include 	"Makefile.common"
 
-post-extract:
-	@${MKDIR} ${PATCHDIR}
-	@${CP} ${.CURDIR}/patches/patch-* ${PATCHDIR}/
-.if defined(LAME_USE_GTK) && ${LAME_USE_GTK} == NO
-	@${RM} -f ${PATCHDIR}/patch-gtk
-.endif
+MAINTAINER=     hubertf@netbsd.org
+HOMEPAGE=       http://hive.me.gu.edu.au/not_lame/
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
diff --git a/audio/lame/Makefile.common b/audio/lame/Makefile.common
new file mode 100644
index 00000000000..c166067a7a2
--- /dev/null
+++ b/audio/lame/Makefile.common
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.common,v 1.1 1999/11/03 23:50:08 hubertf Exp $
+#
+
+#
+# Common Makefile for lame and lame-gui
+#
+
+VERS=		3.50
+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}
+
+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 1386346c782..46c96011501 100644
--- a/audio/lame/files/md5
+++ b/audio/lame/files/md5
@@ -1,3 +1,5 @@
-$NetBSD: md5,v 1.4 1999/10/13 05:54:08 explorer Exp $
+$NetBSD: md5,v 1.5 1999/11/03 23:50:09 hubertf Exp $
 
-MD5 (lame3.33beta.tar.gz) = 761c573c0c00ba5212ae53624c891a24
+MD5 (notlame/dist10.tar.gz.a) = b9df3d398de203710fec8f9f876f3e23
+MD5 (notlame/dist10.tar.gz.b) = c7e28e805a6f203dfd616eaa06a9914e
+MD5 (notlame/lame3.50.patch.gz) = 032cc0079675503138d6579abf907a3e
diff --git a/audio/lame/patches/patch-gtk b/audio/lame/patches/patch-gtk
deleted file mode 100644
index 37979ebcf8e..00000000000
--- a/audio/lame/patches/patch-gtk
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 = -lncurses
-+endif
- 
- ##########################################################################
- # SunOS
diff --git a/audio/lame/pkg/COMMENT b/audio/lame/pkg/COMMENT
index 01c64848ba6..e3576610f10 100644
--- a/audio/lame/pkg/COMMENT
+++ b/audio/lame/pkg/COMMENT
@@ -1 +1 @@
-High quality and fast MP3 encoder, based on the LAME patch (without gtk gui)
+Fast, high quality MP3 encoder, based on the LAME patch