Add perl to build tools. Fixes SunOS build and also enables man pages

and html docs. Bump PKGREVISION.

5 files changed, 91 insertions, 7 deletions

diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index e48abb329c6..276b6496f37 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2016/03/11 15:42:59 fhajny Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=	1
+PKGREVISION=	2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v3.x)
diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common
index ca967acaa96..b19c2b884d8 100644
--- a/multimedia/ffmpeg3/Makefile.common
+++ b/multimedia/ffmpeg3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/03/11 15:42:59 fhajny Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -13,7 +13,7 @@ PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg3/patches
 
 USE_LANGUAGES=		c99
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake texi2html pod2man
+USE_TOOLS+=		gmake texi2html pod2man perl
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC:Q}
 CONFIGURE_ARGS+=	--disable-debug
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 CONFIGURE_ARGS+=	--progs-suffix=3
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/ffmpeg3
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/ffmpeg3
 CONFIGURE_ARGS+=	--incdir=${PREFIX}/include/ffmpeg3
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/ffmpeg3
 CONFIGURE_ARGS+=	--shlibdir=${PREFIX}/lib/ffmpeg3
diff --git a/multimedia/ffmpeg3/PLIST b/multimedia/ffmpeg3/PLIST
index 50a098ccd8c..50322a7261f 100644
--- a/multimedia/ffmpeg3/PLIST
+++ b/multimedia/ffmpeg3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/08 14:33:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/11 15:42:59 fhajny Exp $
 bin/ffmpeg3
 bin/ffprobe3
 bin/ffserver3
@@ -72,7 +72,7 @@ include/ffmpeg3/libavutil/md5.h
 include/ffmpeg3/libavutil/mem.h
 include/ffmpeg3/libavutil/motion_vector.h
 include/ffmpeg3/libavutil/murmur3.h
-${PLIST.opencl}include/ffmpeg2/libavutil/opencl.h
+${PLIST.opencl}include/ffmpeg3/libavutil/opencl.h
 include/ffmpeg3/libavutil/opt.h
 include/ffmpeg3/libavutil/parseutils.h
 include/ffmpeg3/libavutil/pixdesc.h
@@ -142,14 +142,65 @@ lib/ffmpeg3/pkgconfig/libavutil.pc
 lib/ffmpeg3/pkgconfig/libpostproc.pc
 lib/ffmpeg3/pkgconfig/libswresample.pc
 lib/ffmpeg3/pkgconfig/libswscale.pc
+man/man1/ffmpeg-all3.1
+man/man1/ffmpeg-bitstream-filters3.1
+man/man1/ffmpeg-codecs3.1
+man/man1/ffmpeg-devices3.1
+man/man1/ffmpeg-filters3.1
+man/man1/ffmpeg-formats3.1
+man/man1/ffmpeg-protocols3.1
+man/man1/ffmpeg-resampler3.1
+man/man1/ffmpeg-scaler3.1
+man/man1/ffmpeg-utils3.1
+man/man1/ffmpeg3.1
+man/man1/ffprobe-all3.1
+man/man1/ffprobe3.1
+man/man1/ffserver-all3.1
+man/man1/ffserver3.1
+man/man3/libavcodec3.3
+man/man3/libavdevice3.3
+man/man3/libavfilter3.3
+man/man3/libavformat3.3
+man/man3/libavutil3.3
+man/man3/libswresample3.3
+man/man3/libswscale3.3
 share/doc/ffmpeg3/build_system.txt
+share/doc/ffmpeg3/developer.html
 share/doc/ffmpeg3/errno.txt
