Also install man pages and HTML documentation.

Prior to this change all USE_TOOLS were already present except "perl". That
blocked the generation of both man pages and HTML documentation.
Also handle the append of configure's --progs-suffix number to address
coexistence of multiple ffmpeg versions man pages (done via patch-doc_Makefile).

Bump PKGREVISION.

5 files changed, 90 insertions, 6 deletions

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index c00c59479b1..83a29087264 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2016/03/30 12:46:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2016/04/28 09:20:53 leot Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=	2
+PKGREVISION=	3
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v2.x)
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 8106814e6ad..c2fa6a1b56b 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2016/03/30 12:46:38 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.46 2016/04/28 09:20:53 leot Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -14,7 +14,7 @@ PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg2/patches
 
 USE_LANGUAGES=		c99
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake texi2html pod2man
+USE_TOOLS+=		gmake texi2html perl pod2man
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC:Q}
 CONFIGURE_ARGS+=	--disable-debug
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 CONFIGURE_ARGS+=	--progs-suffix=2
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/ffmpeg2
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/ffmpeg2
 CONFIGURE_ARGS+=	--incdir=${PREFIX}/include/ffmpeg2
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/ffmpeg2
 CONFIGURE_ARGS+=	--shlibdir=${PREFIX}/lib/ffmpeg2
diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST
index c14805771b3..964d303c386 100644
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/09/09 10:42:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2016/04/28 09:20:53 leot Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
@@ -140,14 +140,65 @@ lib/ffmpeg2/pkgconfig/libavutil.pc
 lib/ffmpeg2/pkgconfig/libpostproc.pc
 lib/ffmpeg2/pkgconfig/libswresample.pc
 lib/ffmpeg2/pkgconfig/libswscale.pc
+man/man1/ffmpeg-all2.1
+man/man1/ffmpeg-bitstream-filters2.1
+man/man1/ffmpeg-codecs2.1
+man/man1/ffmpeg-devices2.1
+man/man1/ffmpeg-filters2.1
+man/man1/ffmpeg-formats2.1
+man/man1/ffmpeg-protocols2.1
+man/man1/ffmpeg-resampler2.1
+man/man1/ffmpeg-scaler2.1
+man/man1/ffmpeg-utils2.1
+man/man1/ffmpeg2.1
+man/man1/ffprobe-all2.1
+man/man1/ffprobe2.1
+man/man1/ffserver-all2.1
+man/man1/ffserver2.1
+man/man3/libavcodec2.3
+man/man3/libavdevice2.3
+man/man3/libavfilter2.3
+man/man3/libavformat2.3
+man/man3/libavutil2.3
+man/man3/libswresample2.3
+man/man3/libswscale2.3
 share/doc/ffmpeg2/build_system.txt
+share/doc/ffmpeg2/developer.html
 share/doc/ffmpeg2/errno.txt
+share/doc/ffmpeg2/faq.html
+share/doc/ffmpeg2/fate.html
+share/doc/ffmpeg2/ffmpeg-all.html
+share/doc/ffmpeg2/ffmpeg-bitstream-filters.html
+share/doc/ffmpeg2/ffmpeg-codecs.html
+share/doc/ffmpeg2/ffmpeg-devices.html
+share/doc/ffmpeg2/ffmpeg-filters.html
+share/doc/ffmpeg2/ffmpeg-formats.html
+share/doc/ffmpeg2/ffmpeg-protocols.html
+share/doc/ffmpeg2/ffmpeg-resampler.html
+share/doc/ffmpeg2/ffmpeg-scaler.html
+share/doc/ffmpeg2/ffmpeg-utils.html
+share/doc/ffmpeg2/ffmpeg.html
 share/doc/ffmpeg2/ffmpeg.txt
+share/doc/ffmpeg2/ffprobe-all.html
+share/doc/ffmpeg2/ffprobe.html
+share/doc/ffmpeg2/ffserver-all.html
+share/doc/ffmpeg2/ffserver.html
 share/doc/ffmpeg2/filter_design.txt
