Index: branches/2019Q1/multimedia/aom/Makefile
===================================================================
--- branches/2019Q1/multimedia/aom/Makefile	(revision 494320)
+++ branches/2019Q1/multimedia/aom/Makefile	(revision 494321)
@@ -1,32 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0-1115
 DISTVERSIONSUFFIX=	-ga1ebb57ec
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		cmake compiler:c++11-lib perl5
 USE_GITHUB=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	jbeich # mirror
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 
 post-patch:
 # Extract (snapshot) version from GH_TAGNAME instead of CHANGELOG
 	@${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${GH_TAGNAME:S/^v//},' \
 		${WRKSRC}/build/cmake/version.cmake
 
 .include <bsd.port.mk>
Index: branches/2019Q1/multimedia/aom/files/patch-build_cmake_cpu.cmake
===================================================================
--- branches/2019Q1/multimedia/aom/files/patch-build_cmake_cpu.cmake	(revision 494320)
+++ branches/2019Q1/multimedia/aom/files/patch-build_cmake_cpu.cmake	(revision 494321)
@@ -1,13 +1,13 @@
 - Don't enable NEON on armv6 similar to build/cmake/rtcd.pl
 
 --- build/cmake/cpu.cmake.orig	2018-11-16 20:24:20 UTC
 +++ build/cmake/cpu.cmake
 @@ -9,7 +9,7 @@
  # can obtain it at www.aomedia.org/license/patent.
  #
  
 -if("${AOM_TARGET_CPU}" MATCHES "^arm")
-+if("${AOM_TARGET_CPU}" MATCHES "^armv[78]")
++if("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT "${AOM_TARGET_CPU}" MATCHES "^armv6")
    set(ARCH_ARM 1)
    set(RTCD_ARCH_ARM "yes")
  
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 494320)
+++ branches/2019Q1	(revision 494321)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r494319