- Update to 2.01.01a36.

- Comply with the CDDL and the CDDL HEADER used; given that the port
  Makefile and patches contain Covered Code we need to accomplish
  CDDL 3.3 by denoting the Contributor and include the CDDL HEADER
  in these files. [1]

Discussed with:	author [1]
Approved by:	netchild

9 files changed, 151 insertions, 50 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 96c2c1cffdc8..858eeea62e29 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -4,10 +4,25 @@
 #
 # $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=	2.01.01a11
-PORTREVISION=	1
+PORTVERSION=	2.01.01a36
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
@@ -22,10 +37,11 @@ MAN1=		btcflash.1 cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
 MAN8=		isoinfo.8 mkisofs.8
 MLINKS=		isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
 		mkisofs.8 mkhybrid.8
-DOCS=		README README.ATAPI README.DiskT@2 README.FreeBSD README.WORM \
-		README.audio README.cdplus README.cdrw README.cdtext \
-		README.clone README.copy README.mkisofs README.multi \
-		README.raw README.rscsi README.sony README.verify
+DOCS=		README.FreeBSD README.mkisofs
+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
 CDDA2WAVDOCS=	FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
 MKISOFSDOCS=	README README.compression README.eltorito README.graft_dirs \
 		README.hfs_boot README.hfs_magic README.hide README.joliet \
@@ -72,8 +88,8 @@ pre-everything::
 	@${ECHO_MSG} "WITH_RSCSI=yes		builds with the rscsi daemon which provides access to"
 	@${ECHO_MSG} "			local SCSI-devices over the network (the client-side"
 	@${ECHO_MSG} "			in cdda2wav, cdrecord, etc. is built unconditionally)."
-	@${ECHO_MSG} "			BEWARE:	The rscsi binary gets installed suid root as"
-	@${ECHO_MSG} "				this is the preferred method to set it up."
+	@${ECHO_MSG} "			BEWARE:	The rscsi binary will be installed suid root"
+	@${ECHO_MSG} "				as this is the preferred way of setting it up."
 	@${ECHO_MSG} ""
 .endif
 .if !defined(WITH_CDDB)
@@ -96,9 +112,9 @@ post-patch:
 .if !defined(WITH_RSCSI)
 	@${RM} ${WRKSRC}/TARGETS/55rscsi
 .endif
-.for i in README.rscsi btcflash/btcflash.1 cdda2wav/cdda2wav.1 \
+.for i in btcflash/btcflash.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \
 	cdrecord/cdrecord.1 cdrecord/cdrecord.dfl cdrecord/defaults.c \
-	include/deflts.h librscg/scsi-remote.c readcd/readcd.1 \
+	include/schily/deflts.h librscg/scsi-remote.c readcd/readcd.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; \
@@ -159,6 +175,10 @@ do-install:
 .for i in ${CDDA2WAVDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav
 .endfor
+	@${MKDIR} ${DOCSDIR}/cdrecord
+.for i in ${CDRECORDDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${DOCSDIR}/cdrecord
+.endfor
 	@${MKDIR} ${DOCSDIR}/mkisofs
 .for i in ${MKISOFSDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}/mkisofs
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index bd872fe498ec..7b67628229ef 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrtools-2.01.01a11.tar.bz2) = 0f18966e4772b851bee385d0b07a18af
-SHA256 (cdrtools-2.01.01a11.tar.bz2) = c24cee507c7f190f9a9e34941e54a58bb2810fb576cc849ca510c5f1673c3c2d
-SIZE (cdrtools-2.01.01a11.tar.bz2) = 1503558
+MD5 (cdrtools-2.01.01a36.tar.bz2) = 0e6f9ecd4e4df0735a981156c0b22682
+SHA256 (cdrtools-2.01.01a36.tar.bz2) = 2271ffad792fe01b04a7cc472c3ea6511997a1ba5e6060816faaa0d4ab9b481e
+SIZE (cdrtools-2.01.01a36.tar.bz2) = 1664644
diff --git a/sysutils/cdrtools-devel/files/patch-ad b/sysutils/cdrtools-devel/files/patch-ad
index eecd9a636a4f..ead64aaf1330 100644
--- a/sysutils/cdrtools-devel/files/patch-ad
+++ b/sysutils/cdrtools-devel/files/patch-ad
@@ -1,27 +1,68 @@
+###########################################################################
+# 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
-@@ -20,7 +20,8 @@
+@@ -20,8 +20,9 @@
  ###########################################################################
  
- CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
+ CPPFLAGS=	-DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
 -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) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX)
  
- CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+ CPPOPTS=	-I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS)
  COPTS=
-@@ -45,10 +46,10 @@
+@@ -29,12 +30,10 @@
+ CWOPTS=		-Wall -Wtraditional
+ CWOPTS=		-Wall -Wno-unknown-pragmas \
+ 		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
+-COPTOPT=	-O
+ COPTDYN=	-fpic
+ COPTGPROF=	-pg
+ C++OPTS=
+ C++WOPTS=	$(CWOPTS)
+-C++OPTOPT=	$(COPTOPT)
+ C++OPTDYN=	-fpic
+ C++OPTGPROF=	-pg
+ 
+@@ -54,15 +53,15 @@
  
  FLOAT_OPTIONS=	
  
 -CC=		@echo "	==> COMPILING \"$@\""; gcc
