upgrade lame to 3.31beta, and add support for the gui (disabled, used by lame-gui pkg)

6 files changed, 30 insertions, 54 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 4fe7175677f..c8efdbee877 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,30 +1,38 @@
-# $NetBSD: Makefile,v 1.3 1999/09/27 14:17:22 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/09/30 16:41:05 explorer Exp $
 #
 
-DISTNAME=	lame-3.13
+#
+# This file is included from ../lame-gui/Makefile to get most of the things
+# to match up.  It will define LAME_GUI before including.
+#
+
+.ifndef LAME_GUI
+DISTNAME=	lame-3.31beta
+.else
+DISTNAME=	lame-gui-3.31beta
+.endif
 CATEGORIES=	audio
-MASTER_SITES=	http://hive.me.gu.edu.au/not_lame/
-DISTFILES=	dist10.tar.gz.a dist10.tar.gz.b lame3.13.patch.tgz
+MASTER_SITES=	http://www.sulaco.org/mp3/download/beta/
+DISTFILES=	lame3.31beta.tar.gz
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://hive.me.gu.edu.au/not_lame/
+HOMEPAGE=	http://www.sulaco.org/mp3/
 
-DIST_SUBDIR=	notlame
-EXTRACT_ONLY=
-WRKSRC=		${WRKDIR}/lame_src
-PATCH_DIST_STRIP= -p1
+DEPENDS=	ncurses-4.2:../../devel/ncurses
+
+.ifndef LAME_GUI
+CONFLICTS=	lame-gui-*
+.else
+DEPENDS+=	gtk+-1.2.4:../../x11/gtk
+CONFLICTS=	lame-[0-9]*
+.endif
+
+WRKSRC=		${WRKDIR}/lame3.31
 USE_GMAKE=	yes
 ALL_TARGET=	lame
 MIRROR_DISTFILE=no
 LICENSE=	fee-based-commercial-use
 
-post-extract:
-	${CAT} ${_DISTDIR}/dist* | ( cd ${WRKDIR} ; ${GTAR} plzxf - )
-	${MV} ${WRKDIR}/dist10/lsf/encoder ${WRKSRC}
-	cd ${WRKDIR}; ${GTAR} xvzf ${_DISTDIR}/lame3.13.patch.tgz
-	cd ${WRKSRC}; ${PATCH} -p1 < ${WRKDIR}/lame3.13.patch
-	# ${RM} -fr ${WRKDIR}/dist10
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
 
diff --git a/audio/lame/files/md5 b/audio/lame/files/md5
index 1e69545e2d1..1ae1a4a6e86 100644
--- a/audio/lame/files/md5
+++ b/audio/lame/files/md5
@@ -1,5 +1,3 @@
-$NetBSD: md5,v 1.2 1999/09/27 14:17:23 agc Exp $
+$NetBSD: md5,v 1.3 1999/09/30 16:41:06 explorer Exp $
 
-MD5 (notlame/dist10.tar.gz.a) = b9df3d398de203710fec8f9f876f3e23
-MD5 (notlame/dist10.tar.gz.b) = c7e28e805a6f203dfd616eaa06a9914e
-MD5 (notlame/lame3.13.patch.tgz) = cc9946491265bde4a1ddb98ccfa9950f
+MD5 (lame3.31beta.tar.gz) = 1c2ee677079d09aeee0aa0f85abc195c
diff --git a/audio/lame/files/patch-sum b/audio/lame/files/patch-sum
deleted file mode 100644
index e829e928b36..00000000000
--- a/audio/lame/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.3 1999/08/10 11:16:59 agc Exp $
-
-MD5 (patch-aa) = b5f330b513a98beb0811921cf45b560f
diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa
deleted file mode 100644
index e1485b15a18..00000000000
--- a/audio/lame/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/08/10 11:16:59 agc Exp $
-
-Adjust for gcc, and don't use Sun compiler on Solaris.
-
---- Makefile.orig	Tue Aug 10 11:59:27 1999
-+++ Makefile	Tue Aug 10 12:04:40 1999
-@@ -13,7 +13,7 @@
- # defaults:
- PGM = lame
- CC = gcc
--CC_OPTS = -O 	
-+CC_OPTS = -O3 
- GTK = 
- GTKLIBS = 
- SNDLIB = 
-@@ -98,10 +98,10 @@
- ##########################################################################
- # SunOS
- ##########################################################################
--ifeq ($(UNAME),SunOS) 
--   CC = cc
--   MAKEDEP = -xM
--endif
-+#ifeq ($(UNAME),SunOS) 
-+#   CC = cc
-+#   MAKEDEP = -xM
-+#endif
- 
- 
- ##########################################################################
diff --git a/audio/lame/pkg/COMMENT b/audio/lame/pkg/COMMENT
index 3361b9a9a7f..01c64848ba6 100644
--- a/audio/lame/pkg/COMMENT
+++ b/audio/lame/pkg/COMMENT
@@ -1 +1 @@
-High quality and fast MP3 encoder, based on the LAME patch
+High quality and fast MP3 encoder, based on the LAME patch (without gtk gui)
diff --git a/audio/lame/pkg/DESCR b/audio/lame/pkg/DESCR
index 87270280aae..83f4c89ad2a 100644
--- a/audio/lame/pkg/DESCR
+++ b/audio/lame/pkg/DESCR
@@ -3,3 +3,6 @@ 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.
+
+This version does not have the gtk based gui.  That can be obtained
+from the lame-gui package.