3 files changed, 34 insertions, 36 deletions

diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 751b972335ef..4e01244b06bc 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	9.9
-PORTREVISION=	2
+PORTVERSION=	9.10
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
@@ -29,8 +28,6 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--enable-runtime-cpudetect \
 			--disable-avserver
 
-MAN1=		avprobe.1 avconv.1
-
 OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \
 		GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL OPUS \
 		PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L2 VAAPI VDPAU \
@@ -43,109 +40,108 @@ FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 ILBC_DESC=	iLBC en/decoding via libilbc
 OPUS_DESC=	Opus decoding with libopus
 
-ALSA_LIB_DEPENDS=		asound:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CONFIGURE_ON=		--enable-indev=alsa --enable-outdev=alsa
 ALSA_CONFIGURE_OFF=		--disable-indev=alsa --disable-outdev=alsa
 
-AMR_NB_LIB_DEPENDS=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
+AMR_NB_LIB_DEPENDS=		libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 
-AMR_WB_LIB_DEPENDS=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
+AMR_WB_LIB_DEPENDS=		libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 
 BZIP2_CONFIGURE_ENABLE=		bzlib
 
-CDIO_LIB_DEPENDS=		cdio:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio
 CDIO_CONFIGURE_ENABLE=		libcdio
 
 # --enable-libdc1394
-# DC1394_LIB_DEPENDS=		dc1394:${PORTSDIR}/multimedia/libdc1394
+# DC1394_LIB_DEPENDS=		libdc1394.so:${PORTSDIR}/multimedia/libdc1394
 # DC1394_CONFIGURE_ENABLE=	libdc1394
 
 FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
-FAAC_LIB_DEPENDS=		faac:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=		libfaac.so:${PORTSDIR}/audio/faac
 FAAC_CONFIGURE_ENABLE=		libfaac
 
-FDK_AAC_LIB_DEPENDS=		fdk-aac:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_LIB_DEPENDS=		libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 
-FREETYPE_LIB_DEPENDS=		freetype:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
-GNUTLS_LIB_DEPENDS=		gnutls:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=		libgnutls.so:${PORTSDIR}/security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
-GSM_LIB_DEPENDS=		gsm:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=		libgsm.so:${PORTSDIR}/audio/gsm
 GSM_CONFIGURE_ENABLE=		libgsm
 
 ILBC_BUILD_DEPENDS=		${LOCALBASE}/include/ilbc.h:${PORTSDIR}/net/libilbc
 ILBC_CONFIGURE_ENABLE=		libilbc
 
-JACK_LIB_DEPENDS=		jack:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ENABLE=		indev=jack
 
-LAME_LIB_DEPENDS=		mp3lame:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=		libmp3lame.so:${PORTSDIR}/audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
-OPENCV_LIB_DEPENDS=		opencv_imgproc:${PORTSDIR}/graphics/opencv-core \
-				opencv_gpu:${PORTSDIR}/graphics/opencv
+OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core \
+				libopencv_gpu.so:${PORTSDIR}/graphics/opencv
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
-OPENJPEG_LIB_DEPENDS=		openjpeg:${PORTSDIR}/graphics/openjpeg
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPENSSL_CONFIGURE_ENABLE=	openssl
 
-OPUS_LIB_DEPENDS=		opus:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=		libopus.so:${PORTSDIR}/audio/opus
 OPUS_CONFIGURE_ENABLE=		libopus
 
-PULSEAUDIO_LIB_DEPENDS=		pulse:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
-RTMP_LIB_DEPENDS=		rtmp:${PORTSDIR}/multimedia/rtmpdump
+RTMP_LIB_DEPENDS=		librtmp.so:${PORTSDIR}/multimedia/rtmpdump
 RTMP_CONFIGURE_ENABLE=		librtmp
 
-SCHROEDINGER_LIB_DEPENDS=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
-SPEEX_LIB_DEPENDS=		speex:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=		libspeex.so:${PORTSDIR}/audio/speex
 SPEEX_CONFIGURE_ENABLE=		libspeex
 
-THEORA_LIB_DEPENDS=		theora:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=		libtheora.so:${PORTSDIR}/multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 V4L2_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 V4L2_CONFIGURE_ENABLE=		indev=v4l2
 
-VAAPI_LIB_DEPENDS=		va:${PORTSDIR}/multimedia/libva
+VAAPI_LIB_DEPENDS=		libva.so:${PORTSDIR}/multimedia/libva
 VAAPI_CONFIGURE_ENABLE=		vaapi
 
 VDPAU_BUILD_DEPENDS=		${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=		vdpau
 
-VO_AACENC_LIB_DEPENDS=		vo-aacenc:${PORTSDIR}/audio/vo-aacenc
+VO_AACENC_LIB_DEPENDS=		libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
 VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
 
-VO_AMRWBENC_LIB_DEPENDS=	vo-amrwbenc:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 
-VORBIS_LIB_DEPENDS=		vorbisenc:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
-VPX_LIB_DEPENDS=		vpx:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=		libvpx.so:${PORTSDIR}/multimedia/libvpx
 VPX_CONFIGURE_ENABLE=		libvpx
 
-X264_LIB_DEPENDS=		x264:${PORTSDIR}/multimedia/x264
+X264_LIB_DEPENDS=		libx264.so:${PORTSDIR}/multimedia/x264
 X264_CONFIGURE_ENABLE=		libx264
 
-XVID_LIB_DEPENDS=		xvidcore:${PORTSDIR}/multimedia/xvid
+XVID_LIB_DEPENDS=		libxvidcore.so:${PORTSDIR}/multimedia/xvid
 XVID_CONFIGURE_ENABLE=		libxvid
 
 ZLIB_CONFIGURE_ENABLE=		zlib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -199,7 +195,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libavcodec/libgsm.c
-	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/library.mak
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/libav/distinfo b/multimedia/libav/distinfo
index 936f3e4143bc..ccce8958d6d0 100644
--- a/multimedia/libav/distinfo
+++ b/multimedia/libav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libav-9.9.tar.gz) = 0d746fe9b88d5a884f2fdcced4558a4c60956846a20fecead3d9063b5f0c1949
-SIZE (libav-9.9.tar.gz) = 5787723
+SHA256 (libav-9.10.tar.gz) = bfac4148b2f168c5644f486f463b971588edd87a49dceea7b137da3f2ccaa1dc
+SIZE (libav-9.10.tar.gz) = 5790226
diff --git a/multimedia/libav/pkg-plist b/multimedia/libav/pkg-plist
index caa08a3c2a86..2dd851a69bea 100644
--- a/multimedia/libav/pkg-plist
+++ b/multimedia/libav/pkg-plist
@@ -102,6 +102,8 @@ libdata/pkgconfig/libavformat.pc
 libdata/pkgconfig/libavresample.pc
 libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libswscale.pc
+man/man1/avconv.1.gz
+man/man1/avprobe.1.gz
 %%DATADIR%%/libvpx-1080p.avpreset
 %%DATADIR%%/libvpx-1080p50_60.avpreset
 %%DATADIR%%/libvpx-360p.avpreset