Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile	29 Apr 2016 19:18:36 -0000	1.28
+++ Makefile	4 May 2016 15:02:03 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.28 2016/04/29 19:18:36 adam 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)
@@ -27,6 +28,9 @@ CONFIGURE_ARGS+=	--target-os=${LOWER_OPS
 
 TEST_TARGET=	check
 
+PRINT_PLIST_AWK+=	/html/ { $$0 = "$${PLIST.doc}" $$0 }
+PRINT_PLIST_AWK+=	/opencl/ { $$0 = "$${PLIST.opencl}" $$0 }
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
 		${DESTDIR}${PREFIX}/share/doc/ffmpeg2
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/Makefile.common,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile.common
--- Makefile.common	29 Apr 2016 19:18:36 -0000	1.47
+++ Makefile.common	4 May 2016 15:02:03 -0000
@@ -14,7 +14,7 @@ PATCHDIR=	${.CURDIR}/../../multimedia/ff
 
 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
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- PLIST	28 Apr 2016 09:20:53 -0000	1.11
+++ PLIST	4 May 2016 15:02:03 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/04/28 09:20:53 leot Exp $
+@comment $NetBSD$
 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
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/options.mk,v
retrieving revision 1.10
diff -u -p -r1.10 options.mk
--- options.mk	3 Jan 2016 11:35:21 -0000	1.10
+++ options.mk	4 May 2016 15:02:03 -0000
@@ -3,12 +3,14 @@
 # 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