Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/lame/Makefile,v
retrieving revision 1.21
diff -u -w -r1.21 Makefile
--- Makefile	22 Apr 2002 01:22:48 -0000	1.21
+++ Makefile	20 Jun 2002 23:38:35 -0000
@@ -6,40 +6,85 @@
 #
 
 PORTNAME=	lame
-PORTVERSION=	3.91
+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
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
+.if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
+
+# libvorbis sources are required wether or not the library is already installed.
+DEPENDS=	${PORTSDIR}/audio/libvorbis:patch
+.endif
+
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 WANT_GTK=	yes
-CONFIGURE_ARGS=	--enable-nasm
+CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp
+
+MAN1=		lame.1
 
 .include <bsd.port.pre.mk>
 
-.if (defined(HAVE_GTK) || defined(WITH_GTK)) && !defined(WITHOUT_GTK)
+.if defined(HAVE_GTK)
 USE_GTK=	yes
 PLIST_SUB+=	WITH_GTK=''
+CONFIGURE_ARGS+= --enable-mp3x
 .else
 PLIST_SUB+=	WITH_GTK='@comment '
+CONFIGURE_ARGS+= --disable-gtktest
 .endif
 
-MAN1=		lame.1
+.if !defined(WITHOUT_VORBIS)
+LIBVORBIS_SRC!=	cd ${PORTSDIR}/audio/libvorbis && ${MAKE} -V WRKSRC
 
-post-build:
-.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
-	(cd ${WRKSRC}/frontend && make mp3x)
+CONFIGURE_ARGS+= --with-vorbis
+CONFIGURE_ENV+=	CONFIG_DEFS="${CONFIG_DEFS}" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${LIBVORBIS_SRC}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		LIBS=-logg
+CONFIG_DEFS=	-DUSE_FFTSSE -DUSE_FFTFPU
 .endif
 
-post-install:
-.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
-	${INSTALL_PROGRAM} ${WRKSRC}/frontend/mp3x ${PREFIX}/bin/
+DOC_FILES=	API LICENSE PRESETS.draft README TODO USAGE
+
+pre-everything::
+.if !defined(WITHOUT_VORBIS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you don't want to compile with Vorbis support."
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_VORBIS=yes\""
+	@${ECHO_MSG}
 .endif
+
+.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
+
+post-install: install-la
+.else
+post-install: install-la install-doc
+
+install-doc:
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+
+install-la:
+	@${INSTALL_SCRIPT} ${WRKSRC}/libmp3lame/libmp3lame.la ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/lame/distinfo,v
retrieving revision 1.9
diff -u -w -r1.9 distinfo
--- distinfo	17 Jan 2002 05:40:36 -0000	1.9
+++ distinfo	20 Jun 2002 23:03:11 -0000
@@ -1 +1 @@
-MD5 (lame-3.91.tar.gz) = c09562caa789c946403f6f9661592ee5
+MD5 (lame-3.92.tar.gz) = 4e1b83a7b08636d2ef43711e4c74d3a9
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/lame/pkg-plist,v
retrieving revision 1.9
diff -u -w -r1.9 pkg-plist
--- pkg-plist	22 Apr 2002 01:22:48 -0000	1.9
+++ pkg-plist	20 Jun 2002 23:20:13 -0000
@@ -1,10 +1,19 @@
+@comment $FreeBSD: ports/audio/lame-devel/pkg-plist,v 1.2 2002/05/15 03:39:43 kris Exp $
 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
@@ -17,3 +26,4 @@
 %%PORTDOCS%%share/doc/lame/html/switchs.html
 %%PORTDOCS%%@dirrm share/doc/lame/html
 %%PORTDOCS%%@dirrm share/doc/lame
+@dirrm include/lame