Fix incorrect ffplay in pkg-plist [1]

Adjust program and library suffixes and pkg-config files

Reported by:	Juergen Lock and Jimmy Olgeny [1]

11 files changed, 263 insertions, 127 deletions

diff --git a/multimedia/ffmpeg-011/Makefile b/multimedia/ffmpeg-011/Makefile
index 4624f445dde7..e4868ff08973 100644
--- a/multimedia/ffmpeg-011/Makefile
+++ b/multimedia/ffmpeg-011/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	-011
@@ -52,15 +53,11 @@ OPENAL_DESC=	OpenAL 1.1 capture support
 X11GRAB_DESC=	Enable x11 grabbing
 
 FFPROGS=	ffmpeg ffprobe
-FFLIBS=		libavcodec libavdevice libavfilter libavformat \
-		libavutil libpostproc libswresample libswscale
-INSTALL_TARGET=	install-data install-libs install-headers
+INSTALL_TARGET=	install-progs install-data install-libs install-headers
 FFMPEG_SUFFIX=	-011
 PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
 MAN1=		ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1
 
-SHLIB_VER=	11
-PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
 
 .include <bsd.port.options.mk>
@@ -90,6 +87,8 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--datadir="${DATADIR}" \
+		--build-suffix="${FFMPEG_SUFFIX}" \
+		--progs-suffix="${FFMPEG_SUFFIX}" \
 		--enable-shared \
 		--enable-gpl \
 		--enable-postproc \
@@ -345,7 +344,7 @@ CONFIGURE_ARGS+=	--disable-libschroedinger
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX}
 FFPROGS+=	ffplay
 MAN1+=	ffplay${FFMPEG_SUFFIX}.1
 .if ${PORT_OPTIONS:MDOCS}
@@ -463,7 +462,7 @@ post-patch:
 		s|-pthread|${PTHREAD_LIBS}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
+	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
@@ -484,18 +483,7 @@ post-configure:
 		${WRKSRC}/config.mak
 .endif
 
