svn commit: r414539 - in head: devel/fb-adb graphics/sekrit-twc-zimg multimedia/vapoursynth

[Jan Beich]

Author: jbeich
Date: Tue May  3 16:32:13 2016
New Revision: 414539
URL: https://svnweb.freebsd.org/changeset/ports/414539

Log:
  Work around _OFF helpers not invoking for OPTIONS_DEFINE_${ARCH}

Modified:
  head/devel/fb-adb/Makefile   (contents, props changed)
  head/graphics/sekrit-twc-zimg/Makefile   (contents, props changed)
  head/multimedia/vapoursynth/Makefile   (contents, props changed)

Modified: head/devel/fb-adb/Makefile
==============================================================================
--- head/devel/fb-adb/Makefile	Tue May  3 16:29:07 2016	(r414538)
+++ head/devel/fb-adb/Makefile	Tue May  3 16:32:13 2016	(r414539)
@@ -11,8 +11,6 @@ COMMENT=	Better shell for Android device
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_powerpc64=	Does not build
-
 BUILD_DEPENDS=	xxd:editors/vim-lite \
 		${BASH_CMD}:shells/${BASH_CMD:T}
 RUN_DEPENDS=	adb:devel/android-tools-adb
@@ -39,11 +37,9 @@ CONFIGURE_ENV+=	HOST_CFLAGS="${CPPFLAGS}
 		STUB_LDFLAGS="${STUB_LDFLAGS}" \
 		LDFLAGS="" LIBS=""
 
-OPTIONS_DEFINE=	ASSERT BASH DEBUG
-OPTIONS_DEFINE_amd64=	NDK
-OPTIONS_DEFINE_i386=	NDK
-OPTIONS_DEFAULT_amd64=	NDK
-OPTIONS_DEFAULT_i386=	NDK
+OPTIONS_DEFINE=	ASSERT BASH DEBUG NDK
+OPTIONS_DEFAULT=NDK
+OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/NDK/}
 OPTIONS_EXCLUDE_DragonFly=NDK
 
 ASSERT_CONFIGURE_ENABLE=checking

Modified: head/graphics/sekrit-twc-zimg/Makefile
==============================================================================
--- head/graphics/sekrit-twc-zimg/Makefile	Tue May  3 16:29:07 2016	(r414538)
+++ head/graphics/sekrit-twc-zimg/Makefile	Tue May  3 16:32:13 2016	(r414539)
@@ -14,8 +14,6 @@ LICENSE_NAME=	Do What The Fuck You Want 
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
 
-BROKEN_powerpc64=	Does not build
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	sekrit-twc
 
@@ -31,12 +29,9 @@ CPPFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	TEST
-
-OPTIONS_DEFINE_amd64=	SIMD
-OPTIONS_DEFINE_i386=	SIMD
-OPTIONS_DEFAULT_amd64=	SIMD
-OPTIONS_DEFAULT_i386=	SIMD # runtime detection
+OPTIONS_DEFINE=	SIMD TEST
+OPTIONS_DEFAULT=SIMD
+OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
 
 SIMD_CONFIGURE_ENABLE=	x86simd
 

Modified: head/multimedia/vapoursynth/Makefile
==============================================================================
--- head/multimedia/vapoursynth/Makefile	Tue May  3 16:29:07 2016	(r414538)
+++ head/multimedia/vapoursynth/Makefile	Tue May  3 16:32:13 2016	(r414539)
@@ -20,13 +20,11 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth
 
-OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD
+OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD SIMD
 OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS}
-OPTIONS_SUB=	yes
-
-OPTIONS_DEFINE_amd64=	SIMD
-OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
+OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
+OPTIONS_SUB=	yes
 
 OPTIONS_GROUP=		COMPS PLUGINS
 COMPS_DESC=		Components