Index: head/multimedia/libvpx/Makefile
===================================================================
--- head/multimedia/libvpx/Makefile	(revision 432100)
+++ head/multimedia/libvpx/Makefile	(revision 432101)
@@ -1,93 +1,80 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.1
 CATEGORIES=	multimedia
 
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VP8/VP9 Codec SDK
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	yasm:devel/yasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	webmproject
 
 USES=		compiler:c11 cpe gmake perl5 shebangfix
 CPE_VENDOR=	john_koleszar
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT TEST THREADS
 OPTIONS_DEFAULT=MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT THREADS
 OPTIONS_EXCLUDE_aarch64=RUNTIME
 OPTIONS_EXCLUDE_armv6=	RUNTIME
 MULTIRES_DESC=	Enable multi-resolution encoding
 POSTPROC_DESC=	Enable postprocessing
 RUNTIME_DESC=	Enable runtime CPU detection
 SHARED_DESC=	Enable shared-library support
 SIZE_LIMIT_DESC=Maximum size allowed by decoder: ${SIZE_LIMIT}
 
 ALL_TARGET=
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
+CONFIGURE_ENV=	ASFLAGS="${ASFLAGS}"
+# Only explicitly list ARCHs with SIMD optimizations
+CONFIGURE_ARGS_aarch64=	--target=arm64-linux-gcc
+CONFIGURE_ARGS_amd64=	--target=x86_64-linux-gcc
+CONFIGURE_ARGS_i386=	--target=x86-linux-gcc
+.if ${CFLAGS:M-march=armv[78]*}
+CONFIGURE_ARGS+=	--target=armv7-linux-gcc
+ASFLAGS+=		-meabi=5
+.endif
+CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
+		--prefix=${PREFIX} \
 		--disable-install-docs \
 		--disable-install-srcs \
 		--enable-pic \
 		--enable-vp8 \
 		--enable-vp9
 MAKE_ARGS+=	verbose=yes
 
 OPTIONS_SUB=		SHARED
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 MULTIRES_CONFIGURE_ON=	--enable-multi-res-encoding
 POSTPROC_CONFIGURE_ON=	--enable-postproc --enable-vp9-postproc	\
 			--enable-vp9-temporal-denoising
 RUNTIME_CONFIGURE_ON=	--enable-runtime-cpu-detect
 SHARED_CONFIGURE_ON=	--enable-shared
 SIZE_LIMIT_CONFIGURE_ON=--size-limit=${SIZE_LIMIT}
 SIZE_LIMIT?=		16384x16384 # Chromium; Firefox has 4000x3000
 TEST_CONFIGURE_OFF=	--disable-unit-tests
 THREADS_CONFIGURE_OFF=	--disable-multithread
 
 SHEBANG_FILES=	build/make/ads2gas.pl
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=	--target=x86_64-linux-gcc
-.elif ${ARCH} == "i386"
-CONFIGURE_ARGS+=	--target=x86-linux-gcc
-.elif ${ARCH} == "ia64"
-CONFIGURE_ARGS+=	--target=ia64-linux-gcc
-.elif ${ARCH} == "powerpc"
-CONFIGURE_ARGS+=	--target=ppc32-linux-gcc
-.elif ${ARCH} == "powerpc64"
-CONFIGURE_ARGS+=	--target=ppc64-linux-gcc
-.elif ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=	--target=sparc64-linux-gcc
-.elif ${ARCH} == "aarch64"
-CONFIGURE_ARGS+=	--target=arm64-linux-gcc
-.elif ${ARCH} == "armv6"
-CONFIGURE_ARGS+=	--target=armv6-linux-gcc --cpu=armv6
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build_make_Makefile
-.else
-IGNORE=	no support for ${ARCH} the moment. testing/patches are welcome
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|\(link_with_cc\)=gcc|\1=$${CC}|' \
 		${WRKSRC}/build/make/configure.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx*
 
 post-install-SHARED-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvpx.so.*.*.*
 
 .include <bsd.port.mk>
Index: head/multimedia/libvpx/files/patch-configure
===================================================================
--- head/multimedia/libvpx/files/patch-configure	(revision 432100)
+++ head/multimedia/libvpx/files/patch-configure	(nonexistent)
@@ -1,13 +0,0 @@
---- configure.orig	2016-07-21 01:15:41 UTC
-+++ configure
-@@ -158,6 +158,10 @@ all_platforms="${all_platforms} x86_64-w
- all_platforms="${all_platforms} x86_64-win64-vs11"
- all_platforms="${all_platforms} x86_64-win64-vs12"
- all_platforms="${all_platforms} x86_64-win64-vs14"
-+all_platforms="${all_platforms} ia64-linux-gcc"
-+all_platforms="${all_platforms} ppc32-linux-gcc"
-+all_platforms="${all_platforms} ppc64-linux-gcc"
-+all_platforms="${all_platforms} sparc64-linux-gcc"
- all_platforms="${all_platforms} generic-gnu"
- 
- # all_targets is a list of all targets that can be configured

Property changes on: head/multimedia/libvpx/files/patch-configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/libvpx/files/extra-patch-build_make_Makefile
===================================================================
--- head/multimedia/libvpx/files/extra-patch-build_make_Makefile	(revision 432100)
+++ head/multimedia/libvpx/files/extra-patch-build_make_Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- build/make/Makefile.orig	2013-11-18 22:18:52 UTC
-+++ build/make/Makefile
-@@ -68,7 +68,7 @@ BUILD_ROOT?=.
- VPATH=$(SRC_PATH_BARE)
- CFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
- CXXFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
--ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/
-+ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ -meabi=5
- DIST_DIR?=dist
- HOSTCC?=gcc
- TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))

Property changes on: head/multimedia/libvpx/files/extra-patch-build_make_Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property