- (finally) update to 3.92

- take over maintainership (after some months of maintainer timeout)
  Note: I have write access to the LAME repository, I think this is enough
        to justify this and the following decisions.
- remove gtk support (it's only useful for active mp3 algorithm developers,
  and if you use it, you use the CVS version of it, so there's no need to
  install it)
- don't add vorbis support from PR 39606:
  * there are much better tools to encode ogg vorbis
  * there's no support from the LAME developers (FreeBSD would be the
    only OS with working vorbis in LAME)
  * it will get removed in a later LAME version

Submitted by:	many, see PRs
PR:		39606, 43255, 43727

5 files changed, 69 insertions, 50 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index c3b8ca0731e..942b51e81f8 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lame
-PORTVERSION=	3.91
-PORTREVISION=	1
+PORTVERSION=	3.92
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://lame.sourceforge.net/pub/
+		ftp://ftp.fu-berlin.de/unix/sound/%SUBDIR%/
 MASTER_SITE_SUBDIR=	lame
 
-MAINTAINER=	yoshiaki@kt.rim.or.jp
+MAINTAINER=	netchild@FreeBSD.org
 
 .if ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
@@ -21,30 +20,30 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOMENG=	yes
-WANT_GNOME=	yes
-CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp
-
-.include <bsd.port.pre.mk>
-
-.if (${HAVE_GNOME:Mgtk12}!="" || defined(WITH_GTK)) && !defined(WITHOUT_GTK)
-USE_GNOME+=	gtk12
-PLIST_SUB+=	WITH_GTK=''
-PKGNAMESUFFIX=	-gtk
-.else
-PLIST_SUB+=	WITH_GTK='@comment '
-.endif
+USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp --disable-gtktest
 
 MAN1=		lame.1
 
-post-build:
-.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK)
-	cd ${WRKSRC}/frontend && make mp3x
-.endif
+DOC_FILES=	API LICENSE PRESETS.draft README TODO USAGE
+
+.if defined(NOPORTDOCS)
+do-install:
+	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-exec
+	@cd ${INSTALL_WRKSRC}/include && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-data
+	@cd ${INSTALL_WRKSRC}/doc/man && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-data
+.else
+post-install: install-doc
 
-post-install:
-.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GTK)
-	${INSTALL_PROGRAM} ${WRKSRC}/frontend/mp3x ${PREFIX}/bin/
+install-doc:
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 167a1d35208..ce8f3d73012 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1 +1 @@
-MD5 (lame-3.91.tar.gz) = c09562caa789c946403f6f9661592ee5
+MD5 (lame-3.92.tar.gz) = 4e1b83a7b08636d2ef43711e4c74d3a9
diff --git a/audio/lame/files/patch-configure b/audio/lame/files/patch-configure
index a3fa48ff567..a3ec2419a2f 100644
--- a/audio/lame/files/patch-configure
+++ b/audio/lame/files/patch-configure
@@ -1,16 +1,37 @@
-diff -ruN lame-3.91.orig/configure lame-3.91/configure
---- configure.orig	Wed Dec 26 02:59:42 2001
-+++ configure	Thu Aug 15 23:54:44 2002
-@@ -5521,12 +5521,6 @@
+--- configure.orig	Mon Apr 15 18:54:58 2002
++++ configure	Sat Aug 31 14:21:47 2002
+@@ -2733,7 +2733,7 @@
+ if test "${GCC}" = "yes"; then
+ 	echo $ac_n "checking version of GCC""... $ac_c" 1>&6
+ echo "configure:2736: checking version of GCC" >&5
+-	GCC_version=`${CC} --version`
++	GCC_version=`${CC} --version | sed -n '1s/^[^ ]* (.*) //;s/ .*$//;1p'`
+ 	echo "$ac_t""${GCC_version}" 1>&6
+ fi
  
