Add a new "doc" option to install multimedia/ffmpeg[23] HTML documentation,

disabled by default.

Fix PR pkg/51113 reported by Joern Clausen.
ffmpeg needs texi2html features that can be not available in the version
provided natively by the platform.

While here also add a PRINT_PLIST_AWK to automa{g,t}ically print a PLIST that
need less manual intervention.

Bump PKGREVISION.

8 files changed, 100 insertions, 70 deletions

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index 1ec26792d60..33ca7906a0a 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2016/04/29 19:18:36 adam Exp $
+# $NetBSD: Makefile,v 1.29 2016/05/05 07:03:47 leot Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v2.x)
@@ -25,6 +26,9 @@ CONFIGURE_ARGS+=	--host-ld=${NATIVE_CC:Q}
 CONFIGURE_ARGS+=	--target-os=${LOWER_OPSYS}
 .endif
 
+PRINT_PLIST_AWK+=	/html/ { $$0 = "$${PLIST.doc}" $$0 }
+PRINT_PLIST_AWK+=	/opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
+
 TEST_TARGET=	check
 
 post-install:
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 697b1b6c275..2574a0d3f4c 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2016/04/29 19:18:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.48 2016/05/05 07:03:47 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 perl pod2man
+USE_TOOLS+=		gmake perl pod2man
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC:Q}
 CONFIGURE_ARGS+=	--disable-debug
diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST
index 964d303c386..0c77894a17c 100644
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/04/28 09:20:53 leot Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/05/05 07:03:47 leot Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
@@ -163,42 +163,42 @@ man/man3/libavutil2.3
 man/man3/libswresample2.3
 man/man3/libswscale2.3
 share/doc/ffmpeg2/build_system.txt
-share/doc/ffmpeg2/developer.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg2/faq.html
+${PLIST.doc}share/doc/ffmpeg2/fate.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-all.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-bitstream-filters.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-codecs.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-devices.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-filters.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-formats.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-protocols.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-resampler.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-scaler.html
+${PLIST.doc}share/doc/ffmpeg2/ffmpeg-utils.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg2/ffprobe-all.html
+${PLIST.doc}share/doc/ffmpeg2/ffprobe.html
+${PLIST.doc}share/doc/ffmpeg2/ffserver-all.html
+${PLIST.doc}share/doc/ffmpeg2/ffserver.html
 share/doc/ffmpeg2/filter_design.txt
-share/doc/ffmpeg2/general.html
-share/doc/ffmpeg2/git-howto.html
+${PLIST.doc}share/doc/ffmpeg2/general.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg2/libavcodec.html
+${PLIST.doc}share/doc/ffmpeg2/libavdevice.html
+${PLIST.doc}share/doc/ffmpeg2/libavfilter.html
+${PLIST.doc}share/doc/ffmpeg2/libavformat.html
+${PLIST.doc}share/doc/ffmpeg2/libavutil.html
+${PLIST.doc}share/doc/ffmpeg2/libswresample.html
+${PLIST.doc}share/doc/ffmpeg2/libswscale.html
 share/doc/ffmpeg2/mips.txt
 share/doc/ffmpeg2/multithreading.txt
-share/doc/ffmpeg2/nut.html
+${PLIST.doc}share/doc/ffmpeg2/nut.html
 share/doc/ffmpeg2/optimization.txt
-share/doc/ffmpeg2/platform.html
+${PLIST.doc}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/options.mk b/multimedia/ffmpeg2/options.mk
index 82362f39092..930600d8e30 100644
--- a/multimedia/ffmpeg2/options.mk
+++ b/multimedia/ffmpeg2/options.mk
@@ -1,14 +1,16 @@
-# $NetBSD: options.mk,v 1.10 2016/01/03 11:35:21 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2016/05/05 07:03:47 leot Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg2
-PKG_SUPPORTED_OPTIONS=	ass faac fdk-aac fontconfig freetype gnutls lame \
+PKG_SUPPORTED_OPTIONS=	ass doc faac fdk-aac fontconfig freetype gnutls lame \
 			libvpx opencore-amr openssl theora vorbis x264 x265 \
 			xcb xvid
 PKG_SUGGESTED_OPTIONS=	lame ass freetype fontconfig libvpx openssl \
 			theora vorbis x264 xvid
 
+PLIST_VARS+=		doc
+
 # Add VDPAU if it is available
 .include "../../multimedia/libvdpau/available.mk"
 .if ${VDPAU_AVAILABLE} == "yes"
@@ -52,6 +54,15 @@ CONFIGURE_ARGS+=	--enable-libass
 CONFIGURE_ARGS+=	--disable-libass
 .endif
 
