--- multimedia/ffmpeg/Makefile	(revision 398374)
+++ multimedia/ffmpeg/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -268,8 +272,8 @@ LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
 NONFREE_CONFIGURE_ENABLE=nonfree
 NONFREE_VARS=		RESTRICTED="linking to libfaac or libaacplus restricts redistribution"
 
-FFPROGS=	ffmpeg ffprobe
-INSTALL_TARGET=	install-progs install-data install-libs install-headers
+INSTALL_TARGET=	install-progs install-doc install-data \
+		install-libs install-headers
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
@@ -316,25 +321,14 @@ DOC_DOCFILES=	APIchanges *.txt
 PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+=	*.html
 BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
+.else
+CONFIGURE_ARGS+=--disable-htmlpages
 .endif
 
-# ffserver
-.if ${PORT_OPTIONS:MFFSERVER}
-FFPROGS+=	ffserver
-.if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+=	ffserver.html
-.endif
-.endif
-
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-FFPROGS+=	ffplay
-.if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+=	ffplay.html
-.endif
 .else
 CONFIGURE_ARGS+=	--disable-ffplay --disable-outdev=sdl
 .endif
@@ -369,10 +363,6 @@ post-configure-THEORA-off:
 		${WRKSRC}/config.mak
 
 post-install:
-.for PROG in ${FFPROGS}
-	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/${PROG}*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-.endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
--- multimedia/ffmpeg/pkg-plist	(revision 398374)
+++ multimedia/ffmpeg/pkg-plist	(working copy)
@@ -164,6 +164,13 @@ man/man1/ffprobe-all.1.gz
 man/man1/ffprobe.1.gz
 %%FFSERVER%%man/man1/ffserver-all.1.gz
 %%FFSERVER%%man/man1/ffserver.1.gz
+man/man3/libavcodec.3.gz
+man/man3/libavdevice.3.gz
+man/man3/libavfilter.3.gz
+man/man3/libavformat.3.gz
+man/man3/libavutil.3.gz
+man/man3/libswresample.3.gz
+man/man3/libswscale.3.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/README
 %%DATADIR%%/examples/avio_dir_cmd.c