-pre-install:
-.for PROG in ${FFPROGS}
-	@${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/bin/${PROG}${FFMPEG_SUFFIX}
-.endfor
-
 post-install:
-.for LIB in ${FFLIBS}
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_DATA} ${WRKSRC}/${LIB}/${LIB}.pc \
-		${PREFIX}/libdata/pkgconfig/${LIB}${FFMPEG_SUFFIX}.pc
-.endfor
 .for PROG in ${FFPROGS}
 	@${MKDIR} ${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/${PROG}.1 ${MAN1PREFIX}/man/man1/${PROG}${FFMPEG_SUFFIX}.1
diff --git a/multimedia/ffmpeg-011/files/patch-configure b/multimedia/ffmpeg-011/files/patch-configure
index e9a8840db7c0..3db7944a6228 100644
--- a/multimedia/ffmpeg-011/files/patch-configure
+++ b/multimedia/ffmpeg-011/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-01-22 14:41:15.000000000 +0100
-+++ configure	2012-01-22 16:05:39.961156595 +0100
-@@ -1806,7 +1806,7 @@
+--- configure.orig	2012-06-07 23:01:19.000000000 +0200
++++ configure	2012-08-12 09:42:57.454507301 +0200
+@@ -1860,7 +1860,7 @@
  nogas=":"
  
  # machine
@@ -9,7 +9,7 @@
  cpu="generic"
  
  # OS
-@@ -3176,10 +3176,10 @@
+@@ -3286,10 +3286,10 @@
  texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
  
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -3517,7 +3517,7 @@
+@@ -3659,7 +3659,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,3 +33,63 @@
  CC=$cc
  CXX=$cxx
  AS=$as
+@@ -3839,13 +3839,13 @@
+ requires=$5
+ enabled ${name#lib} || return 0
+ mkdir -p $name
+-cat <<EOF > $name/$name.pc
++cat <<EOF > $name/${name}${build_suffix}.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+ libdir=$libdir
+ includedir=$incdir
+ 
+-Name: $name
++Name: ${name}${build_suffix}
+ Description: $comment
+ Version: $version
+ Requires: $(enabled shared || echo $requires)
+@@ -3855,7 +3855,7 @@
+ Libs.private: $(enabled shared && echo $libs)
+ Cflags: -I\${includedir}
+ EOF
+-cat <<EOF > $name/$name-uninstalled.pc
++cat <<EOF > $name/${name}${build_suffix}-uninstalled.pc
+ prefix=
+ exec_prefix=
+ libdir=\${pcfiledir}
+@@ -3872,22 +3872,22 @@
+ }
+ 
+ libavfilter_pc_deps=""
+-enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
+-enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
+-enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
+-enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
+-enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
++enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
++enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
++enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
++enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
++enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
+ libavfilter_pc_deps=${libavfilter_pc_deps%, }
+ 
+-libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
+-enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
++libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
++enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
+ 
+ pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
+-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
++pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
+ pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
+-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
+ pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
+-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
diff --git a/multimedia/ffmpeg-011/files/patch-doc-Makefile b/multimedia/ffmpeg-011/files/patch-doc-Makefile
new file mode 100644
index 000000000000..4a27a9b467e0
--- /dev/null
+++ b/multimedia/ffmpeg-011/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2012-08-12 09:52:01.464511585 +0200
++++ doc/Makefile	2012-08-12 09:52:10.248048618 +0200
+@@ -54,7 +54,7 @@
+ 
+ $(DOCS): | doc/
+ 
+-install-progs-$(CONFIG_DOC): install-man
++#install-progs-$(CONFIG_DOC): install-man
+ 
+ install-man: $(MANPAGES)
+ 	$(Q)mkdir -p "$(MANDIR)/man1"
diff --git a/multimedia/ffmpeg-011/files/patch-library.mak b/multimedia/ffmpeg-011/files/patch-library.mak
index 9c535566f90f..ec9b270751a2 100644
--- a/multimedia/ffmpeg-011/files/patch-library.mak
+++ b/multimedia/ffmpeg-011/files/patch-library.mak
@@ -1,14 +1,24 @@
---- library.mak.orig	2012-08-06 10:08:41.247506447 +0200
-+++ library.mak	2012-08-06 10:09:53.263505539 +0200
-@@ -76,8 +76,8 @@
+--- library.mak.orig	2012-05-25 20:02:16.000000000 +0200
++++ library.mak	2012-08-12 09:31:55.551526509 +0200
+@@ -74,9 +74,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
- install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
 -	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
 -	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
-+#	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
-+#	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
++install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc
++	$(Q)mkdir -p "$(prefix)/libdata/pkgconfig"
++	$$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"
  
  uninstall-libs::
  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+@@ -88,7 +88,7 @@
+ 
+ uninstall-headers::
+ 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS))
+-	$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
++	$(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
+ 	-rmdir "$(INCINSTDIR)"
+ endef
+ 
diff --git a/multimedia/ffmpeg-011/pkg-plist b/multimedia/ffmpeg-011/pkg-plist
index ce0ee7673121..b65c8bd7c194 100644
--- a/multimedia/ffmpeg-011/pkg-plist
+++ b/multimedia/ffmpeg-011/pkg-plist
@@ -67,38 +67,38 @@ include/ffmpeg%%SUFF%%/libavutil/timestamp.h
 include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
 include/ffmpeg%%SUFF%%/libswresample/swresample.h
 include/ffmpeg%%SUFF%%/libswscale/swscale.h
-lib/ffmpeg%%SUFF%%/libavcodec.a
-lib/ffmpeg%%SUFF%%/libavcodec.so
-lib/ffmpeg%%SUFF%%/libavcodec.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavcodec.so.54.23.100
-lib/ffmpeg%%SUFF%%/libavdevice.a
-lib/ffmpeg%%SUFF%%/libavdevice.so
-lib/ffmpeg%%SUFF%%/libavdevice.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavdevice.so.54.0.100
-lib/ffmpeg%%SUFF%%/libavfilter.a
-lib/ffmpeg%%SUFF%%/libavfilter.so
-lib/ffmpeg%%SUFF%%/libavfilter.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavfilter.so.2.77.100
-lib/ffmpeg%%SUFF%%/libavformat.a
-lib/ffmpeg%%SUFF%%/libavformat.so
-lib/ffmpeg%%SUFF%%/libavformat.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavformat.so.54.6.100
-lib/ffmpeg%%SUFF%%/libavutil.a
-lib/ffmpeg%%SUFF%%/libavutil.so
-lib/ffmpeg%%SUFF%%/libavutil.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavutil.so.51.54.100
-lib/ffmpeg%%SUFF%%/libpostproc.a
-lib/ffmpeg%%SUFF%%/libpostproc.so
-lib/ffmpeg%%SUFF%%/libpostproc.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libpostproc.so.52.0.100
-lib/ffmpeg%%SUFF%%/libswresample.a
-lib/ffmpeg%%SUFF%%/libswresample.so
-lib/ffmpeg%%SUFF%%/libswresample.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libswresample.so.0.15.100
-lib/ffmpeg%%SUFF%%/libswscale.a
-lib/ffmpeg%%SUFF%%/libswscale.so
-lib/ffmpeg%%SUFF%%/libswscale.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libswscale.so.2.1.100
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.23.100
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.0.100
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.2
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.2.77.100
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.6.100
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.54.100
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.100
 libdata/pkgconfig/libavcodec%%SUFF%%.pc
 libdata/pkgconfig/libavdevice%%SUFF%%.pc
 libdata/pkgconfig/libavfilter%%SUFF%%.pc
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 3fbd31fcf404..8b08ac9636a2 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -25,9 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
 		texi2html:${PORTSDIR}/textproc/texi2html
 
-CONFLICTS=	ffmpeg-0.7*
-
-LATEST_LINK=	ffmpeg-devel
+LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
 GIT_SNAPSHOT=	388243bb27f3d9b8f50d54268a784d55a7171f10
 GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
@@ -62,16 +60,13 @@ OPENAL_DESC=	OpenAL 1.1 capture support
 X11GRAB_DESC=	Enable x11 grabbing
 
 FFPROGS=	ffmpeg ffprobe
-FFLIBS=		libavcodec libavdevice libavfilter libavformat \
-		libavutil libpostproc libswresample libswscale
-INSTALL_TARGET=	install-data install-libs install-headers
-FFMPEG_SUFFIX=	-head
+INSTALL_TARGET=	install-progs install-data install-libs install-headers
+FFMPEG_SUFFIX=	-devel
 PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
 MAN1=		ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1
 
-SHLIB_VER=	99
-PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.options.mk>
 
@@ -100,6 +95,8 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--datadir="${DATADIR}" \
+		--build-suffix="${FFMPEG_SUFFIX}" \
+		--progs-suffix="${FFMPEG_SUFFIX}" \
 		--enable-shared \
 		--enable-gpl \
 		--enable-postproc \
@@ -364,7 +361,7 @@ CONFIGURE_ARGS+=	--disable-libschroedinger
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX}
 FFPROGS+=	ffplay
 MAN1+=	ffplay${FFMPEG_SUFFIX}.1
 .if ${PORT_OPTIONS:MDOCS}
