6 files changed, 61 insertions, 43 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index d9ec5ef8b730..60c88ea77c25 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,30 +1,35 @@
 # ports collection makefile for:   lame
-# Version required:    2.1f
-# Date created:         November 1998
+# Version required:    3.11
+# Date created:        11 January 1998
 # Whom:                yoshiaki Uchikawa
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/01 22:33:47 sada Exp $
+# $Id$
 #
 
-DISTNAME=	dist10
-PKGNAME=	lamer-2.1f
+DISTNAME=	lame3.11
+PKGNAME=	lame-3.11
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.tnt.uni-hannover.de/pub/MPEG/audio/mpeg2/software/technical_report/ \
-		ftp://ftp.deva.net/pub/sources/sound/codecs/mpeg/
-
-PATCH_SITES=	http://student.uq.edu.au/~s302585/lame/files/
-PATCHFILES=	dist10patch-2.1f.gz
+MASTER_SITES=	ftp://geek.rcc.se/pub/mp3encoder/lame/
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 
-PATCH_DIST_STRIP = -p1
+LIB_DEPENDS=	gtk12:${PORTSDIR}/x11-toolkits/gtk12
+
+MAN1=		lame.1
 
-WRKSRC=		${WRKDIR}/dist10/lsf/encoder/
 USE_GMAKE=	YES
-ALL_TARGET=	lamer
+ALL_TARGET=	lame
 RESTRICTED=	Condition is not clear
 
 do-install:
-	( cd ${WRKSRC}; ${INSTALL_PROGRAM} lamer ${PREFIX}/bin )
+	( cd ${WRKSRC}; ${INSTALL_PROGRAM} lame ${PREFIX}/bin )
+	( cd ${WRKSRC}; ${INSTALL_MAN} ${WRKSRC}/doc/man/lame.1 \
+	${PREFIX}/man/man1 )
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/lame
+	${INSTALL_MAN} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/lame
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 0a3ad50d491a..4a873abc12db 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,2 +1 @@
-MD5 (dist10.tar.gz) = 62cee8daa6041b8a2d0a9a1ef18163b4
-MD5 (dist10patch-2.1f.gz) = e023baef3d7772d0a3deff0906eaabb0
+MD5 (lame3.11.tar.gz) = a07407f3e06afe6265cb47d291540982
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
index 122ddd7435a2..79959a82dfcd 100644
--- a/audio/lame/files/patch-aa
+++ b/audio/lame/files/patch-aa
@@ -1,21 +1,11 @@
---- Makefile.orig	Sun Nov 29 17:40:32 1998
-+++ Makefile	Sun Nov 29 17:41:27 1998
-@@ -17,7 +17,7 @@
- ## Received from Mike Coleman
- ############################################################################
- 
--CC = egcc
-+CC = gcc
- 
- c_sources = \
- 	common.c \
-@@ -43,8 +43,7 @@
- 
- #CC_SWITCHES = -O3 -DUNIX -DBS_FORMAT=BINARY $(NINT_SWITCH) -DNDEBUG
- CC_SWITCHES =  -O9 -DUNIX -DBS_FORMAT=BINARY $(NINT_SWITCH) -DNDEBUG \
--		-funroll-loops -fstrength-reduce -ffast-math -malign-functions=4 \
--		-malign-jumps=4 -malign-loops=4 -enable-i386-hacks  -mpentium 
-+		-funroll-loops -fstrength-reduce -ffast-math 
- EXTRA_SWITCHES = 
- 
- PGM = lamer
+--- Makefile.orig	Wed Jun  2 15:59:37 1999
++++ Makefile	Wed Jun  9 01:19:47 1999
+@@ -10,7 +10,7 @@
+ # defaults:
+ PGM = lame
+ CC = gcc
+-CC_OPTS = -O 	
++CC_OPTS =  ${CFLAGS}	
+ GTK = 
+ GTKLIBS = 
+ LIBS = -lm
diff --git a/audio/lame/pkg-comment b/audio/lame/pkg-comment
index 78c91ca66fe8..8c317a3dcf7d 100644
--- a/audio/lame/pkg-comment
+++ b/audio/lame/pkg-comment
@@ -1 +1 @@
-ISO code based fast MP3 encoder patch kit
+ISO code based fast MP3 encorder kit
diff --git a/audio/lame/pkg-descr b/audio/lame/pkg-descr
index f113de697da8..3aee3c7639d4 100644
--- a/audio/lame/pkg-descr
+++ b/audio/lame/pkg-descr
@@ -1,7 +1,9 @@
 LAME stands for LAME Ain't an Mp3 Encoder. 
 
-The dist10patch is totally incapable of producing an mp3
-stream. It is incapable of even being compiled by itself. 
-It is patch for dist10 ISO distribution.
+This is a patch agains the ISO MPEG1 demonstration source.  The
+modifications are distributed under the GNU GENERAL PUBLIC LICENSE
+(see the file COPYING for details).
 
-WWW: http://www.cryogen.com/mikecheng/
+The graphical frame analyzer uses the MPGLIB decoding engine, written by:
+Michael Hipp (email: Michael.Hipp@student.uni-tuebingen.de) 
+and released under a more restrictive agreement.  
diff --git a/audio/lame/pkg-plist b/audio/lame/pkg-plist
index fbc76f2195f0..8c7f9c6aad4d 100644
--- a/audio/lame/pkg-plist
+++ b/audio/lame/pkg-plist
@@ -1 +1,23 @@
-bin/lamer
+bin/lame
+share/doc/lame/advanced.html
+share/doc/lame/basics.html
+share/doc/lame/contributors.html
+share/doc/lame/history.html
+share/doc/lame/index.html
+share/doc/lame/lame.css
+share/doc/lame/node10.html
+share/doc/lame/node11.html
+share/doc/lame/node12.html
+share/doc/lame/node13.html
+share/doc/lame/node14.html
+share/doc/lame/node15.html
+share/doc/lame/node16.html
+share/doc/lame/node17.html
+share/doc/lame/node18.html
+share/doc/lame/node5.html
+share/doc/lame/node6.html
+share/doc/lame/node7.html
+share/doc/lame/node8.html
+share/doc/lame/node9.html
+share/doc/lame/switchs.html
+@dirrm share/doc/lame