4 files changed, 10 insertions, 27 deletions

diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile
index 02e731bad3cf..da309e2b805f 100644
--- a/multimedia/libquicktime-lame/Makefile
+++ b/multimedia/libquicktime-lame/Makefile
@@ -5,13 +5,12 @@ PORTNAME=	libquicktime
 PORTREVISION=	3
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-lame
-PORTREVISION=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LAME plugin for libquicktime
 
-LIB_DEPENDS=	quicktime.0:${PORTSDIR}/multimedia/libquicktime \
-		mp3lame.0:${PORTSDIR}/audio/lame
+LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime \
+		libmp3lame.so:${PORTSDIR}/audio/lame
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,8 +18,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MASTERDIR=	${.CURDIR}/../libquicktime
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	${PORTNAME}-${PKGNAMESUFFIX}
-
 _BUILDING_LIBQUICKTIME_PLUGINS=	yes
 
 CONFIGURE_ARGS+=	--with-lame \
@@ -37,8 +34,8 @@ CONFIGURE_ARGS+=	--with-lame \
 			--without-x264 \
 			--without-schroedinger
 
-NO_STAGE=	yes
 do-install:
-	@cd ${WRKSRC}/plugins/lame && ${MAKE_CMD} install
+	@cd ${WRKSRC}/plugins/lame && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} install ${MAKE_ARGS}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/libquicktime-lame/pkg-plist b/multimedia/libquicktime-lame/pkg-plist
index 7c16352e6dae..deafccb29694 100644
--- a/multimedia/libquicktime-lame/pkg-plist
+++ b/multimedia/libquicktime-lame/pkg-plist
@@ -1,2 +1 @@
 lib/libquicktime/lqt_lame.so
-lib/libquicktime/lqt_lame.la
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 42e5b8ebd007..06515f199a28 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -18,7 +18,7 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig gettext
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_AUTOTOOLS=	autoconf
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -28,7 +28,6 @@ CFLAGS+=	-fPIC
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
 USE_XORG=	xaw xv
 CONFIGURE_ARGS=	--with-x --enable-gpl --without-doxygen --without-lame
-MAN1=		lqtplay.1
 
 OPTIONS_DEFINE=	ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \
 		SCHROEDINGER X264 DOCS
@@ -45,7 +44,6 @@ CONFIGURE_ARGS+=	--without-x --enable-gpl --without-doxygen
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
@@ -146,9 +144,9 @@ pre-configure:
 
 .if ${PORT_OPTIONS:MDOCS} && !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/multimedia/libquicktime/pkg-plist b/multimedia/libquicktime/pkg-plist
index 95f6100d716a..0f0b5850c19c 100644
--- a/multimedia/libquicktime/pkg-plist
+++ b/multimedia/libquicktime/pkg-plist
@@ -17,34 +17,23 @@ include/lqt/lqt_codecinfo.h
 include/lqt/lqt_qtvr.h
 include/lqt/lqt_version.h
 include/lqt/quicktime.h
-lib/libquicktime.la
 lib/libquicktime.so
 lib/libquicktime.so.0
-lib/libquicktime/lqt_audiocodec.la
+lib/libquicktime.so.0.0.0
 lib/libquicktime/lqt_audiocodec.so
-%%DV%%lib/libquicktime/lqt_dv.la
 %%DV%%lib/libquicktime/lqt_dv.so
-%%FAAC%%lib/libquicktime/lqt_faac.la
 %%FAAC%%lib/libquicktime/lqt_faac.so
-%%FAAD%%lib/libquicktime/lqt_faad2.la
 %%FAAD%%lib/libquicktime/lqt_faad2.so
-%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.la
 %%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so
-%%JPEG%%lib/libquicktime/lqt_mjpeg.la
 %%JPEG%%lib/libquicktime/lqt_mjpeg.so
-%%PNG%%lib/libquicktime/lqt_png.la
 %%PNG%%lib/libquicktime/lqt_png.so
-lib/libquicktime/lqt_rtjpeg.la
 lib/libquicktime/lqt_rtjpeg.so
-%%SCHROEDINGER%%lib/libquicktime/lqt_schroedinger.la
 %%SCHROEDINGER%%lib/libquicktime/lqt_schroedinger.so
-lib/libquicktime/lqt_videocodec.la
 lib/libquicktime/lqt_videocodec.so
-lib/libquicktime/lqt_vorbis.la
 lib/libquicktime/lqt_vorbis.so
-%%X264%%lib/libquicktime/lqt_x264.la
 %%X264%%lib/libquicktime/lqt_x264.so
 libdata/pkgconfig/libquicktime.pc
+man/man1/lqtplay.1.gz
 share/locale/de/LC_MESSAGES/libquicktime.mo
 @dirrm lib/libquicktime
 @dirrm include/lqt