Update to 3.91

PR:		33945
Submitted by:	maintainer

5 files changed, 24 insertions, 70 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 86a2024eecec..c5c52129c27a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -6,35 +6,21 @@
 #
 
 PORTNAME=	lame
-PORTVERSION=	3.70
-PORTREVISION=	2
+PORTVERSION=	3.91
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://lame.sourceforge.net/pub/
 MASTER_SITE_SUBDIR=	lame
-DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 
-USE_GMAKE=	yes
-WANT_GTK=	yes
-ALL_TARGET=	lame
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-MAN1=		lame.1
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_GTK)
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 USE_GTK=	yes
-.endif
+CONFIGURE_ARGS=	--enable-nasm
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/doc/man/lame.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/lame
-	@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \
-		${WRKSRC}/doc/html/*.css ${PREFIX}/share/doc/lame
-.endif
+MAN1=		lame.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 3adbdda83bb2..167a1d352082 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1 +1 @@
-MD5 (lame3.70.tar.gz) = 44e29880a21535a7c935046a531e15af
+MD5 (lame-3.91.tar.gz) = c09562caa789c946403f6f9661592ee5
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
deleted file mode 100644
index 99d077e3026d..000000000000
--- a/audio/lame/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig       Sat Jul  1 15:31:35 2000
-+++ Makefile    Sat Jul  1 15:36:07 2000
-@@ -11,8 +11,8 @@
- 
- # defaults:
- PGM = lame
--CC = gcc
--CC_OPTS =  -O
-+CC ?= gcc
-+CC_OPTS = ${CFLAGS}
- GTK = 
- GTKLIBS = 
- SNDLIB = -DLAMESNDFILE
-@@ -136,8 +136,10 @@
- ##########################################################################
- ifeq ($(UNAME),FreeBSD)
- #  remove if you do not have GTK or do not want the GTK frame analyzer
--   GTK = -DHAVEGTK `gtk12-config --cflags`
--   GTKLIBS = `gtk12-config --libs` 
-+ifdef HAVE_GTK
-+   GTK = -DHAVEGTK `$(GTK_CONFIG) --cflags`
-+   GTKLIBS = `$(GTK_CONFIG) --libs` 
-+endif
- # Comment out next 2 lines if you want to remove VBR histogram capability
-    BRHIST_SWITCH = -DBRHIST
-    LIBTERMCAP = -lncurses
-
diff --git a/audio/lame/files/patch-ab b/audio/lame/files/patch-ab
deleted file mode 100644
index 9271d2fc2780..000000000000
--- a/audio/lame/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- lame.c.orig	Thu Apr 20 01:48:22 2000
-+++ lame.c	Thu Apr 20 01:49:04 2000
-@@ -1196,7 +1196,7 @@
-   /*
-    *  Disable floating point exepctions
-    */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && !defined(__alpha__)
- # include <floatingpoint.h>
-   {
-   /* seet floating point mask to the Linux default */
diff --git a/audio/lame/pkg-plist b/audio/lame/pkg-plist
index 88a581496441..f828c3f25139 100644
--- a/audio/lame/pkg-plist
+++ b/audio/lame/pkg-plist
@@ -1,12 +1,18 @@
 bin/lame
-%%PORTDOCS%%share/doc/lame/contributors.html
-%%PORTDOCS%%share/doc/lame/examples.html
-%%PORTDOCS%%share/doc/lame/history.html
-%%PORTDOCS%%share/doc/lame/id3.html
-%%PORTDOCS%%share/doc/lame/index.html
-%%PORTDOCS%%share/doc/lame/lame.css
-%%PORTDOCS%%share/doc/lame/node5.html
-%%PORTDOCS%%share/doc/lame/node6.html
-%%PORTDOCS%%share/doc/lame/node7.html
-%%PORTDOCS%%share/doc/lame/switchs.html
+include/lame/lame.h
+lib/libmp3lame.a
+lib/libmp3lame.la
+lib/libmp3lame.so
+lib/libmp3lame.so.0
+%%PORTDOCS%%share/doc/lame/html/basic.html
+%%PORTDOCS%%share/doc/lame/html/contributors.html
+%%PORTDOCS%%share/doc/lame/html/examples.html
+%%PORTDOCS%%share/doc/lame/html/history.html
+%%PORTDOCS%%share/doc/lame/html/id3.html
+%%PORTDOCS%%share/doc/lame/html/index.html
+%%PORTDOCS%%share/doc/lame/html/lame.css
+%%PORTDOCS%%share/doc/lame/html/modes.html
+%%PORTDOCS%%share/doc/lame/html/node6.html
+%%PORTDOCS%%share/doc/lame/html/switchs.html
+%%PORTDOCS%%@dirrm share/doc/lame/html
 %%PORTDOCS%%@dirrm share/doc/lame