diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index e50d3e787889..e6e16f4f3252 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -1,66 +1,55 @@
 PORTNAME=	mdbtools
 DISTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 WWW=		https://github.com/mdbtools/mdbtools/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion \
 		flex:textproc/flex \
 		gawk:lang/gawk
 LIB_DEPENDS=	libodbcinst.so:databases/unixODBC
 RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
 
 USES=		bison cpe gnome iconv:wchar_t libtool pathfix \
 		pkgconfig readline
 CPE_VENDOR=	mdbtools_project
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-unixodbc=${LOCALBASE}
 
+DOCS=		AUTHORS HACKING.md NEWS README.md
+
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR NLS
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 LIBMSWSTR_DESC=	Read and parse JET 4 mdb file indices
 
 LIBMSWSTR_LIB_DEPENDS=		libmswstr.so:databases/libmswstr
 LIBMSWSTR_CONFIGURE_ENV_OFF=	ac_cv_lib_mswstr_DBLCMapStringW=no
-MANPAGES_CONFIGURE_OFF=		--disable-man
-NLS_USES=			gettext
 
-DOCS=		AUTHORS HACKING.md NEWS README.md
-
-.include <bsd.port.pre.mk>
+MANPAGES_CONFIGURE_OFF=		--disable-man
 
-.if ${LLVM_DEFAULT} >= 15
-# With LLVM15:  parser.c:1053:9: error:
-# variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
-BUILD_DEPENDS+=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
-LLVM_VER=	14
-#CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm
-CC=		clang${LLVM_VER}
-CPP=		clang-cpp${LLVM_VER}
-CXX=		clang++${LLVM_VER}
-.endif
+NLS_USES=			gettext
 
 post-configure:
 	@${REINPLACE_CMD} -e \
 		's|libdir = $${exec_prefix}/lib/odbc|libdir = $${exec_prefix}/lib|' \
 		${WRKSRC}/src/odbc/Makefile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,}  ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/mdbtools/files/patch-configure b/databases/mdbtools/files/patch-configure
new file mode 100644
index 000000000000..e9336f72ec71
--- /dev/null
+++ b/databases/mdbtools/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2024-11-23 19:10:22 UTC
++++ configure
+@@ -17896,7 +17896,7 @@ fi
+ 
+ 
+ 
+-CFLAGS="$CFLAGS -Wall -Werror"
++CFLAGS="$CFLAGS -Wall -Wextra"
+ LOCALE_T=locale_t
+ case $host in #(
+   *mingw*) :