Index: head/graphics/sekrit-twc-zimg/Makefile
===================================================================
--- head/graphics/sekrit-twc-zimg/Makefile	(revision 415614)
+++ head/graphics/sekrit-twc-zimg/Makefile	(revision 415615)
@@ -1,52 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	zimg
 PORTVERSION=	2.1
 DISTVERSIONPREFIX=	release-
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	${GH_ACCOUNT}-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Scaling, colorspace conversion, and dithering library
 
 LICENSE=	WTFPL2
 LICENSE_NAME=	Do What The Fuck You Want To Public License version 2
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sekrit-twc
 
 CONFLICTS_INSTALL=	zimg-[0-9]* # include/zimg.h
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pathfix
 EXTRACT_AFTER_ARGS=	--exclude test/extra
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-testapp
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	SIMD TEST
-OPTIONS_DEFAULT=SIMD
-OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
+OPTIONS_DEFINE=	TEST
+
+OPTIONS_DEFINE_amd64=	SIMD
+OPTIONS_DEFINE_i386=	SIMD
+OPTIONS_DEFAULT_amd64=	SIMD
+OPTIONS_DEFAULT_i386=	SIMD # runtime detection
 
 SIMD_CONFIGURE_ENABLE=	x86simd
 
 TEST_BUILD_DEPENDS=	googletest>=1.6.0:devel/googletest
 TEST_USES=		localbase
 TEST_CONFIGURE_ENABLE=	unit-test
 TEST_TEST_TARGET=	check VERBOSE=1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/x86_64/&|amd64/g' \
 		${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's/-O2 //' \
 		-e '/zimg-test/ { s/+=/=/; s/^noinst_/bin_/; } ' \
 		${WRKSRC}/Makefile.am
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
Index: head/multimedia/vapoursynth/Makefile
===================================================================
--- head/multimedia/vapoursynth/Makefile	(revision 415614)
+++ head/multimedia/vapoursynth/Makefile	(revision 415615)
@@ -1,122 +1,124 @@
 # $FreeBSD$
 
 PORTNAME=	vapoursynth
 DISTVERSION=	R32
 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
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
 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 SIMD
+OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD
 OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS}
-OPTIONS_DEFAULT_amd64=	SIMD
-OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
 OPTIONS_SUB=	yes
+
+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
 
 # 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_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=		libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=		assvapour
 
 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
 
 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>