+share/doc/ffmpeg2/general.html
+share/doc/ffmpeg2/git-howto.html
 share/doc/ffmpeg2/issue_tracker.txt
+share/doc/ffmpeg2/libavcodec.html
+share/doc/ffmpeg2/libavdevice.html
+share/doc/ffmpeg2/libavfilter.html
+share/doc/ffmpeg2/libavformat.html
+share/doc/ffmpeg2/libavutil.html
+share/doc/ffmpeg2/libswresample.html
+share/doc/ffmpeg2/libswscale.html
 share/doc/ffmpeg2/mips.txt
 share/doc/ffmpeg2/multithreading.txt
+share/doc/ffmpeg2/nut.html
 share/doc/ffmpeg2/optimization.txt
+share/doc/ffmpeg2/platform.html
 share/doc/ffmpeg2/rate_distortion.txt
 share/doc/ffmpeg2/snow.txt
 share/doc/ffmpeg2/swresample.txt
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 395bef7e5c4..b2bffde9fd2 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2016/02/03 21:00:00 adam Exp $
+$NetBSD: distinfo,v 1.47 2016/04/28 09:20:53 leot Exp $
 
 SHA1 (ffmpeg-2.8.6.tar.xz) = 5720c4204ed0b72513fa2fd6e4dcaed6ebb7f35c
 RMD160 (ffmpeg-2.8.6.tar.xz) = fea9b87575330707e6a871425fc62731779ef65d
@@ -6,6 +6,7 @@ SHA512 (ffmpeg-2.8.6.tar.xz) = 15fc0c05963a69664713f1fb40a34bb85efc6477cd655e76b
 Size (ffmpeg-2.8.6.tar.xz) = 7205300 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
 SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1
+SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
 SHA1 (patch-libavutil_opencl.c) = 00ea04f9febe60b9428ac8c3b7e14ae01a955685
diff --git a/multimedia/ffmpeg2/patches/patch-doc_Makefile b/multimedia/ffmpeg2/patches/patch-doc_Makefile
new file mode 100644
index 00000000000..93aa8d4c8c6
--- /dev/null
+++ b/multimedia/ffmpeg2/patches/patch-doc_Makefile
@@ -0,0 +1,31 @@
+$NetBSD: patch-doc_Makefile,v 1.1 2016/04/28 09:20:53 leot Exp $
+
+Honor --prog-suffix configure option also for man pages.
+
+--- doc/Makefile.orig	2016-02-01 00:52:15.000000000 +0000
++++ doc/Makefile
+@@ -14,8 +14,8 @@ COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpe
+ COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
+ COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
+ 
+-MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
+-MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
++MANPAGES1   = $(AVPROGS-yes:%=doc/%$(PROGSSUF).1)    $(AVPROGS-yes:%=doc/%-all$(PROGSSUF).1)    $(COMPONENTS-yes:%=doc/%$(PROGSSUF).1)
++MANPAGES3   = $(LIBRARIES-yes:%=doc/%$(PROGSSUF).3)
+ MANPAGES    = $(MANPAGES1) $(MANPAGES3)
+ PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
+ HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
+@@ -114,10 +114,10 @@ doc/%-all.pod: doc/%.texi $(SRC_PATH)/do
+ 	$(Q)$(TEXIDEP)
+ 	$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
+ 
+-doc/%.1 doc/%.3: TAG = MAN
+-doc/%.1: doc/%.pod $(GENTEXI)
++doc/%$(PROGSSUF).1 doc/%$(PROGSSUF).3: TAG = MAN
++doc/%$(PROGSSUF).1: doc/%.pod $(GENTEXI)
+ 	$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
+-doc/%.3: doc/%.pod $(GENTEXI)
++doc/%$(PROGSSUF).3: doc/%.pod $(GENTEXI)
+ 	$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
+ 
+ $(DOCS) doc/doxy/html: | doc/