+@@ -5541,7 +5541,7 @@
+ 	3.*)
+ 		# -funroll-loops seems to produce buggy code with gcc 3.0.3
+ 		OPTIMIZATION="-O -fomit-frame-pointer -ffast-math \
+-			-funroll-loops -maccumulate-outgoing-args"
++			-funroll-loops"
+ 		;;
+ 	*)
+ 		# default
+@@ -5555,11 +5555,15 @@
+ 	OPTIMIZATION_NORM="-fschedule-insns2"
  
- if test "x$GCC" = "xyes"; then
--	# gcc defaults. OS specific options go in versious sections below
--        # from the gcc man pages:  "there is no reason to use -pedantic"
--	CFLAGS="-Wall -pipe ${CFLAGS}"
--
--
--	OPTIMIZATION="-O3 -fomit-frame-pointer -ffast-math -funroll-loops"
- 	case "${GCC_version}" in
- 	2.96*)
-            # for buggy version of gcc shipped with RH7.1, back of on some
+ 	OPTIMIZATION_FULL="-fmove-all-movables -freduce-all-givs \
+-			-fsched-interblock -fbranch-count-reg -fforce-addr \
++			-fbranch-count-reg -fforce-addr \
+ 			-fforce-mem"
+ 
+ 	case "${CONFIG_EXPOPT}" in
+ 	no)
++		# if someone supplies own CFLAGS, we don't add our own
++		if [ "X${ac_save_CFLAGS}" != "X" ]; then
++			OPTIMIZATION=""
++		fi
+ 		;;
+ 	norm|yes)
+ 		OPTIMIZATION="${OPTIMIZATION} ${OPTIMIZATION_NORM}"
diff --git a/audio/lame/files/patch-sloppy b/audio/lame/files/patch-sloppy
index 522a4e5390e..7dbf1619493 100644
--- a/audio/lame/files/patch-sloppy
+++ b/audio/lame/files/patch-sloppy
@@ -1,10 +1,3 @@
---- frontend/rtp.h	Tue Dec 19 02:43:25 2000
-+++ frontend/rtp.h	Fri Sep 27 18:26:42 2002
-@@ -28,3 +28,3 @@
- 
--#ifdef 0
-+#if 0
- int rtp_send (
 --- frontend/mp3rtp.c	Fri Jun  8 17:29:34 2001
 +++ frontend/mp3rtp.c	Fri Sep 27 18:29:04 2002
 @@ -48,6 +48,4 @@
diff --git a/audio/lame/pkg-plist b/audio/lame/pkg-plist
index bb3bc15a00e..44751cee44f 100644
--- a/audio/lame/pkg-plist
+++ b/audio/lame/pkg-plist
@@ -1,11 +1,16 @@
 bin/lame
 bin/mp3rtp
-%%WITH_GTK%%bin/mp3x
 include/lame/lame.h
 lib/libmp3lame.a
-lib/libmp3lame.la
-lib/libmp3lame.so
 lib/libmp3lame.so.0
+@exec ln -fs %F %B/libmp3lame.so
+@unexec rm -f %B/libmp3lame.so
+%%PORTDOCS%%share/doc/lame/API
+%%PORTDOCS%%share/doc/lame/LICENSE
+%%PORTDOCS%%share/doc/lame/PRESETS.draft
+%%PORTDOCS%%share/doc/lame/README
+%%PORTDOCS%%share/doc/lame/TODO
+%%PORTDOCS%%share/doc/lame/USAGE
 %%PORTDOCS%%share/doc/lame/html/basic.html
 %%PORTDOCS%%share/doc/lame/html/contributors.html
 %%PORTDOCS%%share/doc/lame/html/examples.html
@@ -18,3 +23,4 @@ lib/libmp3lame.so.0
 %%PORTDOCS%%share/doc/lame/html/switchs.html
 %%PORTDOCS%%@dirrm share/doc/lame/html
 %%PORTDOCS%%@dirrm share/doc/lame
+@dirrm include/lame