diff --git a/databases/xtrabackup80/Makefile b/databases/xtrabackup80/Makefile
index 7815c90e5e5e..7004a9812a23 100644
--- a/databases/xtrabackup80/Makefile
+++ b/databases/xtrabackup80/Makefile
@@ -1,112 +1,112 @@
 PORTNAME=	xtrabackup80
 PORTVERSION=	8.0.35
 DISTVERSIONSUFFIX=	-30
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.35-30/source/tarball/:percona \
 		SF/boost/boost/${BOOST_VERSION}:boost
 DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \
 		boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost
 
 MAINTAINER=	eugene@zhegan.in
 COMMENT=	Open-source backup tool for InnoDB and XtraDB
 WWW=		https://docs.percona.com/percona-xtrabackup/8.0/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	qpress:archivers/qpress
 
 USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
 CPE_VENDOR=	percona
 CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
 		-DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \
 		-DWITH_VERSION_CHECK=false
 
 CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
 
 # Bundle last supported Boost release
 BOOST_VERSION=	1.77.0
 BOOST_VERSION_UNDER=	${BOOST_VERSION:C/\./_/g}
 
 CMAKE_ARGS+=	-DWITH_BOOST=${WRKDIR}/boost_${BOOST_VERSION_UNDER}
 
 # Build fails without NDEBUG, so force it
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
 PPORTNAME=	percona-xtrabackup
 WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
 
 .include <bsd.port.pre.mk>
 
 # Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator
 # which is broken on i386 with Clang due to different size of types
 # and causes a 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
 .if ${ARCH} == i386
 GCCVER=		13
 CC=		${PREFIX}/bin/gcc${GCCVER}
 CXX=		${PREFIX}/bin/g++${GCCVER}
 CPP=		${PREFIX}/bin/cpp${GCCVER}
 CXXFLAGS+=	--std=c++17 -march=i586
 LDFLAGS_i386=	-latomic -Wl,-rpath=${PREFIX}/lib/gcc${GCCVER} -Wl,-rpath=${PREFIX}/lib/private
 PLIST=		${PKGDIR}/pkg-plist.i386
 USE_LDCONFIG=	${PREFIX}/lib/private
 
-BUILD_DEPENDS=	c++${GCCVER}:lang/gcc${GCCVER}
-LIB_DEPENDS=	libcurl.so:ftp/curl \
+BUILD_DEPENDS+=	c++${GCCVER}:lang/gcc${GCCVER}
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libunwind.so:devel/libunwind
 
-RUN_DEPENDS=	${PREFIX}/lib/gcc${GCCVER}/libatomic.so.1:lang/gcc${GCCVER}
+RUN_DEPENDS+=	${PREFIX}/lib/gcc${GCCVER}/libatomic.so.1:lang/gcc${GCCVER}
 
 .for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
 CMAKE_ARGS+=	-DWITH_${component}:STRING=bundled
 .endfor
 .else
-BUILD_DEPENDS=	protobuf>=3.0:devel/protobuf \
+BUILD_DEPENDS+=	protobuf>=3.0:devel/protobuf \
 		rapidjson>=1.1.0:devel/rapidjson \
 		libevent>=2.1:devel/libevent
-LIB_DEPENDS=	libcurl.so:ftp/curl \
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libicudata.so:devel/icu \
 		libprotobuf-lite.so:devel/protobuf \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 
 .for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
 CMAKE_ARGS+=	-DWITH_${component}:STRING=system
 .endfor
 
 KEEP_EXTRA=	lz4 robin-hood-hashing zlib
 
 pre-configure:
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKSRC}/extra/${dir} ${WRKDIR}
 .endfor
 	@${RM} -r ${WRKSRC}/extra/*
 .for dir in ${KEEP_EXTRA}
 	@${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra
 .endfor
 .endif
 
 post-patch:
 .for d in storage/innobase/xtrabackup/src sql/protobuf
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
 .endfor
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
 		${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
 .endif
 
 post-stage:
 	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
 
 .include <bsd.port.post.mk>