diff --git a/databases/keydb/Makefile b/databases/keydb/Makefile
index 71867fc68e0c..d70c0f33afb0 100644
--- a/databases/keydb/Makefile
+++ b/databases/keydb/Makefile
@@ -1,90 +1,89 @@
 PORTNAME=	keydb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.3.3
+DISTVERSION=	6.3.4
 CATEGORIES=	databases
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	High performance fork of Redis--a persistent key-value database
 WWW=		https://docs.keydb.dev/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libzstd.so:archivers/zstd
 
-USES=		compiler:c11 cpe gmake pkgconfig:build
+USES=		compiler:c11 cpe gmake localbase:ldflags pkgconfig:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Snapchat
 GH_PROJECT=	KeyDB
 USE_RC_SUBR=	keydb keydb_sentinel
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -lm -lexecinfo -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread -lm -lexecinfo
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		KEYDB_DBDIR=${KEYDB_DBDIR} \
 		KEYDB_LOGDIR=${KEYDB_LOGDIR} \
 		KEYDB_RUNDIR=${KEYDB_RUNDIR} \
 		KEYDB_USER=${USERS}
 
 USERS=		keydb
 GROUPS=		keydb
 
 PLIST_SUB=	KEYDB_DBDIR=${KEYDB_DBDIR} \
 		KEYDB_GROUP=${GROUPS} \
 		KEYDB_LOGDIR=${KEYDB_LOGDIR} \
 		KEYDB_RUNDIR=${KEYDB_RUNDIR} \
 		KEYDB_USER=${USERS}
 
-OPTIONS_DEFINE=		TLS
-OPTIONS_DEFAULT=	TLS
+OPTIONS_DEFINE=	TLS
+OPTIONS_DEFAULT=TLS
 
 TLS_DESC=	Use TLS (openssl req.)
 
-TLS_USES=		ssl
-TLS_MAKE_ENV=		BUILD_TLS=yes
+TLS_USES=	ssl
+TLS_MAKE_ENV=	BUILD_TLS=yes
 
 BIN_FILES=	keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
 		keydb-sentinel keydb-server
 
 KEYDB_DBDIR?=	/var/db/keydb
 KEYDB_RUNDIR?=	/var/run/keydb
 KEYDB_LOGDIR?=	/var/log/keydb
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 && !${CFLAGS:M-march=*}
 # Needed for __atomic_fetch_add_8
 USE_GCC=	yes
 CFLAGS+=	-march=i586
 .endif
 
 .if defined(_ADDFLAGS)
 CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-E
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/src/Makefile
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/keydb.conf > ${WRKDIR}/keydb.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/keydb.conf ${STAGEDIR}${PREFIX}/etc/keydb.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/keydb_sentinel.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYDB_LOGDIR} \
 		${STAGEDIR}${KEYDB_DBDIR} \
 		${STAGEDIR}${KEYDB_RUNDIR}
 
 .include <bsd.port.post.mk>
diff --git a/databases/keydb/distinfo b/databases/keydb/distinfo
index b858103764f4..afd69f927fce 100644
--- a/databases/keydb/distinfo
+++ b/databases/keydb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698245036
-SHA256 (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = c6798cea3fe4ba4d1b42eea6ca2cfaee261786d12bf30aef1a53211d25ab66d9
-SIZE (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = 11541110
+TIMESTAMP = 1698955833
+SHA256 (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3
+SIZE (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 5942328
diff --git a/databases/keydb/files/patch-src-Makefile b/databases/keydb/files/patch-src-Makefile
index 4703d6eb6daf..c88dc47461f5 100644
--- a/databases/keydb/files/patch-src-Makefile
+++ b/databases/keydb/files/patch-src-Makefile
@@ -1,52 +1,37 @@
---- src/Makefile.orig	2023-10-25 15:47:51 UTC
+--- src/Makefile.orig	2023-11-02 20:13:44 UTC
 +++ src/Makefile
-@@ -138,21 +138,11 @@ endif	
+@@ -138,7 +138,6 @@ endif	
  # Override default settings if possible
  -include .make-settings
  
 -DEBUG=-g -ggdb
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
  FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
- FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
- 
--ifneq ($(uname_S),Darwin)
--	FINAL_LIBS+=-latomic
--endif
--# Linux ARM32 needs -latomic at linking time
--ifneq (,$(findstring armv,$(uname_M)))
--	FINAL_LIBS+=-latomic
--endif
--
--
- ifeq ($(uname_S),SunOS)
- 	# SunOS
- 	ifeq ($(findstring -m32,$(FINAL_CFLAGS)),)
-@@ -211,7 +201,9 @@ ifeq ($(uname_S),NetBSD)
- else
+@@ -214,9 +213,6 @@ else
  ifeq ($(uname_S),FreeBSD)
  	# FreeBSD
--	FINAL_LIBS+= -lpthread -lexecinfo
-+	FINAL_LIBS+= -lpthread -lexecinfo -luuid
-+	FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+	FINAL_LDFLAGS= $(LDFLAGS) -pthread
- else
- ifeq ($(uname_S),DragonFly)
- 	# DragonFly
-@@ -347,7 +339,7 @@ else
+ 	FINAL_LIBS+= -lpthread -luuid -lexecinfo
+-	FINAL_CFLAGS+= -I/usr/local/include
+-	FINAL_CXXFLAGS+= -I/usr/local/include
+-	FINAL_LDFLAGS+= -L/usr/local/lib
+ 	ifeq ($(USE_BACKTRACE),yes)
+ 	    FINAL_CFLAGS+= -DUSE_BACKTRACE
+ 	endif
+@@ -355,7 +351,7 @@ else
  endif
  
  # Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind.
 -OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
 +OS := $(shell uname -r)
  ifeq ($(OS),alpine)
-     FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY -DALPINE
-     FINAL_LIBS += -lunwind
-@@ -417,7 +409,6 @@ persist-settings: distclean
+     FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
+ 	FINAL_CXXFLAGS+=-DALPINE
+@@ -426,7 +422,6 @@ persist-settings: distclean
  	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
  	echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings
  	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
 -	-(cd modules && $(MAKE))
  	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
  
  .PHONY: persist-settings