diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile
index 43db4dc4235f..ece744a43237 100644
--- a/databases/proxysql/Makefile
+++ b/databases/proxysql/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	proxysql
 PORTVERSION=	3.0.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	High performance, high availability, protocol-aware proxy for MySQL
 WWW=		https://www.proxysql.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	aclocal:devel/automake \
 		autoreconf:devel/autoconf \
 		bash:shells/bash \
 		cmake:devel/cmake-core \
 		ggrep:textproc/gnugrep \
 		libgcrypt>0:security/libgcrypt \
 		libtoolize:devel/libtool \
 		libevent>0:devel/libevent \
 		gnutls>0:security/gnutls
 LIB_DEPENDS=	libuuid.so:misc/libuuid
 RUN_DEPENDS=	libgcrypt>0:security/libgcrypt \
 		gnutls>0:security/gnutls
 
 USES=		bison:build compiler:c++11-lang gmake libtool perl5 pkgconfig python:build ssl
 USE_PERL5=	build
 USE_GCC=	yes
 MAKE_ENV=	GIT_VERSION_BASE="${PORTVERSION}" SOURCE_DATE_EPOCH="$$(date +%s)"
 USE_GITHUB=	yes
 ALL_TARGET=	build_deps default
 LDFLAGS+=	-L${LOCALBASE}/lib
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 GH_ACCOUNT=	sysown
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} < 1400000 && ${SSL_DEFAULT} == "base")
 IGNORE=		requires OpenSSL 3.x or greater
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${ETCDIR}/,g' ${WRKSRC}/lib/ProxySQL_GloVars.cpp
 	@${REINPLACE_CMD} \
 		-e 's,/var/lib,/var/db,g' \
 		-e '7s/^/errorlog="\/var\/log\/proxysql\/proxysql-error.log"\n\n/g' \
 		-e '7s/^/pidfile="\/var\/run\/${PORTNAME}\/${PORTNAME}.pid"\n/g' \
 		${WRKSRC}/src/proxysql.cfg
 	@${REINPLACE_CMD} \
 		-e '/^GIT_VERSION_BASE := /d' \
 		-e 's,grep -P,g&,' \
 		-e '/ export C/d' \
 		-e 's,PROXYSQLCLICKHOUSE=1 ,,g' \
 		-e '/cd curl/s,$${MAKE},${GMAKE},' \
 		-e '/cd libmicrohttpd/s,$${MAKE},${GMAKE},' \
 		-e '/cd lz4/s,$${MAKE},${GMAKE},' \
 		-e '/cd libhttpserver.*MAKE/s,CC,MAKE=${GMAKE} CC,' \
 		-e '/cd libhttpserver/s,$${MAKE},${GMAKE},' \
 		-e '/get_result_from_pgconn/s,-p0,-p0 -l,' \
 		-e 's,without-readline,without-readline --without-icu,g' \
 		-e 's,--enable-fastopen=false ,--enable-fastopen=false --enable-shared=no ,g' \
 		${WRKSRC}/Makefile ${WRKSRC}/deps/Makefile
 	@${REINPLACE_CMD} -e 's,grep -oP,ggrep -oP,g' ${WRKSRC}/common_mk/*.mk
 	@${REINPLACE_CMD} -e 's,ENABLE_EPOLL := -DENABLE_EPOLL,ENABLE_EPOLL :=,g' \
 		${WRKSRC}/lib/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/proxysql ${STAGEDIR}${LOCALBASE}/sbin
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/db/${PORTNAME} \
 		${STAGEDIR}/var/run/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
 		${STAGEDIR}/var/log/${PORTNAME}
 	${INSTALL_DATA} ${FILESDIR}/proxysql.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/proxysql.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/src/proxysql.cfg \
 		${STAGEDIR}${ETCDIR}/proxysql.cfg.sample
 
 .include <bsd.port.post.mk>
diff --git a/databases/proxysql/files/patch-include_PgSQL__Thread.h b/databases/proxysql/files/patch-include_PgSQL__Thread.h
deleted file mode 100644
index bf8e37a2bded..000000000000
--- a/databases/proxysql/files/patch-include_PgSQL__Thread.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/PgSQL_Thread.h.orig	2025-11-08 01:19:28 UTC
-+++ include/PgSQL_Thread.h
-@@ -212,10 +212,10 @@ class __attribute__((aligned(64))) PgSQL_Thread : publ
- 	//PtrArray* mysql_sessions;
- 	PtrArray* mirror_queue_mysql_sessions;
- 	PtrArray* mirror_queue_mysql_sessions_cache;
-+	CopyCmdMatcher *copy_cmd_matcher;
- #ifdef IDLE_THREADS
- 	PtrArray* idle_mysql_sessions;
- 	PtrArray* resume_mysql_sessions;
--	CopyCmdMatcher *copy_cmd_matcher;
- 	pgsql_conn_exchange_t myexchange;
- #endif // IDLE_THREADS
- 
diff --git a/databases/proxysql/files/patch-include_proxysql__utils.h b/databases/proxysql/files/patch-include_proxysql__utils.h
deleted file mode 100644
index da6d62c21cf7..000000000000
--- a/databases/proxysql/files/patch-include_proxysql__utils.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/proxysql_utils.h.orig	2025-11-08 01:40:32 UTC
-+++ include/proxysql_utils.h
-@@ -25,19 +25,11 @@
- #define	ETIME	ETIMEDOUT
- #endif
- 
--#ifdef CXX17
- template<class...> struct conjunction : std::true_type { };
--template<class B1> struct std::conjunction<B1> : B1 { };
--template<class B1, class... Bn>
--struct std::conjunction<B1, Bn...> 
--    : std::conditional<bool(B1::value), std::conjunction<Bn...>, B1>::type {};
--#else
--template<class...> struct conjunction : std::true_type { };
- template<class B1> struct conjunction<B1> : B1 { };
- template<class B1, class... Bn>
- struct conjunction<B1, Bn...> 
-     : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
--#endif // CXX17
- /**
-  * @brief Stores the result of formatting the first parameter with the provided
-  *  arguments, into the std::string reference provided in the second parameter.
diff --git a/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp b/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp
deleted file mode 100644
index 6ccc4d2821e3..000000000000
--- a/databases/proxysql/files/patch-lib_ProxySQL__Admin.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/ProxySQL_Admin.cpp.orig	2026-03-18 17:48:48 UTC
-+++ lib/ProxySQL_Admin.cpp
-@@ -2726,8 +2726,10 @@ ProxySQL_Admin::ProxySQL_Admin() :
- 	// processlist configuration
- 	variables.mysql_processlist.show_extended = 0;
- 	variables.pgsql_processlist.show_extended = 0;
-+#ifdef IDLE_THREADS
- 	variables.mysql_processlist.show_idle_session = true;
- 	variables.pgsql_processlist.show_idle_session = true;
-+#endif
- 	variables.mysql_processlist.max_query_length = PROCESSLIST_MAX_QUERY_LEN_DEFAULT;
- 	variables.pgsql_processlist.max_query_length = PROCESSLIST_MAX_QUERY_LEN_DEFAULT;
-