+-CC++ =		@echo "	==> COMPILING \"$@\""; g++
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
+-LDCC++ =	@echo "	==> LINKING \"$@\""; g++
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
-+CCCOM=		$(CC)
-+LDCC=		$(CCCOM)
-+DYNLD=		$(CCCOM)
+-DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; g++
++CC_COM=		$(CC)
++CC++ =		$(CXX)
++LDCC=		$(CC)
++LDCC++ =	$(CXX)
++DYNLD=		$(CC)
++DYNLDC++ =	$(CXX)
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		$(CCCOM) -M
++MKDEP=		$(CC) -M
  MKDEP_OUT=
+-MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M
++MKC++DEP=	$(CXX) -M
+ MKC++DEP_OUT=
diff --git a/sysutils/cdrtools-devel/files/patch-README.rscsi b/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi
index 8fed06bfc876..9398843e937a 100644
--- a/sysutils/cdrtools-devel/files/patch-README.rscsi
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi
@@ -1,5 +1,5 @@
---- README.rscsi.orig	Sun Aug 17 11:31:39 2003
-+++ README.rscsi	Sun Aug 17 14:38:57 2003
+--- 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 @@
  		NOTE: In this case, rscsi must be installed suid root. 
  		**** This is the preferred method ****
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1
index 4413a3a8604d..88dc6bf0398f 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1
@@ -1,3 +1,20 @@
+###########################################################################
+# 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 @@
diff --git a/sysutils/cdrtools-devel/files/patch-include::utypes.h b/sysutils/cdrtools-devel/files/patch-include::utypes.h
deleted file mode 100644
index 7d8799af04d1..000000000000
--- a/sysutils/cdrtools-devel/files/patch-include::utypes.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/utypes.h	Sat Feb 18 18:56:17 2006
-+++ include/utypes.h	Sat Feb 18 18:57:04 2006
-@@ -380,7 +380,9 @@
- #endif
- 
- #define	SIZE_T_MIN	TYPE_MINVAL(size_t)
-+#ifndef SIZE_T_MAX
- #define	SIZE_T_MAX	TYPE_MAXVAL(size_t)
-+#endif
- 
- #define	SSIZE_T_MIN	TYPE_MINVAL(ssize_t)
- #define	SSIZE_T_MAX	TYPE_MAXVAL(ssize_t)
diff --git a/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 b/sysutils/cdrtools-devel/files/patch-readcd::readcd.1
index f6618e3f419a..ebd5ae8842c3 100644
--- a/sysutils/cdrtools-devel/files/patch-readcd::readcd.1
+++ b/sysutils/cdrtools-devel/files/patch-readcd::readcd.1
@@ -1,3 +1,20 @@
+###########################################################################
+# 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
 @@ -432,9 +432,7 @@
diff --git a/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 b/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1
index 0120c5231a34..d42f4c8c1c98 100644
--- a/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1
+++ b/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1
@@ -1,3 +1,20 @@
+###########################################################################
+# 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 @@
diff --git a/sysutils/cdrtools-devel/pkg-plist b/sysutils/cdrtools-devel/pkg-plist
index ff81f4aa04a0..a4dcc1109868 100644
--- a/sysutils/cdrtools-devel/pkg-plist
+++ b/sysutils/cdrtools-devel/pkg-plist
@@ -21,23 +21,8 @@ etc/cdrecord.sample
 %%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi
 %%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi
 %%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ATAPI
-%%PORTDOCS%%%%DOCSDIR%%/README.DiskT@2
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/README.WORM
-%%PORTDOCS%%%%DOCSDIR%%/README.audio
-%%PORTDOCS%%%%DOCSDIR%%/README.cdplus
-%%PORTDOCS%%%%DOCSDIR%%/README.cdrw
-%%PORTDOCS%%%%DOCSDIR%%/README.cdtext
-%%PORTDOCS%%%%DOCSDIR%%/README.clone
-%%PORTDOCS%%%%DOCSDIR%%/README.copy
 %%PORTDOCS%%%%DOCSDIR%%/README.mkisofs
-%%PORTDOCS%%%%DOCSDIR%%/README.multi
-%%PORTDOCS%%%%DOCSDIR%%/README.raw
-%%PORTDOCS%%%%DOCSDIR%%/README.rscsi
-%%PORTDOCS%%%%DOCSDIR%%/README.sony
-%%PORTDOCS%%%%DOCSDIR%%/README.verify
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE
@@ -46,6 +31,22 @@ etc/cdrecord.sample
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.WORM
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.audio
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdplus
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdrw
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdtext
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.clone
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.copy
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.multi
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.raw
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony
+%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdrecord
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression
 %%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito