diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 95b4bb22b73f..2850e9a52eab 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,111 +1,108 @@
 # Created by: futatuki
 
-PORTNAME?=	cdrdao
+PORTNAME=	cdrdao
 PORTVERSION=	1.2.4
-PORTREVISION?=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF/cdrdao
 DISTNAME=	cdrdao-${PORTVERSION}
 
 MAINTAINER=	marius@FreeBSD.org
 COMMENT?=	Record CD-R[W]s in disk-at-once mode
 
 LICENSE=	GPLv2
 
 BROKEN_riscv64=	../include/mconfig.h:86:2: error: Architecture not defined here
 
 USES=		alias compiler:c++11-lang gmake tar:bzip2
 GNU_CONFIGURE=	yes
 USE_CXXSTD=	c++11
 
-MP3OGG_LIB_DEPENDS=	libao.so:audio/libao \
-			libmad.so:audio/libmad \
-			libvorbis.so:audio/libvorbis
-
-.if ${PORTNAME} == "cdrdao"
 OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
 
 OPTIONS_DEFAULT=	MP3OGG
 MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
 TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 
 .include <bsd.port.options.mk>
-.endif
 
 CONFIGURE_ARGS+=	--with-gcdmaster=no
 .if ${PORT_OPTIONS:MTOC2MP3}
 LIB_DEPENDS+=		libmp3lame.so:audio/lame
 CONFIGURE_ARGS+=	--disable-lame-test \
 			--with-lame-include=${LOCALBASE}/include \
 			--with-lame-lib=${LOCALBASE}/lib
 PLIST_SUB+=		TOC2MP3=""
 .else
 CONFIGURE_ARGS+=	--with-lame=no
 PLIST_SUB+=		TOC2MP3="@comment "
 .endif
 .if ${PORT_OPTIONS:MMP3OGG}
 USES+=			pkgconfig
-LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS}
+LIB_DEPENDS+=		libao.so:audio/libao \
+			libmad.so:audio/libmad \
+			libvorbis.so:audio/libvorbis
+
 CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
 			AO_LIBS="-L${LOCALBASE}/lib -lao" \
 			MAD_CFLAGS=-I${LOCALBASE}/include \
 			MAD_LIBS="-L${LOCALBASE}/lib -lmad" \
 			VORBISFILE_CFLAGS=-I${LOCALBASE}/include \
 			VORBISFILE_LIBS="-L${LOCALBASE}/lib -lvorbisfile"
 .else
 CONFIGURE_ARGS+=	--with-mp3-support=no --with-ogg-support=no
 .endif
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--without-pcctsbin --without-pcctsinc \
 			--with-posix-threads=no --with-scglib
 MAKE_ENV+=		CCOM=cc
 SCSILIBXARCH!=		${UNAME} -m
 
 post-extract:
 	@(cd ${WRKSRC}/scsilib/RULES && ${CP} -p os-freebsd.id os-dragonfly.id)
 .if ${SCSILIBXARCH} != "i386"
 	@${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
 		${WRKSRC}/scsilib/RULES/${SCSILIBXARCH}-${OPSYS:tl}-cc.rul
 .endif
 
 post-patch:
 .for i in 45libdeflt 45libedc 45libfile 45libhfs_iso 45libparanoia 45libunls \
 	45librscg 55cdda2wav 55cdrecord 55cmd 55mkisofs 55mkisofs!@!diag \
 	55readcd 55scgcheck 55scgskeleton 55rscsi 85man
 	@${RM} ${WRKSRC}/scsilib/TARGETS/${i}
 .endfor
 .for i in cdrdao.man main.cc
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
 .endfor
 	@${REINPLACE_CMD} -E -e 's|(^CDRDAO_DATA_DIR.+=).+|\1 ${DATADIR}|' \
 		${WRKSRC}/dao/Makefile.in
 .for i in toc2cddb.1 toc2cue.1
 	@${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \
 		${STAGEDIR}${PREFIX}/man/man1/cdrdao.1
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${STAGEDIR}${PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers \
 		${STAGEDIR}${DATADIR}/drivers
 
 do-install-TOC2MP3-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CREDITS ChangeLog README README.PlexDAE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/cdrdao/files/patch-dao_cdrdao.man b/sysutils/cdrdao/files/patch-dao_cdrdao.man
index 3a99f83ae347..625e0afa497b 100644
--- a/sysutils/cdrdao/files/patch-dao_cdrdao.man
+++ b/sysutils/cdrdao/files/patch-dao_cdrdao.man
@@ -1,24 +1,35 @@
 --- dao/cdrdao.man.orig	2018-05-16 10:46:39 UTC
 +++ dao/cdrdao.man
-@@ -798,13 +798,9 @@ following locations. The files will be r
+@@ -798,15 +798,11 @@ following locations. The files will be read on startup
  .I cdrdao
  in that order:
  
 -1. /etc/cdrdao.conf
--
--2. /etc/defaults/cdrdao
--
--3. /etc/default/cdrdao
 +1. %%PREFIX%%/etc/cdrdao.conf
  
--4. $HOME/.cdrdao
+-2. /etc/defaults/cdrdao
 +2. $HOME/.cdrdao
  
+-3. /etc/default/cdrdao
  
+-4. $HOME/.cdrdao
+-
+-
  Command line options will overwrite the loaded settings.
-@@ -886,4 +882,4 @@ resources may not be released. Use ipcs(
+ The settings file contains name - value pairs separated by a
+ colon. String values must be enclosed by ". The file is
+@@ -876,7 +872,7 @@ Directory where temporary WAV files will be created fr
+ .LP
+ .SH BUGS
+ If the program is terminated during the write/simulation process used IPC
+-resources may not be released. Use ipcs(8) and ipcrm(8) to delete them.
++resources may not be released. Use ipcs(1) and ipcrm(1) to delete them.
+ .SH AUTHOR
+ .ft CW
+ .nf
+@@ -886,4 +882,4 @@ resources may not be released. Use ipcs(8) and ipcrm(8
  .ft R
  .fi
  .SH SEE ALSO
 -.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8) 
-+.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) 
++.BR "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1)
diff --git a/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
index fc1ed1dbf7db..66da9d4293b1 100644
--- a/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
+++ b/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
@@ -1,32 +1,34 @@
 --- scsilib/RULES/i386-freebsd-cc.rul.orig	2002-10-15 20:43:39 UTC
 +++ scsilib/RULES/i386-freebsd-cc.rul
 @@ -24,7 +24,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
  ###########################################################################
  
  CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
 -CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
 +XCFLAGS:=	$(CFLAGS)
 +CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
  
  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
  COPTS=
-@@ -57,14 +58,14 @@ LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGE
+@@ -57,14 +58,14 @@ LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
  
  FLOAT_OPTIONS=	
  
 -CC=		@echo "	==> COMPILING \"$@\""; gcc
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
 -RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
 +CCCOM=		$(CC)
 +LDCC=		$(CCCOM)
 +DYNLD=		$(CCCOM)
 +RANLIB=		ranlib
  ARFLAGS=	cr
- LORDER=		lorder
- TSORT=		tsort
+-LORDER=		lorder
+-TSORT=		tsort
++LORDER=		echo
++TSORT=		cat
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
 +MKDEP=		$(CCCOM) -M
  MKDEP_OUT=
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index 63a04182b4e6..be2ca724326c 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -1,15 +1,15 @@
 bin/cdrdao
 bin/cue2toc
 bin/toc2cddb
 bin/toc2cue
 %%TOC2MP3%%bin/toc2mp3
-@unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
+@postunexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
 man/man1/cdrdao.1.gz
 man/man1/cue2toc.1.gz
 man/man1/toc2cddb.1.gz
 man/man1/toc2cue.1.gz
 %%DATADIR%%/drivers
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE