diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 85dd47823d00..d6a3c5aef1b8 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,59 +1,63 @@
 PORTNAME=	libgcrypt
 DISTVERSION=	1.9.4
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	General purpose cryptographic library based on the code from GnuPG
 WWW=		https://www.gnupg.org/software/libgcrypt/index.html
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libgpg-error>=1.32:security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.32:security/libgpg-error
 
 USES=		cpe libtool tar:bzip2
 
 CPE_VENDOR=	gnupg
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support
 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
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS INFO STATIC
 OPTIONS_DEFAULT=	DOCS INFO STATIC
 OPTIONS_SUB=	yes
 
 INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
 INFO_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 INFO_INFO=		gcrypt
 INFO_USES=	makeinfo
 
 STATIC_CONFIGURE_ENABLE=	static
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 CONFIGURE_ARGS+=	--disable-jent-support
 .endif
 
+.if defined(WITH_DEBUG)
+CFLAGS+=	-DWITH_DEBUG
+.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>
diff --git a/security/libgcrypt/files/patch-tests_basic.c b/security/libgcrypt/files/patch-tests_basic.c
new file mode 100644
index 000000000000..4735524ff689
--- /dev/null
+++ b/security/libgcrypt/files/patch-tests_basic.c
@@ -0,0 +1,29 @@
+--- tests/basic.c.orig	2021-08-22 04:56:06.000000000 -0700
++++ tests/basic.c	2022-12-05 07:46:59.768944000 -0800
+@@ -38,6 +38,10 @@
+ #else
+ #  define ALWAYS_INLINE
+ #endif
++#ifdef WITH_DEBUG
++#  undef ALWAYS_INLINE
++#  define ALWAYS_INLINE
++#endif
+ 
+ typedef struct test_spec_pubkey_key
+ {
+@@ -214,6 +218,7 @@
+ }
+ 
+ 
++#ifndef WITH_DEBUG
+ #if defined(__x86_64__) && defined(HAVE_GCC_INLINE_ASM_SSSE3) && \
+     (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \
+      defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS))
+@@ -233,6 +238,7 @@
+       defined(__ARM_NEON)
+ # define CLUTTER_VECTOR_REGISTER_NEON 1
+ # define CLUTTER_VECTOR_REGISTER_COUNT 16
++#endif
+ #endif
+ 
+