+share/doc/ffmpeg3/faq.html
+share/doc/ffmpeg3/fate.html
+share/doc/ffmpeg3/ffmpeg-all.html
+share/doc/ffmpeg3/ffmpeg-bitstream-filters.html
+share/doc/ffmpeg3/ffmpeg-codecs.html
+share/doc/ffmpeg3/ffmpeg-devices.html
+share/doc/ffmpeg3/ffmpeg-filters.html
+share/doc/ffmpeg3/ffmpeg-formats.html
+share/doc/ffmpeg3/ffmpeg-protocols.html
+share/doc/ffmpeg3/ffmpeg-resampler.html
+share/doc/ffmpeg3/ffmpeg-scaler.html
+share/doc/ffmpeg3/ffmpeg-utils.html
+share/doc/ffmpeg3/ffmpeg.html
 share/doc/ffmpeg3/ffmpeg.txt
+share/doc/ffmpeg3/ffprobe-all.html
+share/doc/ffmpeg3/ffprobe.html
+share/doc/ffmpeg3/ffserver-all.html
+share/doc/ffmpeg3/ffserver.html
 share/doc/ffmpeg3/filter_design.txt
+share/doc/ffmpeg3/general.html
+share/doc/ffmpeg3/git-howto.html
 share/doc/ffmpeg3/issue_tracker.txt
+share/doc/ffmpeg3/libavcodec.html
+share/doc/ffmpeg3/libavdevice.html
+share/doc/ffmpeg3/libavfilter.html
+share/doc/ffmpeg3/libavformat.html
+share/doc/ffmpeg3/libavutil.html
+share/doc/ffmpeg3/libswresample.html
+share/doc/ffmpeg3/libswscale.html
 share/doc/ffmpeg3/mips.txt
 share/doc/ffmpeg3/multithreading.txt
+share/doc/ffmpeg3/nut.html
 share/doc/ffmpeg3/optimization.txt
+share/doc/ffmpeg3/platform.html
 share/doc/ffmpeg3/rate_distortion.txt
 share/doc/ffmpeg3/snow.txt
 share/doc/ffmpeg3/swresample.txt
diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo
index af865c1f366..6a1b13f9754 100644
--- a/multimedia/ffmpeg3/distinfo
+++ b/multimedia/ffmpeg3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2016/03/11 15:42:59 fhajny Exp $
 
 SHA1 (ffmpeg-3.0.tar.xz) = 383c8d3758aea027f1452fa98ae9016a28f74d8f
 RMD160 (ffmpeg-3.0.tar.xz) = 542a711c39cb7270abd2835654f0abb565b0ba41
@@ -6,6 +6,7 @@ SHA512 (ffmpeg-3.0.tar.xz) = f3d9ff422112d24509d4cc73aa7b79fb858e8454fa44aa3d05c
 Size (ffmpeg-3.0.tar.xz) = 7463604 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
 SHA1 (patch-configure) = e57e2501e63a05e9eeefc688e311a16729d1a711
+SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
 SHA1 (patch-libavutil_opencl.c) = 3366c6c2aa7daaf097298214d2fff7c60c645ca4
 SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
diff --git a/multimedia/ffmpeg3/patches/patch-doc_Makefile b/multimedia/ffmpeg3/patches/patch-doc_Makefile
new file mode 100644
index 00000000000..af7e4ea2fcd
--- /dev/null
+++ b/multimedia/ffmpeg3/patches/patch-doc_Makefile
@@ -0,0 +1,31 @@
+$NetBSD: patch-doc_Makefile,v 1.1 2016/03/11 15:42:59 fhajny Exp $
+
+Make man pages and html docs versioned.
+
+--- doc/Makefile.orig	2016-02-15 02:29:37.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/%3.1)    $(AVPROGS-yes:%=doc/%-all3.1)    $(COMPONENTS-yes:%=doc/%3.1)
++MANPAGES3   = $(LIBRARIES-yes:%=doc/%3.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/%3.1 doc/%3.3: TAG = MAN
++doc/%3.1: doc/%.pod $(GENTEXI)
+ 	$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
+-doc/%.3: doc/%.pod $(GENTEXI)
++doc/%3.3: doc/%.pod $(GENTEXI)
+ 	$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
+ 
+ $(DOCS) doc/doxy/html: | doc/