+# doc option
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST.doc=		yes
+USE_TOOLS+=		texi2html
+CONFIGURE_ARGS+=	--enable-htmlpages
+.else
+CONFIGURE_ARGS+=	--disable-htmlpages
+.endif
+
 # faac option
 .if !empty(PKG_OPTIONS:Mfaac)
 RESTRICTED=		This software may require the payment of patent royalties
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index 1d81cdb093d..f29365b0b13 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2016/04/07 05:28:20 adam Exp $
+# $NetBSD: Makefile,v 1.6 2016/05/05 07:03:47 leot Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v3.x)
@@ -25,6 +26,9 @@ CONFIGURE_ARGS+=	--host-ld=${NATIVE_CC:Q}
 CONFIGURE_ARGS+=	--target-os=${LOWER_OPSYS}
 .endif
 
+PRINT_PLIST_AWK+=	/html/ { $$0 = "$${PLIST.doc}" $$0 }
+PRINT_PLIST_AWK+=	/opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
+
 TEST_TARGET=	check
 
 post-install:
diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common
index 793802d14bd..f919ff19898 100644
--- a/multimedia/ffmpeg3/Makefile.common
+++ b/multimedia/ffmpeg3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2016/04/29 19:26:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2016/05/05 07:03:47 leot 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 perl
+USE_TOOLS+=		gmake pod2man perl
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC:Q}
 CONFIGURE_ARGS+=	--disable-debug
diff --git a/multimedia/ffmpeg3/PLIST b/multimedia/ffmpeg3/PLIST
index 50322a7261f..3a01d5dfe2a 100644
--- a/multimedia/ffmpeg3/PLIST
+++ b/multimedia/ffmpeg3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/03/11 15:42:59 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/05/05 07:03:47 leot Exp $
 bin/ffmpeg3
 bin/ffprobe3
 bin/ffserver3
@@ -165,42 +165,42 @@ man/man3/libavutil3.3
 man/man3/libswresample3.3
 man/man3/libswscale3.3
 share/doc/ffmpeg3/build_system.txt
-share/doc/ffmpeg3/developer.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg3/faq.html
+${PLIST.doc}share/doc/ffmpeg3/fate.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-all.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-bitstream-filters.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-codecs.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-devices.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-filters.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-formats.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-protocols.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-resampler.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-scaler.html
+${PLIST.doc}share/doc/ffmpeg3/ffmpeg-utils.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg3/ffprobe-all.html
+${PLIST.doc}share/doc/ffmpeg3/ffprobe.html
+${PLIST.doc}share/doc/ffmpeg3/ffserver-all.html
+${PLIST.doc}share/doc/ffmpeg3/ffserver.html
 share/doc/ffmpeg3/filter_design.txt
-share/doc/ffmpeg3/general.html
-share/doc/ffmpeg3/git-howto.html
+${PLIST.doc}share/doc/ffmpeg3/general.html
+${PLIST.doc}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
+${PLIST.doc}share/doc/ffmpeg3/libavcodec.html
+${PLIST.doc}share/doc/ffmpeg3/libavdevice.html
+${PLIST.doc}share/doc/ffmpeg3/libavfilter.html
+${PLIST.doc}share/doc/ffmpeg3/libavformat.html
+${PLIST.doc}share/doc/ffmpeg3/libavutil.html
+${PLIST.doc}share/doc/ffmpeg3/libswresample.html
+${PLIST.doc}share/doc/ffmpeg3/libswscale.html
 share/doc/ffmpeg3/mips.txt
 share/doc/ffmpeg3/multithreading.txt
-share/doc/ffmpeg3/nut.html
+${PLIST.doc}share/doc/ffmpeg3/nut.html
 share/doc/ffmpeg3/optimization.txt
-share/doc/ffmpeg3/platform.html
+${PLIST.doc}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/options.mk b/multimedia/ffmpeg3/options.mk
index ac47365e040..1705a4f3f46 100644
--- a/multimedia/ffmpeg3/options.mk
+++ b/multimedia/ffmpeg3/options.mk
@@ -1,14 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2016/03/05 08:52:23 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/05/05 07:03:47 leot Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg3
-PKG_SUPPORTED_OPTIONS=	ass faac fdk-aac fontconfig freetype gnutls lame \
+PKG_SUPPORTED_OPTIONS=	ass doc faac fdk-aac fontconfig freetype gnutls lame \
 			libvpx opencore-amr openssl theora vorbis x264 x265 \
 			xcb xvid
 PKG_SUGGESTED_OPTIONS=	lame ass freetype fontconfig libvpx openssl \
 			theora vorbis x264 xvid
 
+PLIST_VARS+=		doc
+
 # Add VDPAU if it is available
 .include "../../multimedia/libvdpau/available.mk"
 .if ${VDPAU_AVAILABLE} == "yes"
@@ -52,6 +54,15 @@ CONFIGURE_ARGS+=	--enable-libass
 CONFIGURE_ARGS+=	--disable-libass
 .endif
 
+# doc option
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST.doc=		yes
+USE_TOOLS+=		texi2html
+CONFIGURE_ARGS+=	--enable-htmlpages
+.else
+CONFIGURE_ARGS+=	--disable-htmlpages
+.endif
+
 # faac option
 .if !empty(PKG_OPTIONS:Mfaac)
 RESTRICTED=		This software may require the payment of patent royalties