Index: head/multimedia/libvpx/Makefile
===================================================================
--- head/multimedia/libvpx/Makefile	(revision 466921)
+++ head/multimedia/libvpx/Makefile	(revision 466922)
@@ -1,81 +1,76 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VP8/VP9 Codec SDK
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	webmproject
 
 USES=		cpe gmake perl5 shebangfix
 CPE_VENDOR=	john_koleszar
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	build/make/ads2gas.pl
 CONFIGURE_ENV=	ASFLAGS="${ASFLAGS}"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-install-docs \
 		--disable-install-srcs \
 		--enable-pic \
 		--enable-vp8 \
 		--enable-vp9
 MAKE_ARGS+=	verbose=yes
 ASFLAGS+=	${ASFLAGS_${MACHINE}}
 ASFLAGS_arm=	-meabi=5
 ALL_TARGET=	# empty
 
-# armv7 is actually armv6 target before FreeBSD 12.0
-.if ${CFLAGS:M-march=armv7*}
-CONFIGURE_ARGS+=	--target=armv7-linux-gcc
-.endif
-
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS
 OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS
 OPTIONS_EXCLUDE_aarch64=RTCPU
 OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 MULTIRES_DESC=		Enable multi-resolution encoding
 MULTIRES_CONFIGURE_ON=	--enable-multi-res-encoding
 
 POSTPROC_DESC=		Enable postprocessing
 POSTPROC_CONFIGURE_ON=	--enable-postproc --enable-vp9-postproc	\
 			--enable-vp9-temporal-denoising
 
 RTCPU_DESC=		Detect CPU capabilities at runtime
 RTCPU_CONFIGURE_ON=	--enable-runtime-cpu-detect
 
 SHARED_DESC=		Enable shared-library support
 SHARED_CONFIGURE_ON=	--enable-shared
 
 SIZE_LIMIT_DESC=	Maximum size allowed by decoder: ${SIZE_LIMIT}
 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
 
 post-patch:
 	@${REINPLACE_CMD} -E '/gcctarget|link_with_cc/s/gcc[[:>:]]/$${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-build_make_configure.sh
===================================================================
--- head/multimedia/libvpx/files/patch-build_make_configure.sh	(revision 466921)
+++ head/multimedia/libvpx/files/patch-build_make_configure.sh	(revision 466922)
@@ -1,13 +1,29 @@
+- Add armv6 targets where NEON depends on CFLAGS
 - Recognize DragonFly as x86_64-linux-gcc target by default
 
 --- build/make/configure.sh.orig	2018-01-24 22:25:44 UTC
 +++ build/make/configure.sh
+@@ -696,6 +696,14 @@ process_common_toolchain() {
+       aarch64*)
+         tgt_isa=arm64
+         ;;
++      armv6*-gnueabihf)
++        tgt_isa=armv6
++        float_abi=hard
++        ;;
++      armv6*-gnueabi)
++        tgt_isa=armv6
++        float_abi=softfp
++        ;;
+       armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
+         tgt_isa=armv7
+         float_abi=hard
 @@ -767,7 +767,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
 -      *linux*|*bsd*)
 +      *linux*|*dragonfly*|*bsd*)
          tgt_os=linux
          ;;
        *solaris2.10)
Index: head/multimedia/libvpx/files/patch-configure
===================================================================
--- head/multimedia/libvpx/files/patch-configure	(revision 466921)
+++ head/multimedia/libvpx/files/patch-configure	(revision 466922)
@@ -1,22 +1,30 @@
 - Add missing targets when toolchain != generic-gnu
 - --version is a GNUism which BSD diff doesn't support
 
 --- configure.orig	2018-01-24 22:25:44 UTC
 +++ configure
+@@ -101,6 +101,7 @@ EOF
+ all_platforms="${all_platforms} arm64-android-gcc"
+ all_platforms="${all_platforms} arm64-darwin-gcc"
+ all_platforms="${all_platforms} arm64-linux-gcc"
++all_platforms="${all_platforms} armv6-linux-gcc"
+ all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
+ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
+ all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
 @@ -116,6 +117,7 @@ all_platforms="${all_platforms} mips32-linux-gcc"
  all_platforms="${all_platforms} mips64-linux-gcc"
  all_platforms="${all_platforms} ppc64-linux-gcc"
  all_platforms="${all_platforms} ppc64le-linux-gcc"
 +all_platforms="${all_platforms} sparc-linux-gcc"
  all_platforms="${all_platforms} sparc-solaris-gcc"
  all_platforms="${all_platforms} x86-android-gcc"
  all_platforms="${all_platforms} x86-darwin8-gcc"
 @@ -170,7 +170,7 @@ for t in ${all_targets}; do
      [ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
  done
  
 -if ! diff --version >/dev/null; then
 +if ! hash diff 2>/dev/null; then
    die "diff missing: Try installing diffutils via your package manager."
  fi