diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile
index b136eada9ae1..43db4dc4235f 100644
--- a/databases/proxysql/Makefile
+++ b/databases/proxysql/Makefile
@@ -1,83 +1,85 @@
 PORTNAME=	proxysql
 PORTVERSION=	3.0.6
+DISTVERSIONPREFIX=	v
 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="${PORTVERSION}" SOURCE_DATE_EPOCH="$$(date +%s)"
+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/distinfo b/databases/proxysql/distinfo
index 1c1c7b2fb640..c2f1f6a3d663 100644
--- a/databases/proxysql/distinfo
+++ b/databases/proxysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773849369
-SHA256 (sysown-proxysql-3.0.6_GH0.tar.gz) = a56fc549406dcc6c525f5757f60e9b68a7df8b513f8042f5d9fdcd839f270d30
-SIZE (sysown-proxysql-3.0.6_GH0.tar.gz) = 62876841
+TIMESTAMP = 1774033903
+SHA256 (sysown-proxysql-v3.0.6_GH0.tar.gz) = 5002fc58b9d6417992426c85818858bd95237d1a1ba8207766363d32f72b5705
+SIZE (sysown-proxysql-v3.0.6_GH0.tar.gz) = 64368152
diff --git a/databases/proxysql/files/patch-lib_log__utils.cpp b/databases/proxysql/files/patch-lib_log__utils.cpp
new file mode 100644
index 000000000000..601c90eac15c
--- /dev/null
+++ b/databases/proxysql/files/patch-lib_log__utils.cpp
@@ -0,0 +1,11 @@
+--- lib/log_utils.cpp.orig	2026-03-20 19:38:59 UTC
++++ lib/log_utils.cpp
+@@ -112,7 +112,7 @@ LogBufferThreadContext::LogBufferThreadContext() : dis
+ 	std::seed_seq seed{
+ 		rd(),
+ 		static_cast<unsigned>(std::chrono::high_resolution_clock::now().time_since_epoch().count()),
+-		static_cast<unsigned>(pthread_self())
++		static_cast<unsigned>(reinterpret_cast<uintptr_t>(pthread_self()))
+ 	};
+ 	rng.seed(seed);
+ }
diff --git a/databases/proxysql/files/patch-lib_proxysql__utils.cpp b/databases/proxysql/files/patch-lib_proxysql__utils.cpp
index f79704dcd047..c14c8052a531 100644
--- a/databases/proxysql/files/patch-lib_proxysql__utils.cpp
+++ b/databases/proxysql/files/patch-lib_proxysql__utils.cpp
@@ -1,16 +1,13 @@
---- lib/proxysql_utils.cpp.orig	2026-01-16 09:33:05 UTC
+--- lib/proxysql_utils.cpp.orig	2026-03-20 19:16:36 UTC
 +++ lib/proxysql_utils.cpp
-@@ -19,7 +19,13 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <sys/syscall.h>
-+#ifdef __linux__
+@@ -23,6 +23,10 @@
+ #ifdef __linux__
  #include <linux/close_range.h>
-+#endif
+ #endif
 +#ifdef __FreeBSD__
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#endif
  
  using std::function;
  using std::string;