Index: security/libgcrypt/Makefile
===================================================================
--- security/libgcrypt/Makefile	(revision 377189)
+++ security/libgcrypt/Makefile	(working copy)
@@ -48,10 +48,12 @@
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
 # Fix build without ASM on 8.x/amd64
-.if ${OPSYS} == FreeBSD && ${ARCH} == "amd64" && ${OSVERSION} < 900000
+.if ${OPSYS} == FreeBSD && ${ARCH} == "amd64"
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
+.if ${OSVERSION} < 900000
 USE_GCC=	any
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
+.endif
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install: