diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 9bcc5a62a116..b968d34fd8a1 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	cdrdao
 DISTVERSION=	1_2_5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/rel_${DISTVERSION}/ \
 		SF/${PORTNAME}/rel_${DISTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Record CD-R[W]s in disk-at-once mode
 WWW=		https://cdrdao.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		alias autoreconf compiler:c++11-lang gmake iconv localbase tar:bzip2
 USE_CXXSTD=	c++11
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-gcdmaster=no \
 		--without-pcctsbin \
 		--without-pcctsinc \
 		--with-posix-threads=no \
 		--with-scglib
 
 OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
 OPTIONS_DEFAULT=	MP3OGG
 OPTIONS_SUB=		yes
 
 MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
 MP3OGG_LIB_DEPENDS=	libao.so:audio/libao \
 			libmad.so:audio/libmad \
 			libvorbis.so:audio/libvorbis
 MP3OGG_USES=		pkgconfig
 MP3OGG_CONFIGURE_OFF=	--with-mp3-support=no --with-ogg-support=no
 
 TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 TOC2MP3_LIB_DEPENDS=	libmp3lame.so:audio/lame
 TOC2MP3_CONFIGURE_OFF=	--with-lame=no
 
 post-patch:
 .for i in cdrdao.man main.cc
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
 .endfor
 .for i in toc2cddb.1 toc2cue.1
 	@${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CREDITS ChangeLog README README.PlexDAE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
new file mode 100644
index 000000000000..6b39efbe9ab9
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
@@ -0,0 +1,29 @@
+--- dao/ScsiIf-freebsd-cam.cc.orig	2023-01-25 14:30:35 UTC
++++ dao/ScsiIf-freebsd-cam.cc
+@@ -112,11 +112,11 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL
+ {
+ 	int		retval;
+ 	int		flags = CAM_DIR_NONE;
+-	u_int8_t *	data_ptr;
+-	size_t		data_len;
++	u_int8_t *	data_ptr = NULL;
++	size_t		data_len = 0;
+ 
+-	bzero(impl_->ccb, sizeof(union ccb));
+-	bcopy(cmd, &impl_->ccb->csio.cdb_io.cdb_bytes, cmdLen);
++	memset(impl_->ccb, 0, sizeof(union ccb));
++	memmove(&impl_->ccb->csio.cdb_io.cdb_bytes, cmd, cmdLen);
+ 
+ 	if (dataOut && dataOutLen > 0) {
+ 		data_ptr = (u_int8_t*) dataOut;
+@@ -176,8 +176,8 @@ int ScsiIf::inquiry()
+ 	int i;
+ 	struct scsi_inquiry_data inq_data;
+ 
+-	bzero(impl_->ccb, sizeof(union ccb));
+-	bzero(&inq_data, sizeof(inq_data));
++	memset(impl_->ccb, 0, sizeof(union ccb));
++	memset(&inq_data, 0, sizeof(inq_data));
+ 
+ 	scsi_inquiry(&impl_->ccb->csio,
+ 		     DEF_RETRY_COUNT,
diff --git a/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc b/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc
new file mode 100644
index 000000000000..7b8da328df14
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc
@@ -0,0 +1,11 @@
+--- trackdb/FormatMp3.cc.orig	2023-02-03 14:46:06 UTC
++++ trackdb/FormatMp3.cc
+@@ -111,7 +111,7 @@ FormatSupport::Status FormatMp3::madInit()
+ 
+   // Initialize libao for WAV output;
+   ao_sample_format out_format;
+-  bzero(&out_format, sizeof(out_format));
++  memset(&out_format, 0, sizeof(out_format));
+   out_format.bits = 16;
+   out_format.rate = 44100;
+   out_format.channels = 2;