@@ -487,7 +484,7 @@ post-patch:
 		s|-pthread|${PTHREAD_LIBS}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
+	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
@@ -508,18 +505,7 @@ post-configure:
 		${WRKSRC}/config.mak
 .endif
 
-pre-install:
-.for PROG in ${FFPROGS}
-	@${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/bin/${PROG}${FFMPEG_SUFFIX}
-.endfor
-
 post-install:
-.for LIB in ${FFLIBS}
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_DATA} ${WRKSRC}/${LIB}/${LIB}.pc \
-		${PREFIX}/libdata/pkgconfig/${LIB}${FFMPEG_SUFFIX}.pc
-.endfor
 .for PROG in ${FFPROGS}
 	@${MKDIR} ${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/${PROG}.1 ${MAN1PREFIX}/man/man1/${PROG}${FFMPEG_SUFFIX}.1
diff --git a/multimedia/ffmpeg-devel/files/ffserver-head.in b/multimedia/ffmpeg-devel/files/ffserver-devel.in
index 53fa2e0c6ce8..53fa2e0c6ce8 100644
--- a/multimedia/ffmpeg-devel/files/ffserver-head.in
+++ b/multimedia/ffmpeg-devel/files/ffserver-devel.in
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index e9a8840db7c0..44b605473dff 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-01-22 14:41:15.000000000 +0100
-+++ configure	2012-01-22 16:05:39.961156595 +0100
-@@ -1806,7 +1806,7 @@
+--- configure.orig	2012-08-06 10:06:26.000000000 +0200
++++ configure	2012-08-12 09:48:55.838509614 +0200
+@@ -1924,7 +1924,7 @@
  nogas=":"
  
  # machine
@@ -9,9 +9,9 @@
  cpu="generic"
  
  # OS
-@@ -3176,10 +3176,10 @@
- texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+@@ -3506,10 +3506,10 @@
  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
+ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
  
 -check_header linux/fb.h
 -check_header linux/videodev.h
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -3517,7 +3517,7 @@
+@@ -3897,7 +3897,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,3 +33,63 @@
  CC=$cc
  CXX=$cxx
  AS=$as
+@@ -4093,13 +4093,13 @@
+ requires=$5
+ enabled ${name#lib} || return 0
+ mkdir -p $name
+-cat <<EOF > $name/$name.pc
++cat <<EOF > $name/${name}${build_suffix}.pc
+ prefix=$prefix
+ exec_prefix=\${prefix}
+ libdir=$libdir
+ includedir=$incdir
+ 
+-Name: $name
++Name: ${name}${build_suffix}
+ Description: $comment
+ Version: $version
+ Requires: $(enabled shared || echo $requires)
+@@ -4113,7 +4113,7 @@
+ mkdir -p doc/examples/pc-uninstalled
+ includedir=${source_path}
+ [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
+-cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
+ prefix=
+ exec_prefix=
+ libdir=\${pcfiledir}/../../../$name
+@@ -4130,22 +4130,22 @@
+ }
+ 
+ libavfilter_pc_deps=""
+-enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION,"
+-enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION,"
+-enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION,"
+-enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION,"
+-enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION,"
++enabled libavfilter_deps_avcodec    && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION,"
++enabled libavfilter_deps_avformat   && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION,"
++enabled libavfilter_deps_swscale    && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION,"
++enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION,"
++enabled libavfilter_deps_postproc   && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION,"
+ libavfilter_pc_deps=${libavfilter_pc_deps%, }
+ 
+-libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION"
+-enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION,"
++libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
++enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"
+ 
+ pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
+-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
++pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION"
+ pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps"
+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps"
+-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
+ pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs"
+-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+-pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
++pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION"
diff --git a/multimedia/ffmpeg-devel/files/patch-doc-Makefile b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
new file mode 100644
index 000000000000..c3dc3fd3dad3
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2012-08-06 10:06:26.000000000 +0200
++++ doc/Makefile	2012-08-12 09:53:14.566506176 +0200
+@@ -54,7 +54,7 @@
+ install-man:
+ 
+ ifdef HAVE_POD2MAN
+-install-progs-$(CONFIG_DOC): install-man
++#install-progs-$(CONFIG_DOC): install-man
+ 
+ install-man: $(MANPAGES)
+ 	$(Q)mkdir -p "$(MANDIR)/man1"
diff --git a/multimedia/ffmpeg-devel/files/patch-library.mak b/multimedia/ffmpeg-devel/files/patch-library.mak
index 9c535566f90f..ec9b270751a2 100644
--- a/multimedia/ffmpeg-devel/files/patch-library.mak
+++ b/multimedia/ffmpeg-devel/files/patch-library.mak
@@ -1,14 +1,24 @@
---- library.mak.orig	2012-08-06 10:08:41.247506447 +0200
-+++ library.mak	2012-08-06 10:09:53.263505539 +0200
-@@ -76,8 +76,8 @@
+--- library.mak.orig	2012-05-25 20:02:16.000000000 +0200
++++ library.mak	2012-08-12 09:31:55.551526509 +0200
+@@ -74,9 +74,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
- install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
 -	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
 -	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
-+#	$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
-+#	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
++install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc
++	$(Q)mkdir -p "$(prefix)/libdata/pkgconfig"
++	$$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig"
  
  uninstall-libs::
  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+@@ -88,7 +88,7 @@
+ 
+ uninstall-headers::
+ 	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS))
+-	$(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
++	$(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc"
+ 	-rmdir "$(INCINSTDIR)"
+ endef
+ 
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 2f9fff287af8..7a85f4ea55d2 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -72,38 +72,38 @@ include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
 include/ffmpeg%%SUFF%%/libswresample/swresample.h
 include/ffmpeg%%SUFF%%/libswscale/swscale.h
 include/ffmpeg%%SUFF%%/libswscale/version.h
-lib/ffmpeg%%SUFF%%/libavcodec.a
-lib/ffmpeg%%SUFF%%/libavcodec.so
-lib/ffmpeg%%SUFF%%/libavcodec.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavcodec.so.54.49.100
-lib/ffmpeg%%SUFF%%/libavdevice.a
-lib/ffmpeg%%SUFF%%/libavdevice.so
-lib/ffmpeg%%SUFF%%/libavdevice.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavdevice.so.54.2.100
-lib/ffmpeg%%SUFF%%/libavfilter.a
-lib/ffmpeg%%SUFF%%/libavfilter.so
-lib/ffmpeg%%SUFF%%/libavfilter.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavfilter.so.3.5.102
-lib/ffmpeg%%SUFF%%/libavformat.a
-lib/ffmpeg%%SUFF%%/libavformat.so
-lib/ffmpeg%%SUFF%%/libavformat.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavformat.so.54.22.101
-lib/ffmpeg%%SUFF%%/libavutil.a
-lib/ffmpeg%%SUFF%%/libavutil.so
-lib/ffmpeg%%SUFF%%/libavutil.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavutil.so.51.66.101
-lib/ffmpeg%%SUFF%%/libpostproc.a
-lib/ffmpeg%%SUFF%%/libpostproc.so
-lib/ffmpeg%%SUFF%%/libpostproc.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libpostproc.so.52.0.100
-lib/ffmpeg%%SUFF%%/libswresample.a
-lib/ffmpeg%%SUFF%%/libswresample.so
-lib/ffmpeg%%SUFF%%/libswresample.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libswresample.so.0.15.100
-lib/ffmpeg%%SUFF%%/libswscale.a
-lib/ffmpeg%%SUFF%%/libswscale.so
-lib/ffmpeg%%SUFF%%/libswscale.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libswscale.so.2.1.101
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.49.100
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.100
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.5.102
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.22.101
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.66.101
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
+lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101
 libdata/pkgconfig/libavcodec%%SUFF%%.pc
 libdata/pkgconfig/libavdevice%%SUFF%%.pc
 libdata/pkgconfig/libavfilter%%SUFF%%.pc