Index: branches/2017Q1/security/libgcrypt/Makefile
===================================================================
--- branches/2017Q1/security/libgcrypt/Makefile	(revision 435049)
+++ branches/2017Q1/security/libgcrypt/Makefile	(revision 435050)
@@ -1,51 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.7.6
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	General purpose crypto library based on code used in GnuPG
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libgpg-error>=1.8:security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.8:security/libgpg-error
 
 USES=		cpe libtool makeinfo tar:bzip2
 CPE_VENDOR=	gnupg
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support --enable-static=yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS THANKS TODO \
 		doc/HACKING doc/README.apichanges
 INFO=		gcrypt
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-aarch64
+.endif
+
 .if ${ARCH} == "powerpc"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 post-patch:
 	${RM} ${WRKSRC}/doc/gcrypt.info*
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2017Q1/security/libgcrypt/files/extra-patch-aarch64
===================================================================
--- branches/2017Q1/security/libgcrypt/files/extra-patch-aarch64	(nonexistent)
+++ branches/2017Q1/security/libgcrypt/files/extra-patch-aarch64	(revision 435050)
@@ -0,0 +1,68 @@
+--- cipher/cipher-gcm-armv8-aarch64-ce.S.orig	2016-11-12 10:39:35 UTC
++++ cipher/cipher-gcm-armv8-aarch64-ce.S
+@@ -23,7 +23,7 @@
+     defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
+     defined(HAVE_GCC_INLINE_ASM_AARCH64_CRYPTO)
+ 
+-.arch armv8-a+crypto
++.cpu generic+simd+crypto
+ 
+ .text
+ 
+--- cipher/rijndael-armv8-aarch64-ce.S.orig	2017-01-18 11:28:40 UTC
++++ cipher/rijndael-armv8-aarch64-ce.S
+@@ -23,7 +23,7 @@
+     defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
+     defined(HAVE_GCC_INLINE_ASM_AARCH64_CRYPTO)
+ 
+-.arch armv8-a+crypto
++.cpu generic+simd+crypto
+ 
+ .text
+ 
+--- cipher/sha1-armv8-aarch64-ce.S.orig	2016-11-12 10:39:35 UTC
++++ cipher/sha1-armv8-aarch64-ce.S
+@@ -23,7 +23,7 @@
+     defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
+     defined(HAVE_GCC_INLINE_ASM_AARCH64_CRYPTO) && defined(USE_SHA1)
+ 
+-.arch armv8-a+crypto
++.cpu generic+simd+crypto
+ 
+ .text
+ 
+--- cipher/sha256-armv8-aarch64-ce.S.orig	2016-11-12 10:39:35 UTC
++++ cipher/sha256-armv8-aarch64-ce.S
+@@ -23,7 +23,7 @@
+     defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
+     defined(HAVE_GCC_INLINE_ASM_AARCH64_CRYPTO) && defined(USE_SHA256)
+ 
+-.arch armv8-a+crypto
++.cpu generic+simd+crypto
+ 
+ .text
+ 
+--- configure.ac.orig	2017-01-18 11:37:00 UTC
++++ configure.ac
+@@ -1623,7 +1623,7 @@ AC_CACHE_CHECK([whether GCC inline assem
+           gcry_cv_gcc_inline_asm_aarch64_neon=no
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+           [[__asm__(
+-                ".arch armv8-a\n\t"
++                ".cpu generic+simd\n\t"
+                 "mov w0, \#42;\n\t"
+                 "dup v0.8b, w0;\n\t"
+                 "ld4 {v0.8b,v1.8b,v2.8b,v3.8b},[x0],\#32;\n\t"
+@@ -1648,7 +1648,11 @@ AC_CACHE_CHECK([whether GCC inline assem
+           gcry_cv_gcc_inline_asm_aarch64_crypto=no
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+           [[__asm__(
+-                ".arch armv8-a+crypto\n\t"
++		".cpu generic+simd\n\t"
++
++		"mov w0, \#42;\n\t"
++		"dup v0.8b, w0;\n\t"
++		"ld4 {v0.8b,v1.8b,v2.8b,v3.8b},[x0],\#32;\n\t"
+ 
+                 "sha1h s0, s0;\n\t"
+                 "sha1c q0, s0, v0.4s;\n\t"

Property changes on: branches/2017Q1/security/libgcrypt/files/extra-patch-aarch64
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 435049)
+++ branches/2017Q1	(revision 435050)

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