>Number:         8518
>Category:       pkg
>Synopsis:       upgrade lame to 3.31beta
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager (NetBSD software packages system bug manager)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 30 00:50:01 1999
>Last-Modified:
>Originator:     Michael Graff
>Organization:
flame.org:  yes, we do know everything
>Release:        Thu Sep 30 00:42:54 PDT 1999
>Environment:
	
System: NetBSD kechara.flame.org 1.4.1 NetBSD 1.4.1 (KECHARA) #1: Thu Sep 23 09:40:51 PDT 1999 explorer@kechara.flame.org:/raid0/OS/NetBSD/src-1-4/sys/arch/i386/compile/KECHARA i386


>Description:
Currently, lame is version 3.13, which works but is missing many interesting
toys.  The diffs here will upgrade it to 3.31beta, enable the GTK graphical
analysis tools, and the ncurses histogram for variable bit rate.
>How-To-Repeat:
	
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/lame/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1999/09/27 14:17:22	1.3
+++ Makefile	1999/09/30 07:41:43
@@ -1,29 +1,24 @@
 # $NetBSD: Makefile,v 1.3 1999/09/27 14:17:22 agc Exp $
 #
 
-DISTNAME=	lame-3.13
+DISTNAME=	lame-3.31beta
 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/ \
+		http://www.sulaco.org/mp3/download/patches/ \
+		http://hive.me.gu.edu.au/not_lame/
+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=	gtk+-1.2.4:../../x11/gtk \
+		ncurses-4.2:../../devel/ncurses
+
+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
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/audio/lame/files/md5,v
retrieving revision 1.2
diff -u -r1.2 md5
--- md5	1999/09/27 14:17:23	1.2
+++ md5	1999/09/30 07:41:43
@@ -1,5 +1,3 @@
 $NetBSD: md5,v 1.2 1999/09/27 14:17:23 agc 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
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/audio/lame/files/patch-sum,v
retrieving revision 1.3
diff -u -r1.3 patch-sum
--- patch-sum	1999/08/10 11:16:59	1.3
+++ patch-sum	1999/09/30 07:41:43
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/08/10 11:16:59 agc Exp $
+$NetBSD$
 
-MD5 (patch-aa) = b5f330b513a98beb0811921cf45b560f
+MD5 (patch-aa) = 1e41f8b75095126b57890f3bf5a76d34
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/lame/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patch-aa	1999/08/10 11:16:59	1.2
+++ patch-aa	1999/09/30 07:41:43
@@ -1,30 +1,20 @@
-$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
+--- 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
>Audit-Trail:
>Unformatted: