diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index a18ba32e5aa5..c1c34429f4ca 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -1,222 +1,222 @@
 # $FreeBSD$
 
 ###########################################################################
 # This makefile was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	3.02a07
+PORTVERSION=	3.02a09
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF/${PORTNAME}/alpha
 
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	CD/DVD/BluRay and ISO-9660 image creation and extraction tools
 
 LICENSE=	BSD2CLAUSE CDDL GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 CONFLICTS=	cdrkit-* cdrtools-[0-9]* cjk-cdrtools-*
 
 DOCS=		README.FreeBSD README.mkisofs
 CDDA2WAVDOCS=	FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
 CDRECORDDOCS=	README README.ATAPI README.DiskT@2 README.WORM README.audio \
 		README.cdplus README.cdrw README.cdtext README.clone \
 		README.copy README.multi README.raw README.rscsi README.sony \
 		README.verify
 MKISOFSDOCS=	README README.compression README.eltorito README.graft_dirs \
 		README.hfs_boot README.hfs_magic README.hide README.joliet \
 		README.macosx README.mkhybrid README.prep_boot README.rootinfo \
 		README.session README.sort README.sparcboot README.sunx86boot
 SICONVTABLES=	cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \
 		cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
 		cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \
 		cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \
 		iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
 		iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \
 		iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u
 
 USES=		gmake tar:bzip2
 #CFLAGS+=	-DSOURCE_MODIFIED
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a(.+)$//}
 SUB_FILES=	pkg-message
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	CDDA2MP3 CDDA2OGG DOCS NLS RSCSI
 
 CDDA2MP3_DESC=	Build cdda2mp3 (requires audio/lame)
 CDDA2OGG_DESC=	Build cdda2ogg (requires audio/vorbis-tools)
 RSCSI_DESC=	Build rscsi suid root remote SCSI access daemon
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCDDA2MP3}
 PLIST_SUB+=	CDDA2MP3=""
 RUN_DEPENDS+=	lame:audio/lame
 .else
 PLIST_SUB+=	CDDA2MP3="@comment "
 .endif
 .if ${PORT_OPTIONS:MCDDA2OGG}
 PLIST_SUB+=	CDDA2OGG=""
 RUN_DEPENDS+=	oggenc:audio/vorbis-tools
 .else
 PLIST_SUB+=	CDDA2OGG="@comment "
 .endif
 .if ${PORT_OPTIONS:MRSCSI}
 PKGINSTALL=	${PKGDIR}/pkg-install.rscsi
 PLIST_SUB+=	RSCSI=""
 PKGNAMESUFFIX=	-rscsi-devel
 .else
 PLIST_SUB+=	RSCSI="@comment "
 .endif
 PKGNAMESUFFIX?=	-devel
 
 MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
 		INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH}-${OPSYS:tl}-cc
 CDRTLSXARCH!=	${UNAME} -m
 
 .if exists(/usr/include/iconv.h)
 USES+=		iconv
 .endif
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
 MAKE_ENV+=	DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib
 USES+=		gettext iconv
 .endif
 
 post-extract:
 .for i in config.guess config.sub
 .for j in autoconf conf cdda2wav
 	@${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j}
 .endfor
 .endfor
 .if ${CDRTLSXARCH} != "i386"
 	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
 		${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
 .if !${PORT_OPTIONS:MRSCSI}
 	@${RM} ${WRKSRC}/TARGETS/55rscsi
 .endif
 .for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \
 	cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \
 	cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \
 	libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \
 	rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1
 	@${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \
 		s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \
 		s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \
 		s|^CDDA2WAV=|&${PREFIX}\/bin\/|g; \
 		s|^MP_CODER=|&${LOCALBASE}\/bin\/|g' ${WRKSRC}/${i}
 .endfor
 	@${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \
 		${WRKSRC}/libparanoia/js_cdda_paranoia.h
 .for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \
 	libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c
 	@${REINPLACE_CMD} -e 's|cdda_paranoia\.h|js_cdda_paranoia.h|g' \
 		${WRKSRC}/${i}
 .endfor
 #	@${REINPLACE_CMD} -E -e \
 #		's|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE|& "${MAINTAINER}"|' \
 #		${WRKSRC}/cdrecord/cdrecord.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
 		${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MCDDA2MP3}
 	${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \
 		${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1
 .endif
 .if ${PORT_OPTIONS:MCDDA2OGG}
 	${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -sf cdda2wav ${STAGEDIR}${PREFIX}/bin/list_audio_tracks
 	${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/${CDRTLSTARGET}/cdrecord \
 		${STAGEDIR}${PREFIX}/bin
 .for i in devdump isodebug isodump isoinfo isovfy
 	${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${CDRTLSTARGET}/${i} \
 		${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${CDRTLSTARGET}/mkisofs \
 		${STAGEDIR}${PREFIX}/bin
 	${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid
 	${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \
 		${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MRSCSI}
 	${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \
 		${STAGEDIR}${PREFIX}/sbin
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MRSCSI}
 	@${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 	${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \
 		${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
 		${STAGEDIR}${PREFIX}/etc/cdrecord.sample
 .if !exists(${STAGEDIR}${PREFIX}/etc/cdrecord)
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl \
 		${STAGEDIR}${PREFIX}/etc/cdrecord
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/siconv
 .for i in ${SICONVTABLES}
 	${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \
 		${STAGEDIR}${PREFIX}/lib/siconv
 .endfor
 .if ${PORT_OPTIONS:MRSCSI}
 	${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \
 		${STAGEDIR}${PREFIX}/etc/rscsi.sample
 .if !exists(${STAGEDIR}${PREFIX}/etc/rscsi)
 	${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${STAGEDIR}${PREFIX}/etc/rscsi
 .endif
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/cdda2wav
 .for i in ${CDDA2WAVDOCS}
 	${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${STAGEDIR}${DOCSDIR}/cdda2wav
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/cdrecord
 .for i in ${CDRECORDDOCS}
 	${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${STAGEDIR}${DOCSDIR}/cdrecord
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/mkisofs
 .for i in ${MKISOFSDOCS}
 	${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${STAGEDIR}${DOCSDIR}/mkisofs
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 367ef34b7892..eab66b250425 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482864063
-SHA256 (cdrtools-3.02a07.tar.bz2) = 49c1a67fa7ad3d7c0b05d41d18cb6677b40d4811faba111f0c01145d3ef0491b
-SIZE (cdrtools-3.02a07.tar.bz2) = 2127058
+TIMESTAMP = 1526292215
+SHA256 (cdrtools-3.02a09.tar.bz2) = aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81
+SIZE (cdrtools-3.02a09.tar.bz2) = 2156745
diff --git a/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd b/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd
similarity index 89%
rename from sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd
rename to sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd
index 5e08bb8ff554..116baad30d75 100644
--- a/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd
+++ b/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd
@@ -1,30 +1,30 @@
 ###########################################################################
 # This patch was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- DEFAULTS/Defaults.freebsd.orig	2013-11-04 21:58:20.000000000 +0100
-+++ DEFAULTS/Defaults.freebsd	2014-02-03 01:16:19.000000000 +0100
-@@ -29,8 +29,8 @@
+--- DEFAULTS/Defaults.freebsd.orig	2013-11-04 20:58:20 UTC
++++ DEFAULTS/Defaults.freebsd
+@@ -29,8 +29,8 @@ DEFLINKMODE=	static
  CWARNOPTS=
  
  DEFINCDIRS=	$(SRCROOT)/include
 -DEFOSINCDIRS=	/usr/local/include
 -LDPATH=		-L/opt/schily/lib -L/usr/local/lib
 +#DEFOSINCDIRS=	/usr/local/include
 +#LDPATH=		-L/opt/schily/lib -L/usr/local/lib
  #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)	Will probably not work
  
  ###########################################################################
diff --git a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul b/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul
similarity index 94%
rename from sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
rename to sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul
index 549d244d4e4d..6762c784a475 100644
--- a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
+++ b/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul
@@ -1,88 +1,87 @@
 ###########################################################################
 # This patch was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- RULES/cc-gcc.rul.orig	Thu Jul  6 12:59:44 2006
-+++ RULES/cc-gcc.rul	Sat Jul 22 03:55:52 2006
+--- RULES/cc-gcc.rul.orig	2017-05-28 21:47:50 UTC
++++ RULES/cc-gcc.rul
 @@ -24,11 +24,12 @@
  GCC_OPT=
  GCC_OPT32=	-m32
  GCC_OPT64=	-m64
 -GCC_OPTXX=	$(GCC_OPT$(C_ARCH:gcc%=%))
 +GCC_OPTXX=
  
  CPPFLAGS=	-DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX)
 -CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
 -C++FLAGS=	$(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
 +XCFLAGS:=	$(CFLAGS)
 +CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
 +C++FLAGS=	$(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX)
  
  CPPOPTS=	-I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%)
  COPTS=		$(GCC_OPTXX)
-@@ -36,12 +37,10 @@
+@@ -36,12 +37,10 @@ COPTS=		$(GCC_OPTXX)
  CWOPTS=		-Wall -Wtraditional
  CWOPTS=		-Wall -Wno-unknown-pragmas \
  		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
 -COPTOPT=	-O
  COPTDYN=	-fpic
  COPTGPROF=	-pg
  C++OPTS=	$(GCC_OPTXX)
  C++WOPTS=	$(CWOPTS)
 -C++OPTOPT=	$(COPTOPT)
  C++OPTDYN=	-fpic
  C++OPTGPROF=	-pg
  
-@@ -61,28 +60,18 @@
+@@ -63,28 +62,18 @@ LNDYNLIB=	@$(RM) $(RM_FORCE) $(PTARGET_B
  
  FLOAT_OPTIONS=	
  
 -__CC_COM=	$(_UNIQ)$(CC)
 -___CC_COM=	$(__CC_COM:$(_UNIQ)=$(CC_COM_DEF))
 -CC_COM=		$(___CC_COM:$(_UNIQ)%=%)
 -
 -__CC++_COM=	$(_UNIQ)$(CCC)
 -___CC++_COM=	$(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF))
 -CC++_COM=	$(___CC++_COM:$(_UNIQ)%=%)
 -
 -CC_COM_DEF=	gcc
 -CC++_COM_DEF=	g++
 -CC=		$(CC_COM_DEF)
 -CCC=		$(CC++_COM_DEF)
--
++CC_COM=		$(CC)
++CC++_COM=	$(CXX)
+ 
 -CCCC=		@echo "	==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX)
 -CC++ =		@echo "	==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX)
 -LDCC=		@echo "	==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX)
 -LDCC++ =	@echo "	==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX)
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX)
 -DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX)
-+CC_COM=		$(CC)
-+CC++_COM=	$(CXX)
-+
 +CCCC =		$(CC_COM)
 +CC++ =		$(CC++_COM)
 +LDCC=		$(CC_COM)
 +LDCC++ =	$(CC++_COM)
 +DYNLD=		$(CC_COM)
 +DYNLDC++ =	$(CC++_COM)
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -M
 +MKDEP=		$(CC_COM) -M
  MKDEP_OUT=
 -MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) $(GCC_OPTXX) -M
 +MKC++DEP=	$(CC++_COM) -M
  MKC++DEP_OUT=
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
deleted file mode 100644
index c8b30d32f974..000000000000
--- a/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
+++ /dev/null
@@ -1,10 +0,0 @@
---- btcflash/btcflash.1.orig	Wed Feb  8 23:13:24 2006
-+++ btcflash/btcflash.1	Thu Feb 16 14:54:32 2006
-@@ -293,7 +293,6 @@
- login shell.
- .SH "SEE ALSO"
- .BR cdrecord (1),
--.BR scg (7),
- .BR rcmd (3),
- .BR ssh (1).
- .SH NOTES
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1
new file mode 100644
index 000000000000..3b94063221d0
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1
@@ -0,0 +1,10 @@
+--- btcflash/btcflash.1.orig	2016-01-26 21:46:49 UTC
++++ btcflash/btcflash.1
+@@ -353,7 +353,6 @@ using an account that has been created w
+ login shell.
+ .SH "SEE ALSO"
+ .BR cdrecord (1),
+-.BR scg (7),
+ .BR rcmd (3),
+ .BR ssh (1).
+ .SH NOTES
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi b/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
similarity index 89%
rename from sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi
rename to sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
index 9398843e937a..03277e4e065f 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
@@ -1,36 +1,36 @@
---- cdrecord/README.rscsi.orig	Sun Aug 17 11:31:39 2003
-+++ cdrecord/README.rscsi	Sun Aug 17 14:38:57 2003
-@@ -18,24 +18,21 @@
+--- cdrecord/README.rscsi.orig	2004-05-19 14:12:05 UTC
++++ cdrecord/README.rscsi
+@@ -18,24 +18,21 @@ There are three possible ways to control
  		NOTE: In this case, rscsi must be installed suid root. 
  		**** This is the preferred method ****
  
 -To enable remote SCSI via the login shell method you should do the following:
 -
 -	-	Add an entry to /etc/passwd in the form:
+-
+-		rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
 +		The FreeBSD port automatically installs the rscsi binary suid
 +		root and creates the user "rscsi".
  
--		rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
--
 -		(modify this according to your OS). And don't forget to
 -		modify /etc/shadow the way it needs to be on your OS.
 +To enable remote SCSI via the login shell method you should do the following:
  
 -	-	Create a  home directory for this user and add a .rhosts file
 -		to allow access to all users you like.
 +	-	Make sure that there is an entry for rshd(8) in /etc/inetd.conf
 +		and inetd(8) is running.
  
 -	-	Install rscsi suid root into /opt/schily/sbin
 +	-	Edit /usr/local/rscsi/.rhosts to allow access to all users you
 +		like.
  
 -	-	Install a file /etc/default/rscsi and define access rights.
 +	-	Edit /usr/local/etc/rscsi and define access rights.
  		Without this file, rscsi will not work at all.
  
 -		The template for this file is: rscsi/rscsi.dfl
 +		The template for this file is: /usr/local/etc/rscsi.sample
  
  RSCSI Security:
  
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
similarity index 88%
rename from sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1
rename to sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
index 88dc6bf0398f..2ada85f584d1 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
@@ -1,28 +1,28 @@
 ###########################################################################
 # This patch was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- cdrecord/cdrecord.1.orig	Mon Sep 29 14:48:48 2003
-+++ cdrecord/cdrecord.1	Mon Sep 29 14:49:23 2003
-@@ -1738,8 +1738,6 @@
+--- cdrecord/cdrecord.1.orig	2017-09-21 14:11:50 UTC
++++ cdrecord/cdrecord.1
+@@ -3169,8 +3169,6 @@ There must be at least one track per fil
  .SH SEE ALSO
  .BR cdda2wav (1),
  .BR readcd (1),
 -.BR scg (7),
 -.BR fbk (7),
  .BR mkisofs (8),
  .BR rcmd (3),
  .BR ssh (1).
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
similarity index 94%
rename from sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl
rename to sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
index 859f92768c34..85aceeb63486 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
@@ -1,64 +1,64 @@
---- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
-+++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
+--- cdrecord/cdrecord.dfl.orig	2014-01-03 21:59:27 UTC
++++ cdrecord/cdrecord.dfl
 @@ -3,7 +3,7 @@
  # This file is /etc/default/cdrecord
  # It contains defaults that are used if no command line option
  # or environment is present.
 -# 
 +#
  # The default device, if not specified elswhere
  # Note that since Sommer 2006, cdrecord by default searches for a
  # single CD-ROM device. You should set CDR_DEVICE= together with
 @@ -11,15 +11,14 @@
  # one CR-ROM drive in your system.
  #
  #CDR_DEVICE=yamaha
 -#CDR_DEVICE=default
  
 -# 
 +#
  # The default speed (speed=), if not specified elswhere
  #
  # Note that newer cdrecord versions do not default
  # to speed=1. For MMC compliant drives, the default
  # is to write at maximum speed, so it in general does
 -# not make sense to set up a default speed in /etc/default/cdrecord 
 +# not make sense to set up a default speed in /etc/default/cdrecord
  #
  #CDR_SPEED=40
  
 @@ -34,7 +33,7 @@
  # Linux and Solaris have problems with bigger transfer sizes.
  # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k
  #
 -#CDR_TRANSFERSIZE=32k
 +CDR_TRANSFERSIZE=126k
  
  #
  # The following definitions allow abstract device names.
 @@ -56,14 +55,14 @@
  #
  # drive name	device		speed	fifosize driveropts	transfersize
  #
 -my-default=	1,0,0		-1	-1	burnfree	63k
 -sol-default=	USCSI:1,0,0	-1	-1	burnfree
 -ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
 -teac=		1,3,0		-1	-1	""
 -teac-max-ts=	1,3,0		-1	-1	""		32k
 -panasonic=	1,4,0		-1	-1	""
 -plextor=	1,4,0		-1	-1	""
 -sanyo=		1,4,0		-1	-1	burnfree
 -yamaha=		1,5,0		-1	-1	""
 -cdrom=		0,6,0		2	1m	""
 -remote=	REMOTE:rscsi@somehost:1,0,0 16	16m	burnfree
 +#my-default=	1,0,0		-1	-1	burnfree	63k
 +#sol-default=	USCSI:1,0,0	-1	-1	burnfree
 +#ricoh-u=	USCSI:0,2,0	-1	-1	burnfree
 +#teac=		1,3,0		-1	-1	""
 +#teac-max-ts=	1,3,0		-1	-1	""		32k
 +#panasonic=	1,4,0		-1	-1	""
 +#plextor=	1,4,0		-1	-1	""
 +#sanyo=		1,4,0		-1	-1	burnfree
 +#yamaha=		1,5,0		-1	-1	""
 +#cdrom=		0,6,0		2	1m	""
 +#remote=	REMOTE:rscsi@somehost:1,0,0 16	16m	burnfree
diff --git a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c b/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
index ab1af624da6d..a2c0807ebfd0 100644
--- a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
+++ b/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
@@ -1,28 +1,44 @@
 ###########################################################################
 # This patch was contributed by Dimitry Andric.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- inc/avoffset.c.orig	2011-11-28 19:28:41 UTC
+--- inc/avoffset.c.orig	2017-08-01 18:10:02 UTC
 +++ inc/avoffset.c
-@@ -60,7 +60,7 @@ main(ac, av)
+@@ -50,7 +50,7 @@ main(ac, av)
  {
  	int		stdir;
  #ifdef	HAVE_SCANSTACK
 -	register struct frame *fp;
 +	volatile struct frame *fp;
  	register int	i = 0;
  	register int	o = 0;
  
+@@ -105,6 +105,7 @@ main(ac, av)
+ 	 * does not affect the new code extended as well.
+ 	 */
+ 	while (i <= 1000 && fp->fr_savfp) {
++#if 0
+ 		/*
+ 		 * Workaround for the still buggy clang...
+ 		 * clang version 4.0.0 on ARM64 FreeBSD has become worse.
+@@ -113,6 +114,7 @@ main(ac, av)
+ 		 * is never touched.
+ 		 */
+ 		write(-1, "", 0);
++#endif
+ 		if (fp->fr_savpc == 0)
+ 			break;
+ 
diff --git a/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h b/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h
similarity index 75%
rename from sysutils/cdrtools-devel/files/patch-include__schily__sha2.h
rename to sysutils/cdrtools-devel/files/patch-include_schily_sha2.h
index e93f886de086..837c22b2b361 100644
--- a/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h
+++ b/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h
@@ -1,15 +1,15 @@
---- include/schily/sha2.h.orig	2010-08-27 12:41:30.000000000 +0200
-+++ include/schily/sha2.h	2012-10-20 14:39:42.000000000 +0200
-@@ -104,10 +104,12 @@
+--- include/schily/sha2.h.orig	2010-08-27 10:41:30 UTC
++++ include/schily/sha2.h
+@@ -104,10 +104,12 @@ extern char *SHA256Data		__PR((const UIn
  
  #ifdef	HAVE_LONGLONG
  extern void SHA384Init		__PR((SHA2_CTX *));
 +#ifndef	HAVE_PRAGMA_WEAK
  extern void SHA384Transform	__PR((UInt64_t state[8],
  					const UInt8_t [SHA384_BLOCK_LENGTH]));
  extern void SHA384Update	__PR((SHA2_CTX *, const UInt8_t *, size_t));
  extern void SHA384Pad		__PR((SHA2_CTX *));
 +#endif
  extern void SHA384Final		__PR((UInt8_t [SHA384_DIGEST_LENGTH],
  					SHA2_CTX *));
  extern char *SHA384End		__PR((SHA2_CTX *, char *));
diff --git a/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c b/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c
new file mode 100644
index 000000000000..e016ebf1921b
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c
@@ -0,0 +1,16 @@
+--- libschily/fnmatch.c.orig	2017-08-29 23:04:40 UTC
++++ libschily/fnmatch.c
+@@ -369,11 +369,11 @@ rangematch(pattern, test, flags, newp, p
+ 					/*
+ 					 * Convert to the other case
+ 					 */
+-					if (strcmp(class, "upper") == 0)
++					if (strcmp(class, "upper") == 0) {
+ 						if (iswctype(otest,
+ 						    wctype("lower")))
+ 							ok = 1;
+-					else if (strcmp(class, "lower") == 0)
++					} else if (strcmp(class, "lower") == 0)
+ 						if (iswctype(otest,
+ 						    wctype("upper")))
+ 							ok = 1;
diff --git a/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 b/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8
similarity index 70%
rename from sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8
rename to sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8
index 26ae04ad8e71..3d2a81ccfdf2 100644
--- a/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8
+++ b/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8
@@ -1,20 +1,20 @@
---- mkisofs/mkisofs.8.orig	Mon Sep 29 15:11:48 2003
-+++ mkisofs/mkisofs.8	Mon Sep 29 15:19:01 2003
-@@ -1668,7 +1668,7 @@
+--- mkisofs/mkisofs.8.orig	2017-12-10 18:47:50 UTC
++++ mkisofs/mkisofs.8
+@@ -2739,7 +2739,7 @@ but is kept to be compatible with 
  The format of the
  .I magic
  file is almost identical to the
 -.BR magic (4)
 +.BR magic (5)
  file used by the Linux
  .BR file (1)
  command - the routines for reading and decoding the
-@@ -1707,7 +1707,7 @@
+@@ -2778,7 +2778,7 @@ l l l l .
  .TE
  .PP
  The format of the file is described in the
 -.BR magic (4)
 +.BR magic (5)
  man page. The only difference here is that for each entry in the magic file, the
  .I message
  for the initial offset
diff --git a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 b/sysutils/cdrtools-devel/files/patch-readcd_readcd.1
similarity index 89%
rename from sysutils/cdrtools-devel/files/patch-readcd__readcd.1
rename to sysutils/cdrtools-devel/files/patch-readcd_readcd.1
index f643d7dacbc4..27693336b41c 100644
--- a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
+++ b/sysutils/cdrtools-devel/files/patch-readcd_readcd.1
@@ -1,28 +1,28 @@
 ###########################################################################
 # This patch was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- readcd/readcd.1.orig	Mon Sep 29 14:53:05 2003
-+++ readcd/readcd.1	Mon Sep 29 15:10:06 2003
-@@ -604,8 +604,6 @@
+--- readcd/readcd.1.orig	2017-06-06 18:15:16 UTC
++++ readcd/readcd.1
+@@ -641,8 +641,6 @@ is mapped to
  .SH SEE ALSO
  .BR cdrecord (1),
  .BR mkisofs (8),
 -.BR scg (7),
 -.BR fbk (7),
  .BR rcmd (3),
  .BR ssh (1).
  
diff --git a/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl b/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl
similarity index 84%
rename from sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl
rename to sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl
index edbd1340c469..133c60e01a50 100644
--- a/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl
+++ b/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl
@@ -1,19 +1,19 @@
---- rscsi/rscsi.dfl.orig	Sun Aug 17 11:50:57 2003
-+++ rscsi/rscsi.dfl	Sun Aug 17 12:28:46 2003
-@@ -18,14 +18,13 @@
+--- rscsi/rscsi.dfl.orig	2005-08-09 13:19:20 UTC
++++ rscsi/rscsi.dfl
+@@ -25,14 +25,13 @@
  # Each USER= entry adds the listed user to the users who may run rscsi
  #
  # A typical passwd entry looks like this:
 -# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi
 +# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi
  #
 -# Add entries for all valid remote users to /export/home/rscsi/.rhosts
 +# Add entries for all valid remote users to /usr/local/rscsi/.rhosts
  #
  # USER= entries are checked with a pattern matcher. USER=* matches all users.
  #
  USER=rscsi
 -#USER=joerg
  
  #
  # Each ACCESS= entry adds a target or group of targets to the list of visible
diff --git a/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 b/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1
similarity index 88%
rename from sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1
rename to sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1
index d42f4c8c1c98..ed501f6d29ec 100644
--- a/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1
+++ b/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1
@@ -1,29 +1,29 @@
 ###########################################################################
 # This patch was contributed by Marius Strobl.
 ###########################################################################
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License, Version 1.0 only
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
 # See the file CDDL.Schily.txt in this distribution for details.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file CDDL.Schily.txt from this distribution.
 ###########################################################################
 # The file CDDL.Schily.txt can be found in the original cdrtools tarball,
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- scgcheck/scgcheck.1.orig	Mon Sep 29 14:56:16 2003
-+++ scgcheck/scgcheck.1	Mon Sep 29 14:56:44 2003
-@@ -234,8 +234,7 @@
+--- scgcheck/scgcheck.1.orig	2016-01-26 21:48:54 UTC
++++ scgcheck/scgcheck.1
+@@ -276,8 +276,7 @@ Specify the log file to be used instead 
  .SH SEE ALSO
  .BR cdrecord (1),
  .BR readcd (1),
 -.BR mkisofs (1),
 -.BR scg (7).
 +.BR mkisofs (8).
  
  .SH NOTES
  .PP