Index: head/multimedia/vapoursynth/Makefile
===================================================================
--- head/multimedia/vapoursynth/Makefile	(revision 432339)
+++ head/multimedia/vapoursynth/Makefile	(revision 432340)
@@ -1,132 +1,135 @@
 # $FreeBSD$
 
 PORTNAME=	vapoursynth
-DISTVERSION=	R35
-PORTREVISION=	2
+DISTVERSION=	R36
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Video processing framework with simplicity in mind
 
 LICENSE=	LGPL21+
 
 USE_GITHUB=	yes
 
 USES=		autoreconf gmake libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth
 
 OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD
 OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS}
 OPTIONS_SUB=	yes
 
 # XXX After r417413 poudriere requires textproc/py-sphinx being built
 # with the same python version as USES=python here but it's currently
 # not possible due to https://github.com/freebsd/poudriere/issues/259
 .if defined(PACKAGE_BUILDING)
 OPTIONS_EXCLUDE=DOCS
 .endif
 
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 
 OPTIONS_GROUP=		COMPS PLUGINS
 COMPS_DESC=		Components
 OPTIONS_GROUP_COMPS=	CORE PYTHON VSPIPE VSSCRIPT
 PLUGINS_DESC=		Plugins
-OPTIONS_GROUP_PLUGINS=	ASS EEDI3 IMAGEMAGICK MORPHO TESSERACT REMOVEGRAIN VINVERSE VIVTC
+OPTIONS_GROUP_PLUGINS=	ASS EEDI3 IMAGEMAGICK MISCFILTERS MORPHO TESSERACT \
+			REMOVEGRAIN VINVERSE VIVTC
 
 # General options
 
 DEBUG_CONFIGURE_ENABLE=		debug
 
 DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 DOCS_USES=			makeinfo
 DOCS_INFO=			VapourSynth
 DOCS_PORTDOCS=			*
 
 FRAME_GUARD_DESC=		Check integrity after each filter
 FRAME_GUARD_CONFIGURE_ENABLE=	guard-pattern
 
 # VSSCRIPT or REMOVEGRAIN
 SIMD_BUILD_DEPENDS=		yasm:devel/yasm
 SIMD_CONFIGURE_ENABLE=		x86-asm
 
 # COMPS group
 
 CORE_DESC=			Core library
-CORE_BUILD_DEPENDS=		sekrit-twc-zimg>=2.3:graphics/sekrit-twc-zimg
+CORE_BUILD_DEPENDS=		sekrit-twc-zimg>=2.4:graphics/sekrit-twc-zimg
 CORE_LIB_DEPENDS=		libzimg.so:graphics/sekrit-twc-zimg
 CORE_USES=			compiler:c++11-lib
 CORE_CONFIGURE_ENABLE=		core
 
 PYTHON_USES=			python:3.3-
 PYTHON_BUILD_DEPENDS=		cython:lang/cython
 PYTHON_CONFIGURE_ENABLE=	python-module
 PYTHON_IMPLIES=			CORE
 
 VSPIPE_DESC=			Command line interface
 VSPIPE_USES=			compiler:c++11-lib
 VSPIPE_CONFIGURE_ENABLE=	vspipe
 VSPIPE_IMPLIES=			VSSCRIPT
 
 VSSCRIPT_DESC=			Scripting library
 VSSCRIPT_USES=			compiler:c++11-lib python:3.3-
 VSSCRIPT_CONFIGURE_ENABLE=	vsscript
 
 # PLUGINS group
 
 ASS_DESC=			Subtitles rendering via libass
 ASS_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg \
 				libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=		subtext
 
 EEDI3_DESC=			Very slow edge directed interpolation
 EEDI3_CONFIGURE_ENABLE=		eedi3
 
 IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 IMAGEMAGICK_USES=		compiler:c++11-lib
 IMAGEMAGICK_CONFIGURE_ENABLE=	imwri
 
 TESSERACT_DESC=			Optical Character Recognition via Tesseract
 TESSERACT_LIB_DEPENDS=		libtesseract.so:graphics/tesseract
 TESSERACT_CONFIGURE_ENABLE=	ocr
+
+MISCFILTERS_DESC=		Miscellaneous filters
+MISCFILTERS_CONFIGURE_ENABLE=	miscfilters
 
 MORPHO_DESC=			Morphological filter
 MORPHO_CONFIGURE_ENABLE=	morpho
 
 REMOVEGRAIN_DESC=		3x3 median and convolution denoising
 REMOVEGRAIN_CONFIGURE_ENABLE=	removegrain
 
 VINVERSE_DESC=			Remove residual combing
 VINVERSE_CONFIGURE_ENABLE=	vinverse
 
 VIVTC_DESC=			Field matching, inverse telecine and decimation
 VIVTC_CONFIGURE_ENABLE=		vivtc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \
 		${WRKSRC}/configure.ac
 
 post-build-DOCS-on:
 	@${DO_MAKE_BUILD} html texinfo -C${WRKSRC}/doc
 	@${DO_MAKE_BUILD} info -C${WRKSRC}/doc/_build/texinfo
 	@if [ -n "${PORT_OPTIONS:MVSPIPE}" ]; then \
 		${DO_MAKE_BUILD} man -C${WRKSRC}/doc; \
 	fi
 
 post-install-DOCS-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/VapourSynth.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 	(cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 	@if [ -n "${PORT_OPTIONS:MVSPIPE}" ]; then \
 		${INSTALL_MAN} -v ${WRKSRC}/doc/_build/man/vspipe.1 \
 			${STAGEDIR}${MAN1PREFIX}/man/man1; \
 	fi
 
 .include <bsd.port.mk>
Index: head/multimedia/vapoursynth/distinfo
===================================================================
--- head/multimedia/vapoursynth/distinfo	(revision 432339)
+++ head/multimedia/vapoursynth/distinfo	(revision 432340)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477613192
-SHA256 (vapoursynth-vapoursynth-R35_GH0.tar.gz) = 762cada84d2f975ec925a1eb719dd8a2f40dfaa69d10c358b228184785f64918
-SIZE (vapoursynth-vapoursynth-R35_GH0.tar.gz) = 544641
+TIMESTAMP = 1485034906
+SHA256 (vapoursynth-vapoursynth-R36_GH0.tar.gz) = 8a156c5143cecd70b48e59428ec175e901510593082d3ddbc16fba93f5b6c704
+SIZE (vapoursynth-vapoursynth-R36_GH0.tar.gz) = 555591
Index: head/multimedia/vapoursynth/pkg-plist
===================================================================
--- head/multimedia/vapoursynth/pkg-plist	(revision 432339)
+++ head/multimedia/vapoursynth/pkg-plist	(revision 432340)
@@ -1,22 +1,23 @@
 %%VSPIPE%%bin/vspipe
 %%CORE%%include/vapoursynth/VSHelper.h
 %%CORE%%include/vapoursynth/VSScript.h
 %%CORE%%include/vapoursynth/VapourSynth.h
 %%VSSCRIPT%%lib/libvapoursynth-script.a
 %%VSSCRIPT%%lib/libvapoursynth-script.so
 %%VSSCRIPT%%lib/libvapoursynth-script.so.0
 %%VSSCRIPT%%lib/libvapoursynth-script.so.0.0.0
 %%CORE%%lib/libvapoursynth.a
 %%CORE%%lib/libvapoursynth.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vapoursynth.so
 %%DOCS%%%%VSPIPE%%man/man1/vspipe.1.gz
 %%ASS%%%%DATADIR%%/libsubtext.so
 %%EEDI3%%%%DATADIR%%/libeedi3.so
 %%IMAGEMAGICK%%%%DATADIR%%/libimwri.so
+%%MISCFILTERS%%%%DATADIR%%/libmiscfilters.so
 %%MORPHO%%%%DATADIR%%/libmorpho.so
 %%TESSERACT%%%%DATADIR%%/libocr.so
 %%REMOVEGRAIN%%%%DATADIR%%/libremovegrain.so
 %%VINVERSE%%%%DATADIR%%/libvinverse.so
 %%VIVTC%%%%DATADIR%%/libvivtc.so
 %%VSSCRIPT%%libdata/pkgconfig/vapoursynth-script.pc
 %%CORE%%libdata/pkgconfig/vapoursynth.pc