Attachment #108735 for bug #149644

View | Details | Raw Unified | Return to bug 149644
Collapse All | Expand All




# New ports collection makefile for:	cdrtools-devel
# Date created:				28 May 2003
# Whom:					marius@alchemy.franken.de
#
# $FreeBSD: ports/sysutils/cdrtools-devel/Makefile,v 1.123 2010/05/31 02:00:56 ade Exp $
#
###########################################################################
# 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.00
CATEGORIES=	sysutils audio
CATEGORIES?=	sysutils audio
MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/ \
		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
DISTNAME=	cdrtools-2.01

MAINTAINER=	marius@FreeBSD.org
COMMENT=	CD/DVD and ISO-9660 image creation and extraction tools

CONFLICTS=	cdrkit-[0-9]* cdrtools-devel-[0-9]* cjk-cdrtools-[0-9]*

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.FreeBSD README.mkisofs
		README.audio README.cdplus README.cdrw README.cdtext \
		README.clone README.copy README.mkisofs README.multi \
		README.raw README.rscsi README.sony README.verify
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

NO_LATEST_LINK=	yes
USE_BZIP2=	yes
USE_GMAKE=	yes
#CFLAGS+=	-DSOURCE_MODIFIED
WRKSRC=		${WRKDIR}/${DISTNAME:C/a(.+)$//}
SUB_FILES=	pkg-message
MAKE_JOBS_UNSAFE=	yes

.if defined(WITH_RSCSI)
MAN1+=		rscsi.1
PKGINSTALL=	${PKGDIR}/pkg-install.rscsi
PLIST_SUB=	RSCSI=""
PKGNAMESUFFIX=	-rscsi

PLIST_SUB=	RSCSI="@comment "
.endif

MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
		INS_RBASE=${LOCALBASE}
CDRTLSTARGET=	${ARCH}-freebsd-cc

.include <bsd.port.pre.mk>

.if exists(${LOCALBASE}/lib/libiconv.a) || \
	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
MAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
USE_GETTEXT=	yes
USE_ICONV=	yes
.endif

pre-everything::
.if !defined(WITH_RSCSI)
	@${ECHO_MSG} ""

	@${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 will be installed suid root"
	@${ECHO_MSG} "				as this is the preferred way of setting it up."
	@${ECHO_MSG} ""
.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 ${CDRTLSTARGET} != "i386-freebsd-cc"
	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \

.if !defined(WITH_RSCSI)
	@${RM} ${WRKSRC}/TARGETS/55rscsi
.endif
.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.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' ${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
	@${REINPLACE_CMD} -e 's|getdelim|getworddelim|g' \
		${WRKSRC}/cdrecord/cue.c
	@${CHMOD} u+w ${WRKSRC}/mkisofs/Makefile
	@${ECHO} GCCOPTOPT=-O0 >> ${WRKSRC}/mkisofs/Makefile

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
		${PREFIX}/bin
	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
		${PREFIX}/bin
	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks

.endif
	@${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \
		${PREFIX}/bin
	@${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 ${PREFIX}/man/man1
	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1
	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1
.if defined(WITH_RSCSI)
	@${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${PREFIX}/man/man1
.endif
	@${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1
	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8

.if !exists(${PREFIX}/etc/cdrecord)
	@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord
.endif
	@${MKDIR} ${PREFIX}/lib/siconv
.for i in ${SICONVTABLES}
	@${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} ${PREFIX}/lib/siconv
.endfor
.if defined(WITH_RSCSI)
	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample
.if !exists(${PREFIX}/etc/rscsi)

.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

Lines 1-3 Link Here

(-)sysutils/cdrtools/distinfo (-3 / +3 lines)
1	MD5 (cdrtools-2.01.tar.bz2) = d44a81460e97ae02931c31188fe8d3fd	1	MD5 (cdrtools-3.00.tar.bz2) = f9fbab08fbd458b0d2312976d8c5f558
2	SHA256 (cdrtools-2.01.tar.bz2) = 728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22	2	SHA256 (cdrtools-3.00.tar.bz2) = 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
3	SIZE (cdrtools-2.01.tar.bz2) = 1400389	3	SIZE (cdrtools-3.00.tar.bz2) = 1978563




--- README.rscsi.orig	Sun Aug 17 11:31:39 2003
+++ 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 ****
 
-To enable remote SCSI via the login shell method you should do the following:
-
-	-	Add an entry to /etc/passwd in the form:
+		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:
 




###########################################################################
# 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,8 +20,9 @@
 ###########################################################################
 
 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$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS)
 COPTS=
@@ -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
-DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; g++
+CC_COM=		$(CC)
+CC++ =		$(CXX)
+LDCC=		$(CC)
+LDCC++ =	$(CXX)
+DYNLD=		$(CC)
+DYNLDC++ =	$(CXX)
 TSORT=		tsort
 
 RMDEP=		:
-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP=		$(CC) -M
 MKDEP_OUT=
-MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M
+MKC++DEP=	$(CXX) -M
 MKC++DEP_OUT=

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-btcflash-btcflash.1 (+10 lines)
	1	--- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006
	2	+++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006
	3	@@ -293,7 +293,6 @@
	4	login shell.
	5	.SH "SEE ALSO"
	6	.BR cdrecord (1),
	7	-.BR scg (7),
	8	.BR rcmd (3),
	9	.BR ssh (1).
	10	.SH NOTES




--- cdda2wav/toc.c.original	Fri May 21 22:56:44 2004
+++ cdda2wav/toc.c	Mon Jan 16 13:54:30 2006
@@ -959,7 +959,7 @@
 					if (*target != NULL)
 						**target = '\0';
 				} else {
-					realloc(*target, strlen(*target) + clen - 1);
+					*target = realloc(*target, strlen(*target) + clen - 1);
 				}
 				if (*target != NULL) {
 					strcat((char *)*target, inbuff+ind+7);
@@ -994,7 +994,7 @@
 							if (global.tracktitle[tno] != NULL)
 								*(global.tracktitle[tno]) = '\0';
 						} else {
-							realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
+							global.tracktitle[tno] = realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
 						}
 						if (global.tracktitle[tno] != NULL) {
 							strcat((char *)global.tracktitle[tno], q+1);




--- cdda2wav/interface.c	Mon Dec 29 11:28:09 2003
+++ cdda2wav/interface.c	Sun Jan 18 01:35:50 2004
@@ -445,7 +445,15 @@
     default:			/* for example ATAPI cds */
 #else
 #if defined (__FreeBSD__)
-    case 117:
+#if __FreeBSD_version >= 600021
+    case 0:	/* majors abandoned */
+	/* FALLTHROUGH */
+#endif
+#if __FreeBSD_version >= 501113
+    case 4:	/* GEOM */
+	/* FALLTHROUGH */
+#endif
+    case 117:	/* pre-GEOM atapi cd */
 	if (!S_ISCHR(statstruct->st_mode)) {
 	    fprintf(stderr, "%s is not a char device\n",pdev_name);
 	    exit(SYNTAX_ERROR);




--- cdda2wav/ioctl.c	Sat Dec 27 17:29:28 2003
+++ cdda2wav/ioctl.c	Sun Jan 18 01:36:36 2004
@@ -59,10 +59,14 @@
 #include <cdrecord.h>
 
 #if defined (HAVE_IOCTL_INTERFACE)
-#if	!defined	sun	&& !defined	__sun
+#if  !defined(sun) && !defined(__sun) && !(__FreeBSD_version >= 501112)
 static struct cdrom_read_audio arg;
 #endif
 
+#if defined(__FreeBSD__) && __FreeBSD_version >= 400014
+static unsigned sector_size = CD_FRAMESIZE;
+#endif
+
 static int err;
 
 static void EnableCdda_cooked __PR((SCSI *scgp, int fAudioMode, unsigned uSectorsize));
@@ -72,13 +76,23 @@
 	int fAudioMode;
 	unsigned uSectorsize;
 {
+#if	defined(__FreeBSD__) && __FreeBSD_version >= 400014
+	if (scgp && scgp->verbose)
+		fprintf(stderr, "EnableCdda_cooked (CDRIOCSETBLOCKSIZE)...\n");
+
+	if (fAudioMode) {
+		if (ioctl(global.cooked_fd, CDRIOCGETBLOCKSIZE, &sector_size) ==-1)
+			sector_size = CD_FRAMESIZE;
+        	ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &uSectorsize);
+	} else
+        	ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &sector_size);
+#elif	defined	CDIOCSETCDDA
 	if (scgp && scgp->verbose) {
 		fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA)...\n");
 		if (uSectorsize != CD_FRAMESIZE_RAW)
 			fprintf(stderr, "non audio sector size is ignored.\n");
 	}
 
-#if	defined	CDIOCSETCDDA
 	ioctl(global.cooked_fd, CDIOCSETCDDA, &fAudioMode);
 #else
 	fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA) is not available...\n");
@@ -197,6 +211,10 @@
       /* trash the cache */
 
 #if	defined __FreeBSD__
+#if	__FreeBSD_version >= 501112
+      pread(global.cooked_fd, (void *) &p[0], 3*CD_FRAMESIZE_RAW,
+          find_an_off_sector(lSector, SectorBurstVal)*CD_FRAMESIZE_RAW);
+#else
       static struct cdrom_read_audio arg2;
 
       arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
@@ -206,6 +224,7 @@
 
       ioctl(global.cooked_fd, CDROMREADAUDIO, &arg2);
 #endif
+#endif
 #if	defined __linux__
       static struct cdrom_read_audio arg2;
 
@@ -267,6 +286,17 @@
 
 /* read 2352 bytes audio data */
 #if	defined __FreeBSD__
+#if	__FreeBSD_version >= 501112
+    if (x && x->verbose) {
+	fprintf(stderr, "ReadCdRom_cooked (pread)...\n");
+    }
+
+  do {
+    err = 0;
+    if (pread(global.cooked_fd, (void *) &p[0], SectorBurstVal*CD_FRAMESIZE_RAW,
+	lSector*CD_FRAMESIZE_RAW) == -1)
+		err = -1;
+#else
   arg.address.lba = lSector;
   arg.addr_format = CDROM_LBA;
   arg.nframes = SectorBurstVal;
@@ -278,6 +308,7 @@
 
   do {
     err = ioctl(global.cooked_fd, CDROMREADAUDIO, &arg);
+#endif
 #endif
 #if	defined __linux__
   arg.addr.lba = lSector;




--- cdda2wav/mycdrom.h	Wed Sep  4 14:07:16 2002
+++ cdda2wav/mycdrom.h	Sat Jan 17 18:52:08 2004
@@ -4,6 +4,12 @@
 #else
 # if defined HAVE_SYS_CDIO_H
 #  include <sys/cdio.h>
+#  if defined(__FreeBSD__) && __FreeBSD__ >= 2
+#   include <osreldate.h>
+#   if __FreeBSD_version >= 400014
+#    include <sys/cdrio.h>
+#   endif
+#  endif
 
 #  if (defined (__sun) && defined (SVR4))
 #   if 0
@@ -53,7 +59,7 @@
 #   endif /* if 0 */
 #  else /* not Sun SVR4 */
 #   if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
-#    if !defined CDIOCREADAUDIO
+#    if (!defined(__FreeBSD__) && !defined(CDIOCREADAUDIO)) || __FreeBSD_version < 228000
 #     undef HAVE_IOCTL_INTERFACE
 #    else
 




--- 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 ****
 
-To enable remote SCSI via the login shell method you should do the following:
-
-	-	Add an entry to /etc/passwd in the form:
+		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:
 




###########################################################################
# 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 @@
 .SH SEE ALSO
 .BR cdda2wav (1),
 .BR readcd (1),
-.BR scg (7),
-.BR fbk (7),
 .BR mkisofs (8),
 .BR rcmd (3),
 .BR ssh (1).




--- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
+++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
@@ -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

Lines 1-11 Link Here

(-)sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 (-11 lines)
1	--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003
2	+++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003
3	@@ -1738,8 +1738,6 @@
4	.SH SEE ALSO
5	.BR cdda2wav (1),
6	.BR readcd (1),
7	-.BR scg (7),
8	-.BR fbk (7),
9	.BR mkisofs (8),
10	.BR rcmd (3),
11	.BR ssh (1).




--- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
+++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
@@ -6,7 +6,7 @@
 # 
 # The default device, if not specified elswhere
 #
-CDR_DEVICE=yamaha
+#CDR_DEVICE=yamaha
 
 # 
 # The default speed, if not specified elswhere
@@ -21,7 +21,7 @@
 # 
 # The default FIFO size if, not specified elswhere
 #
-CDR_FIFOSIZE=4m
+#CDR_FIFOSIZE=4m
 
 #
 # The following definitions allow abstract device names.
@@ -33,9 +33,9 @@
 #
 # drive name	device	speed	fifosize driveropts
 #
-teac=		1,3,0	-1	-1	""
-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	""
+#teac=		1,3,0	-1	-1	""
+#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	""




--- 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 @@
 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 @@
 .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




--- 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 @@
 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 @@
 .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




###########################################################################
# 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 @@
 .SH FILES
 .SH SEE ALSO
 .BR cdrecord (1),
-.BR mkisofs (1),
-.BR scg (7),
-.BR fbk (7),
+.BR mkisofs (8),
 .BR rcmd (3),
 .BR ssh (1).
 

Lines 1-13 Link Here

(-)sysutils/cdrtools/files/patch-readcd::readcd.1 (-13 lines)
1	--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003
2	+++ readcd/readcd.1 Mon Sep 29 15:10:06 2003
3	@@ -432,9 +432,7 @@
4	.SH FILES
5	.SH SEE ALSO
6	.BR cdrecord (1),
7	-.BR mkisofs (1),
8	-.BR scg (7),
9	-.BR fbk (7),
10	+.BR mkisofs (8),
11	.BR rcmd (3),
12	.BR ssh (1).
13




--- readcd/readcd.c.original	Sun Jan 15 17:14:03 2006
+++ readcd/readcd.c	Sun Jan 15 17:24:47 2006
@@ -253,9 +256,9 @@
 	int	fcount;
 	int	cac;
 	char	* const *cav;
-	int	scsibus	= 0;
-	int	target	= 0;
-	int	lun	= 0;
+	int	scsibus	= -1;
+	int	target	= -1;
+	int	lun	= -1;
 	int	silent	= 0;
 	int	verbose	= 0;
 	int	kdebug	= 0;
@@ -335,20 +338,22 @@
 				usage(EX_BAD);
 				/* NOTREACHED */
 			}
-		} else {
-			scsibus = 0;
 		}
 		cac--;
 		cav++;
 	}
 /*error("dev: '%s'\n", dev);*/
-
 	if (!scanbus)
 		cdr_defaults(&dev, NULL, NULL, NULL);
 	if (debug) {
 		printf("dev: '%s'\n", dev);
 	}
-	if (dev) {
+	if (!scanbus && dev == NULL &&
+	    scsibus == -1 && (target == -1 || lun == -1)) {
+		errmsgno(EX_BAD, "No SCSI device specified.\n");
+		usage(EX_BAD);
+	}
+	if (dev || scanbus) {
 		char	errstr[80];
 
 		/*
@@ -357,8 +362,9 @@
 		 * remote routines that are located inside libscg.
 		 */
 		scg_remote();
-		if ((strncmp(dev, "HELP", 4) == 0) ||
-		    (strncmp(dev, "help", 4) == 0)) {
+		if (dev != NULL &&
+		    ((strncmp(dev, "HELP", 4) == 0) ||
+		    (strncmp(dev, "help", 4) == 0))) {
 			scg_help(stderr);
 			exit(0);
 		}
@@ -1629,7 +1656,7 @@
 		end = scgp->cap->c_baddr + 1;
 	scgp->silent--;
 
-	if (end <= 0 || isrange || (askrange && scg_yes("Ignore disk size? ")))
+	if ((end <= 0 && isrange) || (askrange && scg_yes("Ignore disk size? ")))
 		end = 10000000;	/* Hack to read empty (e.g. blank=fast) disks */
 
 	if (parmp) {




--- 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 @@
 # 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




--- 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 @@
 # 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
@@ -52,6 +51,6 @@
 #	name	name
 #
 #ACCESS=rscsi	sparky	-1	-1	-1	-1
-ACCESS=rscsi	sparky	0	-1	6	-1
-ACCESS=rscsi	sparky	1	-1	3	-1
-ACCESS=rscsi	sparky	1	-1	4	-1
+#ACCESS=rscsi	sparky	0	-1	6	-1
+#ACCESS=rscsi	sparky	1	-1	3	-1
+#ACCESS=rscsi	sparky	1	-1	4	-1




###########################################################################
# 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 @@
 .SH SEE ALSO
 .BR cdrecord (1),
 .BR readcd (1),
-.BR mkisofs (1),
-.BR scg (7).
+.BR mkisofs (8).
 
 .SH NOTES
 .PP

Lines 1-12 Link Here

(-)sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 (-12 lines)
1	--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003
2	+++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003
3	@@ -234,8 +234,7 @@
4	.SH SEE ALSO
5	.BR cdrecord (1),
6	.BR readcd (1),
7	-.BR mkisofs (1),
8	-.BR scg (7).
9	+.BR mkisofs (8).
10
11	.SH NOTES
12	.PP

Lines 3-10 Link Here

(-)sysutils/cdrtools/pkg-descr (-2 / +3 lines)
3	disc.	3	disc.
4		4
5	This package contains the following programs:	5	This package contains the following programs:
6	- cdda2wav (an digital CD audio extraction program)	6	- btcflash (a firmware flash utility for BTC DRW1008 DVD+/-RW recorder)
7	- cdrecord (a CD-R[W] recording program)	7	- cdda2wav (a digital CD audio extraction program)
		8	- cdrecord (a CD/DVD recording program)
8	- devdump (dump a device or file in hex)	9	- devdump (dump a device or file in hex)
9	- isodebug (show debug info contained in an ISO-9660 image)	10	- isodebug (show debug info contained in an ISO-9660 image)
10	- isodump (dump a device or file based on ISO-9660)	11	- isodump (dump a device or file based on ISO-9660)




bin/btcflash
bin/cdda2wav
bin/cdrecord
bin/devdump

bin/mkisofs
bin/readcd
bin/scgcheck
lib/siconv/cp10000
lib/siconv/cp10006
lib/siconv/cp10007
lib/siconv/cp10029
lib/siconv/cp10079
lib/siconv/cp10081
lib/siconv/cp1250
lib/siconv/cp1251
lib/siconv/cp1252
lib/siconv/cp1253
lib/siconv/cp1254
lib/siconv/cp1255
lib/siconv/cp1256
lib/siconv/cp1257
lib/siconv/cp1258
lib/siconv/cp437
lib/siconv/cp737
lib/siconv/cp775
lib/siconv/cp850
lib/siconv/cp852
lib/siconv/cp855
lib/siconv/cp857
lib/siconv/cp860
lib/siconv/cp861
lib/siconv/cp862
lib/siconv/cp863
lib/siconv/cp864
lib/siconv/cp865
lib/siconv/cp866
lib/siconv/cp869
lib/siconv/cp874
lib/siconv/iso8859-1
lib/siconv/iso8859-10
lib/siconv/iso8859-11
lib/siconv/iso8859-13
lib/siconv/iso8859-14
lib/siconv/iso8859-15
lib/siconv/iso8859-16
lib/siconv/iso8859-2
lib/siconv/iso8859-3
lib/siconv/iso8859-4
lib/siconv/iso8859-5
lib/siconv/iso8859-6
lib/siconv/iso8859-7
lib/siconv/iso8859-8
lib/siconv/iso8859-9
lib/siconv/koi8-r
lib/siconv/koi8-u
@dirrm lib/siconv
%%RSCSI%%sbin/rscsi
%%RSCSI%%@exec chmod u+s %B/%f
@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi

%%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

%%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

Return to bug 149644

Lines 1-44 Link Here

(-)sysutils/cdrtools/Makefile (-29 / +78 lines)
1	# New ports collection makefile for: cdrtools	1	# New ports collection makefile for: cdrtools-devel
2	# Date created: Wed Jul 25 23:30:19 CEST 2001	2	# Date created: 28 May 2003
3	# Whom: Dirk Froemberg <dirk@FreeBSD.org>	3	# Whom: marius@alchemy.franken.de
4	#	4	#
5	# $FreeBSD: ports/sysutils/cdrtools/Makefile,v 1.78 2010/02/08 09:15:29 marius Exp $	5	# $FreeBSD: ports/sysutils/cdrtools-devel/Makefile,v 1.123 2010/05/31 02:00:56 ade Exp $
6	#	6	#
		7	###########################################################################
		8	# This makefile was contributed by Marius Strobl.
		9	###########################################################################
		10	# The contents of this file are subject to the terms of the
		11	# Common Development and Distribution License, Version 1.0 only
		12	# (the "License"). You may not use this file except in compliance
		13	# with the License.
		14	#
		15	# See the file CDDL.Schily.txt in this distribution for details.
		16	#
		17	# When distributing Covered Code, include this CDDL HEADER in each
		18	# file and include the License file CDDL.Schily.txt from this distribution.
		19	###########################################################################
		20	# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
		21	# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
		22	###########################################################################
7		23
8	PORTNAME= cdrtools	24	PORTNAME= cdrtools
9	PORTVERSION?= 2.01	25	PORTVERSION= 3.00
10	PORTREVISION?= 8	26	CATEGORIES= sysutils audio
11	CATEGORIES?= sysutils audio
12	MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \	27	MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
13	ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/	28	ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
14	DISTNAME= cdrtools-2.01
15		29
16	MAINTAINER= marius@FreeBSD.org	30	MAINTAINER= marius@FreeBSD.org
17	COMMENT= CD/CD-R[W] and ISO-9660 image creation and extraction tools	31	COMMENT= CD/DVD and ISO-9660 image creation and extraction tools
18		32
19	CONFLICTS?= cdrkit-* cdrtools-devel-* cjk-cdrtools-*	33	CONFLICTS= cdrkit-[0-9]* cdrtools-devel-[0-9]* cjk-cdrtools-[0-9]*
20		34
21	MAN1= cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1	35	MAN1= btcflash.1 cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
22	MAN8= isoinfo.8 mkisofs.8	36	MAN8= isoinfo.8 mkisofs.8
23	MLINKS= isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \	37	MLINKS= isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
24	mkisofs.8 mkhybrid.8	38	mkisofs.8 mkhybrid.8
25	DOCS= README README.ATAPI README.DiskT@2 README.FreeBSD README.WORM \	39	DOCS= README.FreeBSD README.mkisofs
26	README.audio README.cdplus README.cdrw README.cdtext \
27	README.clone README.copy README.mkisofs README.multi \
28	README.raw README.rscsi README.sony README.verify
29	CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO	40	CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
		41	CDRECORDDOCS= README README.ATAPI README.DiskT@2 README.WORM README.audio \
		42	README.cdplus README.cdrw README.cdtext README.clone \
		43	README.copy README.multi README.raw README.rscsi README.sony \
		44	README.verify
30	MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \	45	MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \
31	README.hfs_boot README.hfs_magic README.hide README.joliet \	46	README.hfs_boot README.hfs_magic README.hide README.joliet \
32	README.macosx README.mkhybrid README.prep_boot README.rootinfo \	47	README.macosx README.mkhybrid README.prep_boot README.rootinfo \
33	README.session README.sort README.sparcboot README.sunx86boot	48	README.session README.sort README.sparcboot README.sunx86boot
		49	SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \
		50	cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
		51	cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 \
		52	cp862 cp863 cp864 cp865 cp866 cp869 cp874 iso8859-1 \
		53	iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
		54	iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \
		55	iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u
34		56
		57	NO_LATEST_LINK= yes
35	USE_BZIP2= yes	58	USE_BZIP2= yes
36	USE_GMAKE= yes	59	USE_GMAKE= yes
37	#CFLAGS+= -DSOURCE_MODIFIED	60	#CFLAGS+= -DSOURCE_MODIFIED
		61	WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//}
38	SUB_FILES= pkg-message	62	SUB_FILES= pkg-message
39	MAKE_JOBS_UNSAFE= yes	63	MAKE_JOBS_UNSAFE= yes
40		64
41	.if defined(WITH_RSCSI)	65	.if defined(WITH_RSCSI)
		66	MAN1+= rscsi.1
42	PKGINSTALL= ${PKGDIR}/pkg-install.rscsi	67	PKGINSTALL= ${PKGDIR}/pkg-install.rscsi
43	PLIST_SUB= RSCSI=""	68	PLIST_SUB= RSCSI=""
44	PKGNAMESUFFIX= -rscsi	69	PKGNAMESUFFIX= -rscsi
Lines 46-56 Link Here
46	PLIST_SUB= RSCSI="@comment "	71	PLIST_SUB= RSCSI="@comment "
47	.endif	72	.endif
48		73
49	MAKE_ENV= CCOM=cc LANG=C	74	MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
		75	INS_RBASE=${LOCALBASE}
50	CDRTLSTARGET= ${ARCH}-freebsd-cc	76	CDRTLSTARGET= ${ARCH}-freebsd-cc
51		77
52	.include <bsd.port.pre.mk>	78	.include <bsd.port.pre.mk>
53		79
		80	.if exists(${LOCALBASE}/lib/libiconv.a) \|\| \
		81	exists(${LOCALBASE}/lib/libintl.a) \|\| !defined(WITHOUT_NLS)
		82	MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include
		83	USE_GETTEXT= yes
		84	USE_ICONV= yes
		85	.endif
		86
54	pre-everything::	87	pre-everything::
55	.if !defined(WITH_RSCSI)	88	.if !defined(WITH_RSCSI)
56	@${ECHO_MSG} ""	89	@${ECHO_MSG} ""
Lines 59-73 Link Here
59	@${ECHO_MSG} "WITH_RSCSI=yes builds with the rscsi daemon which provides access to"	92	@${ECHO_MSG} "WITH_RSCSI=yes builds with the rscsi daemon which provides access to"
60	@${ECHO_MSG} " local SCSI-devices over the network (the client-side"	93	@${ECHO_MSG} " local SCSI-devices over the network (the client-side"
61	@${ECHO_MSG} " in cdda2wav, cdrecord, etc. is built unconditionally)."	94	@${ECHO_MSG} " in cdda2wav, cdrecord, etc. is built unconditionally)."
62	@${ECHO_MSG} " BEWARE: The rscsi binary gets installed suid root as"	95	@${ECHO_MSG} " BEWARE: The rscsi binary will be installed suid root"
63	@${ECHO_MSG} " this is the preferred method to set it up."	96	@${ECHO_MSG} " as this is the preferred way of setting it up."
64	@${ECHO_MSG} ""	97	@${ECHO_MSG} ""
65	.endif	98	.endif
66		99
67	post-extract:	100	post-extract:
68	.for i in config.guess config.sub	101	.for i in config.guess config.sub
69	@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf	102	.for j in autoconf conf cdda2wav
70	@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/cdda2wav	103	@${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j}
		104	.endfor
71	.endfor	105	.endfor
72	.if ${CDRTLSTARGET} != "i386-freebsd-cc"	106	.if ${CDRTLSTARGET} != "i386-freebsd-cc"
73	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \	107	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
Lines 79-104 Link Here
79	.if !defined(WITH_RSCSI)	113	.if !defined(WITH_RSCSI)
80	@${RM} ${WRKSRC}/TARGETS/55rscsi	114	@${RM} ${WRKSRC}/TARGETS/55rscsi
81	.endif	115	.endif
82	.for i in README.rscsi include/deflts.h cdda2wav/cdda2wav.1 \	116	.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.1 cdda2wav/cdda2wav.1 \
83	cdrecord/cdrecord.1 cdrecord/cdrecord.dfl cdrecord/defaults.c \	117	cdrecord/README.rscsi cdrecord/cdrecord.1 cdrecord/cdrecord.dfl \
84	librscg/scsi-remote.c readcd/readcd.1 rscsi/rscsi.c rscsi/rscsi.dfl \	118	include/schily/deflts.h libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c \
		119	readcd/readcd.1 rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl \
85	scgcheck/scgcheck.1	120	scgcheck/scgcheck.1
86	@${REINPLACE_CMD} -e 's\|\/opt\/schily\|${PREFIX}\|g; \	121	@${REINPLACE_CMD} -e 's\|\/opt\/schily\|${PREFIX}\|g; \
87	s\|\/usr\/local\|${PREFIX}\|g; s\|\/etc\/default\|${PREFIX}\/etc\|g; \	122	s\|\/usr\/local\|${PREFIX}\|g; s\|\/etc\/default\|${PREFIX}\/etc\|g; \
88	s\|\/var\/adm\/messages\|\/var\/run\/dmesg.boot\|g' ${WRKSRC}/${i}	123	s\|\/var\/adm\/messages\|\/var\/run\/dmesg.boot\|g' ${WRKSRC}/${i}
89	.endfor	124	.endfor
90	.for i in include/schily.h libschily/fexec.c	125	@${MV} -f ${WRKSRC}/libparanoia/cdda_paranoia.h \
91	@${REINPLACE_CMD} -e 's\|fexecve\|js_fexecve\|g' ${WRKSRC}/${i}	126	${WRKSRC}/libparanoia/js_cdda_paranoia.h
		127	.for i in cdda2wav/cdda2wav.c cdda2wav/global.h libparanoia/gap.c \
		128	libparanoia/overlap.c libparanoia/p_block.c libparanoia/paranoia.c
		129	@${REINPLACE_CMD} -e 's\|cdda_paranoia\.h\|js_cdda_paranoia.h\|g' \
		130	${WRKSRC}/${i}
92	.endfor	131	.endfor
93	# @${REINPLACE_CMD} -E -e \	132	# @${REINPLACE_CMD} -E -e \
94	# 's\|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE\|& "${MAINTAINER}"\|' \	133	# 's\|#define.+INSERT_YOUR_EMAIL_ADDRESS_HERE\|& "${MAINTAINER}"\|' \
95	# ${WRKSRC}/cdrecord/cdrecord.c	134	# ${WRKSRC}/cdrecord/cdrecord.c
96	@${REINPLACE_CMD} -e 's\|getdelim\|getworddelim\|g' \
97	${WRKSRC}/cdrecord/cue.c
98	@${CHMOD} u+w ${WRKSRC}/mkisofs/Makefile
99	@${ECHO} GCCOPTOPT=-O0 >> ${WRKSRC}/mkisofs/Makefile
100		135
101	do-install:	136	do-install:
		137	@${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
		138	${PREFIX}/bin
102	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \	139	@${INSTALL_PROGRAM} ${WRKSRC}/cdda2wav/OBJ/${CDRTLSTARGET}/cdda2wav \
103	${PREFIX}/bin	140	${PREFIX}/bin
104	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks	141	@${LN} -sf cdda2wav ${PREFIX}/bin/list_audio_tracks
Lines 120-128 Link Here
120	.endif	157	.endif
121	@${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \	158	@${INSTALL_PROGRAM} ${WRKSRC}/scgcheck/OBJ/${CDRTLSTARGET}/scgcheck \
122	${PREFIX}/bin	159	${PREFIX}/bin
		160	@${INSTALL_MAN} ${WRKSRC}/btcflash/btcflash.1 ${PREFIX}/man/man1
123	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1	161	@${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2wav.1 ${PREFIX}/man/man1
124	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1	162	@${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 ${PREFIX}/man/man1
125	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1	163	@${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${PREFIX}/man/man1
		164	.if defined(WITH_RSCSI)
		165	@${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${PREFIX}/man/man1
		166	.endif
126	@${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1	167	@${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 ${PREFIX}/man/man1
127	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8	168	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
128	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8	169	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8
Lines 131-136 Link Here
131	.if !exists(${PREFIX}/etc/cdrecord)	172	.if !exists(${PREFIX}/etc/cdrecord)
132	@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord	173	@${INSTALL_DATA} ${WRKSRC}/cdrecord/cdrecord.dfl ${PREFIX}/etc/cdrecord
133	.endif	174	.endif
		175	@${MKDIR} ${PREFIX}/lib/siconv
		176	.for i in ${SICONVTABLES}
		177	@${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} ${PREFIX}/lib/siconv
		178	.endfor
134	.if defined(WITH_RSCSI)	179	.if defined(WITH_RSCSI)
135	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample	180	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi.sample
136	.if !exists(${PREFIX}/etc/rscsi)	181	.if !exists(${PREFIX}/etc/rscsi)
Lines 146-151 Link Here
146	.for i in ${CDDA2WAVDOCS}	191	.for i in ${CDDA2WAVDOCS}
147	@${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav	192	@${INSTALL_DATA} ${WRKSRC}/cdda2wav/${i} ${DOCSDIR}/cdda2wav
148	.endfor	193	.endfor
		194	@${MKDIR} ${DOCSDIR}/cdrecord
		195	.for i in ${CDRECORDDOCS}
		196	@${INSTALL_DATA} ${WRKSRC}/cdrecord/${i} ${DOCSDIR}/cdrecord
		197	.endfor
149	@${MKDIR} ${DOCSDIR}/mkisofs	198	@${MKDIR} ${DOCSDIR}/mkisofs
150	.for i in ${MKISOFSDOCS}	199	.for i in ${MKISOFSDOCS}
151	@${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}/mkisofs	200	@${INSTALL_DATA} ${WRKSRC}/mkisofs/${i} ${DOCSDIR}/mkisofs

Lines 1-36 Link Here

(-)sysutils/cdrtools/files/patch-README.rscsi (-36 lines)
1	--- README.rscsi.orig Sun Aug 17 11:31:39 2003
2	+++ README.rscsi Sun Aug 17 14:38:57 2003
3	@@ -18,24 +18,21 @@
4	NOTE: In this case, rscsi must be installed suid root.
5	** This is the preferred method **
6
7	-To enable remote SCSI via the login shell method you should do the following:
8	-
9	- - Add an entry to /etc/passwd in the form:
10	+ The FreeBSD port automatically installs the rscsi binary suid
11	+ root and creates the user "rscsi".
12
13	- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
14	-
15	- (modify this according to your OS). And don't forget to
16	- modify /etc/shadow the way it needs to be on your OS.
17	+To enable remote SCSI via the login shell method you should do the following:
18
19	- - Create a home directory for this user and add a .rhosts file
20	- to allow access to all users you like.
21	+ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf
22	+ and inetd(8) is running.
23
24	- - Install rscsi suid root into /opt/schily/sbin
25	+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you
26	+ like.
27
28	- - Install a file /etc/default/rscsi and define access rights.
29	+ - Edit /usr/local/etc/rscsi and define access rights.
30	Without this file, rscsi will not work at all.
31
32	- The template for this file is: rscsi/rscsi.dfl
33	+ The template for this file is: /usr/local/etc/rscsi.sample
34
35	RSCSI Security:
36

Lines 1-32 Link Here

(-)sysutils/cdrtools/files/patch-ad (-15 / +51 lines)
1	--- RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002	1	###########################################################################
2	+++ RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002	2	# This patch was contributed by Marius Strobl.
3	@@ -24,7 +24,8 @@	3	###########################################################################
		4	# The contents of this file are subject to the terms of the
		5	# Common Development and Distribution License, Version 1.0 only
		6	# (the "License"). You may not use this file except in compliance
		7	# with the License.
		8	#
		9	# See the file CDDL.Schily.txt in this distribution for details.
		10	#
		11	# When distributing Covered Code, include this CDDL HEADER in each
		12	# file and include the License file CDDL.Schily.txt from this distribution.
		13	###########################################################################
		14	# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
		15	# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
		16	###########################################################################
		17
		18	--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006
		19	+++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006
		20	@@ -20,8 +20,9 @@
4	###########################################################################	21	###########################################################################
5		22
6	CPPFLAGS= $(CPPOPTS) $(CPPOPTX)	23	CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
7	-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)	24	-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
		25	-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
8	+XCFLAGS:= $(CFLAGS)	26	+XCFLAGS:= $(CFLAGS)
9	+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)	27	+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
		28	+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX)
10		29
11	CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)	30	CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS)
12	COPTS=	31	COPTS=
13	@@ -57,14 +58,14 @@	32	@@ -29,12 +30,10 @@
		33	CWOPTS= -Wall -Wtraditional
		34	CWOPTS= -Wall -Wno-unknown-pragmas \
		35	-Wshadow -Wmissing-prototypes -Wstrict-prototypes
		36	-COPTOPT= -O
		37	COPTDYN= -fpic
		38	COPTGPROF= -pg
		39	C++OPTS=
		40	C++WOPTS= $(CWOPTS)
		41	-C++OPTOPT= $(COPTOPT)
		42	C++OPTDYN= -fpic
		43	C++OPTGPROF= -pg
		44
		45	@@ -54,15 +53,15 @@
14		46
15	FLOAT_OPTIONS=	47	FLOAT_OPTIONS=
16		48
17	-CC= @echo " ==> COMPILING \"$@\""; gcc	49	-CC= @echo " ==> COMPILING \"$@\""; gcc
		50	-CC++ = @echo " ==> COMPILING \"$@\""; g++
18	-LDCC= @echo " ==> LINKING \"$@\""; gcc	51	-LDCC= @echo " ==> LINKING \"$@\""; gcc
		52	-LDCC++ = @echo " ==> LINKING \"$@\""; g++
19	-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc	53	-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
20	-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib	54	-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++
21	+CCCOM= $(CC)	55	+CC_COM= $(CC)
22	+LDCC= $(CCCOM)	56	+CC++ = $(CXX)
23	+DYNLD= $(CCCOM)	57	+LDCC= $(CC)
24	+RANLIB= ranlib	58	+LDCC++ = $(CXX)
25	ARFLAGS= cr	59	+DYNLD= $(CC)
26	LORDER= lorder	60	+DYNLDC++ = $(CXX)
27	TSORT= tsort
28		61
29	RMDEP= :	62	RMDEP= :
30	-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M	63	-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
31	+MKDEP= $(CCCOM) -M	64	+MKDEP= $(CC) -M
32	MKDEP_OUT=	65	MKDEP_OUT=
		66	-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M
		67	+MKC++DEP= $(CXX) -M
		68	MKC++DEP_OUT=

Lines 1-20 Link Here

(-)sysutils/cdrtools/files/patch-cdda2wav-toc.c (-20 lines)
1	--- cdda2wav/toc.c.original Fri May 21 22:56:44 2004
2	+++ cdda2wav/toc.c Mon Jan 16 13:54:30 2006
3	@@ -959,7 +959,7 @@
4	if (*target != NULL)
5	**target = '\0';
6	} else {
7	- realloc(target, strlen(target) + clen - 1);
8	+ target = realloc(target, strlen(*target) + clen - 1);
9	}
10	if (*target != NULL) {
11	strcat((char )target, inbuff+ind+7);
12	@@ -994,7 +994,7 @@
13	if (global.tracktitle[tno] != NULL)
14	*(global.tracktitle[tno]) = '\0';
15	} else {
16	- realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
17	+ global.tracktitle[tno] = realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
18	}
19	if (global.tracktitle[tno] != NULL) {
20	strcat((char *)global.tracktitle[tno], q+1);

Lines 1-19 Link Here

(-)sysutils/cdrtools/files/patch-cdda2wav::interface.c (-19 lines)
1	--- cdda2wav/interface.c Mon Dec 29 11:28:09 2003
2	+++ cdda2wav/interface.c Sun Jan 18 01:35:50 2004
3	@@ -445,7 +445,15 @@
4	default: /* for example ATAPI cds */
5	#else
6	#if defined (__FreeBSD__)
7	- case 117:
8	+#if __FreeBSD_version >= 600021
9	+ case 0: /* majors abandoned */
10	+ /* FALLTHROUGH */
11	+#endif
12	+#if __FreeBSD_version >= 501113
13	+ case 4: /* GEOM */
14	+ /* FALLTHROUGH */
15	+#endif
16	+ case 117: /* pre-GEOM atapi cd */
17	if (!S_ISCHR(statstruct->st_mode)) {
18	fprintf(stderr, "%s is not a char device\n",pdev_name);
19	exit(SYNTAX_ERROR);

Lines 1-88 Link Here

(-)sysutils/cdrtools/files/patch-cdda2wav::ioctl.c (-88 lines)
1	--- cdda2wav/ioctl.c Sat Dec 27 17:29:28 2003
2	+++ cdda2wav/ioctl.c Sun Jan 18 01:36:36 2004
3	@@ -59,10 +59,14 @@
4	#include <cdrecord.h>
5
6	#if defined (HAVE_IOCTL_INTERFACE)
7	-#if !defined sun && !defined __sun
8	+#if !defined(sun) && !defined(__sun) && !(__FreeBSD_version >= 501112)
9	static struct cdrom_read_audio arg;
10	#endif
11
12	+#if defined(__FreeBSD__) && __FreeBSD_version >= 400014
13	+static unsigned sector_size = CD_FRAMESIZE;
14	+#endif
15	+
16	static int err;
17
18	static void EnableCdda_cooked __PR((SCSI *scgp, int fAudioMode, unsigned uSectorsize));
19	@@ -72,13 +76,23 @@
20	int fAudioMode;
21	unsigned uSectorsize;
22	{
23	+#if defined(__FreeBSD__) && __FreeBSD_version >= 400014
24	+ if (scgp && scgp->verbose)
25	+ fprintf(stderr, "EnableCdda_cooked (CDRIOCSETBLOCKSIZE)...\n");
26	+
27	+ if (fAudioMode) {
28	+ if (ioctl(global.cooked_fd, CDRIOCGETBLOCKSIZE, &sector_size) ==-1)
29	+ sector_size = CD_FRAMESIZE;
30	+ ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &uSectorsize);
31	+ } else
32	+ ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &sector_size);
33	+#elif defined CDIOCSETCDDA
34	if (scgp && scgp->verbose) {
35	fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA)...\n");
36	if (uSectorsize != CD_FRAMESIZE_RAW)
37	fprintf(stderr, "non audio sector size is ignored.\n");
38	}
39
40	-#if defined CDIOCSETCDDA
41	ioctl(global.cooked_fd, CDIOCSETCDDA, &fAudioMode);
42	#else
43	fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA) is not available...\n");
44	@@ -197,6 +211,10 @@
45	/* trash the cache */
46
47	#if defined __FreeBSD__
48	+#if __FreeBSD_version >= 501112
49	+ pread(global.cooked_fd, (void ) &p[0], 3CD_FRAMESIZE_RAW,
50	+ find_an_off_sector(lSector, SectorBurstVal)*CD_FRAMESIZE_RAW);
51	+#else
52	static struct cdrom_read_audio arg2;
53
54	arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
55	@@ -206,6 +224,7 @@
56
57	ioctl(global.cooked_fd, CDROMREADAUDIO, &arg2);
58	#endif
59	+#endif
60	#if defined __linux__
61	static struct cdrom_read_audio arg2;
62
63	@@ -267,6 +286,17 @@
64
65	/* read 2352 bytes audio data */
66	#if defined __FreeBSD__
67	+#if __FreeBSD_version >= 501112
68	+ if (x && x->verbose) {
69	+ fprintf(stderr, "ReadCdRom_cooked (pread)...\n");
70	+ }
71	+
72	+ do {
73	+ err = 0;
74	+ if (pread(global.cooked_fd, (void ) &p[0], SectorBurstValCD_FRAMESIZE_RAW,
75	+ lSector*CD_FRAMESIZE_RAW) == -1)
76	+ err = -1;
77	+#else
78	arg.address.lba = lSector;
79	arg.addr_format = CDROM_LBA;
80	arg.nframes = SectorBurstVal;
81	@@ -278,6 +308,7 @@
82
83	do {
84	err = ioctl(global.cooked_fd, CDROMREADAUDIO, &arg);
85	+#endif
86	#endif
87	#if defined __linux__
88	arg.addr.lba = lSector;

Lines 1-24 Link Here

(-)sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h (-24 lines)
1	--- cdda2wav/mycdrom.h Wed Sep 4 14:07:16 2002
2	+++ cdda2wav/mycdrom.h Sat Jan 17 18:52:08 2004
3	@@ -4,6 +4,12 @@
4	#else
5	# if defined HAVE_SYS_CDIO_H
6	# include <sys/cdio.h>
7	+# if defined(__FreeBSD__) && __FreeBSD__ >= 2
8	+# include <osreldate.h>
9	+# if __FreeBSD_version >= 400014
10	+# include <sys/cdrio.h>
11	+# endif
12	+# endif
13
14	# if (defined (__sun) && defined (SVR4))
15	# if 0
16	@@ -53,7 +59,7 @@
17	# endif /* if 0 */
18	# else /* not Sun SVR4 */
19	# if defined __FreeBSD__ \|\| defined __NetBSD__ \|\| defined __OpenBSD__
20	-# if !defined CDIOCREADAUDIO
21	+# if (!defined(__FreeBSD__) && !defined(CDIOCREADAUDIO)) \|\| __FreeBSD_version < 228000
22	# undef HAVE_IOCTL_INTERFACE
23	# else
24

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-cdrecord-README.rscsi (+36 lines)
	1	--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003
	2	+++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003
	3	@@ -18,24 +18,21 @@
	4	NOTE: In this case, rscsi must be installed suid root.
	5	** This is the preferred method **
	6
	7	-To enable remote SCSI via the login shell method you should do the following:
	8	-
	9	- - Add an entry to /etc/passwd in the form:
	10	+ The FreeBSD port automatically installs the rscsi binary suid
	11	+ root and creates the user "rscsi".
	12
	13	- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
	14	-
	15	- (modify this according to your OS). And don't forget to
	16	- modify /etc/shadow the way it needs to be on your OS.
	17	+To enable remote SCSI via the login shell method you should do the following:
	18
	19	- - Create a home directory for this user and add a .rhosts file
	20	- to allow access to all users you like.
	21	+ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf
	22	+ and inetd(8) is running.
	23
	24	- - Install rscsi suid root into /opt/schily/sbin
	25	+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you
	26	+ like.
	27
	28	- - Install a file /etc/default/rscsi and define access rights.
	29	+ - Edit /usr/local/etc/rscsi and define access rights.
	30	Without this file, rscsi will not work at all.
	31
	32	- The template for this file is: rscsi/rscsi.dfl
	33	+ The template for this file is: /usr/local/etc/rscsi.sample
	34
	35	RSCSI Security:
	36

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-cdrecord-cdrecord.dfl (+64 lines)
	1	--- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003
	2	+++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003
	3	@@ -3,7 +3,7 @@
	4	# This file is /etc/default/cdrecord
	5	# It contains defaults that are used if no command line option
	6	# or environment is present.
	7	-#
	8	+#
	9	# The default device, if not specified elswhere
	10	# Note that since Sommer 2006, cdrecord by default searches for a
	11	# single CD-ROM device. You should set CDR_DEVICE= together with
	12	@@ -11,15 +11,14 @@
	13	# one CR-ROM drive in your system.
	14	#
	15	#CDR_DEVICE=yamaha
	16	-#CDR_DEVICE=default
	17
	18	-#
	19	+#
	20	# The default speed (speed=), if not specified elswhere
	21	#
	22	# Note that newer cdrecord versions do not default
	23	# to speed=1. For MMC compliant drives, the default
	24	# is to write at maximum speed, so it in general does
	25	-# not make sense to set up a default speed in /etc/default/cdrecord
	26	+# not make sense to set up a default speed in /etc/default/cdrecord
	27	#
	28	#CDR_SPEED=40
	29
	30	@@ -34,7 +33,7 @@
	31	# Linux and Solaris have problems with bigger transfer sizes.
	32	# If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k
	33	#
	34	-#CDR_TRANSFERSIZE=32k
	35	+CDR_TRANSFERSIZE=126k
	36
	37	#
	38	# The following definitions allow abstract device names.
	39	@@ -56,14 +55,14 @@
	40	#
	41	# drive name device speed fifosize driveropts transfersize
	42	#
	43	-my-default= 1,0,0 -1 -1 burnfree 63k
	44	-sol-default= USCSI:1,0,0 -1 -1 burnfree
	45	-ricoh-u= USCSI:0,2,0 -1 -1 burnfree
	46	-teac= 1,3,0 -1 -1 ""
	47	-teac-max-ts= 1,3,0 -1 -1 "" 32k
	48	-panasonic= 1,4,0 -1 -1 ""
	49	-plextor= 1,4,0 -1 -1 ""
	50	-sanyo= 1,4,0 -1 -1 burnfree
	51	-yamaha= 1,5,0 -1 -1 ""
	52	-cdrom= 0,6,0 2 1m ""
	53	-remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree
	54	+#my-default= 1,0,0 -1 -1 burnfree 63k
	55	+#sol-default= USCSI:1,0,0 -1 -1 burnfree
	56	+#ricoh-u= USCSI:0,2,0 -1 -1 burnfree
	57	+#teac= 1,3,0 -1 -1 ""
	58	+#teac-max-ts= 1,3,0 -1 -1 "" 32k
	59	+#panasonic= 1,4,0 -1 -1 ""
	60	+#plextor= 1,4,0 -1 -1 ""
	61	+#sanyo= 1,4,0 -1 -1 burnfree
	62	+#yamaha= 1,5,0 -1 -1 ""
	63	+#cdrom= 0,6,0 2 1m ""
	64	+#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-mkisofs-mkisofs.8 (+20 lines)
	1	--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003
	2	+++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003
	3	@@ -1668,7 +1668,7 @@
	4	The format of the
	5	.I magic
	6	file is almost identical to the
	7	-.BR magic (4)
	8	+.BR magic (5)
	9	file used by the Linux
	10	.BR file (1)
	11	command - the routines for reading and decoding the
	12	@@ -1707,7 +1707,7 @@
	13	.TE
	14	.PP
	15	The format of the file is described in the
	16	-.BR magic (4)
	17	+.BR magic (5)
	18	man page. The only difference here is that for each entry in the magic file, the
	19	.I message
	20	for the initial offset

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-readcd-readcd.1 (+30 lines)
	1	###########################################################################
	2	# This patch was contributed by Marius Strobl.
	3	###########################################################################
	4	# The contents of this file are subject to the terms of the
	5	# Common Development and Distribution License, Version 1.0 only
	6	# (the "License"). You may not use this file except in compliance
	7	# with the License.
	8	#
	9	# See the file CDDL.Schily.txt in this distribution for details.
	10	#
	11	# When distributing Covered Code, include this CDDL HEADER in each
	12	# file and include the License file CDDL.Schily.txt from this distribution.
	13	###########################################################################
	14	# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
	15	# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
	16	###########################################################################
	17
	18	--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003
	19	+++ readcd/readcd.1 Mon Sep 29 15:10:06 2003
	20	@@ -432,9 +432,7 @@
	21	.SH FILES
	22	.SH SEE ALSO
	23	.BR cdrecord (1),
	24	-.BR mkisofs (1),
	25	-.BR scg (7),
	26	-.BR fbk (7),
	27	+.BR mkisofs (8),
	28	.BR rcmd (3),
	29	.BR ssh (1).
	30

Lines 1-63 Link Here

(-)sysutils/cdrtools/files/patch-readcd::readcd.c (-63 lines)
1	--- readcd/readcd.c.original Sun Jan 15 17:14:03 2006
2	+++ readcd/readcd.c Sun Jan 15 17:24:47 2006
3	@@ -253,9 +256,9 @@
4	int fcount;
5	int cac;
6	char * const *cav;
7	- int scsibus = 0;
8	- int target = 0;
9	- int lun = 0;
10	+ int scsibus = -1;
11	+ int target = -1;
12	+ int lun = -1;
13	int silent = 0;
14	int verbose = 0;
15	int kdebug = 0;
16	@@ -335,20 +338,22 @@
17	usage(EX_BAD);
18	/* NOTREACHED */
19	}
20	- } else {
21	- scsibus = 0;
22	}
23	cac--;
24	cav++;
25	}
26	/error("dev: '%s'\n", dev);/
27	-
28	if (!scanbus)
29	cdr_defaults(&dev, NULL, NULL, NULL);
30	if (debug) {
31	printf("dev: '%s'\n", dev);
32	}
33	- if (dev) {
34	+ if (!scanbus && dev == NULL &&
35	+ scsibus == -1 && (target == -1 \|\| lun == -1)) {
36	+ errmsgno(EX_BAD, "No SCSI device specified.\n");
37	+ usage(EX_BAD);
38	+ }
39	+ if (dev \|\| scanbus) {
40	char errstr[80];
41
42	/*
43	@@ -357,8 +362,9 @@
44	* remote routines that are located inside libscg.
45	*/
46	scg_remote();
47	- if ((strncmp(dev, "HELP", 4) == 0) \|\|
48	- (strncmp(dev, "help", 4) == 0)) {
49	+ if (dev != NULL &&
50	+ ((strncmp(dev, "HELP", 4) == 0) \|\|
51	+ (strncmp(dev, "help", 4) == 0))) {
52	scg_help(stderr);
53	exit(0);
54	}
55	@@ -1629,7 +1656,7 @@
56	end = scgp->cap->c_baddr + 1;
57	scgp->silent--;
58
59	- if (end <= 0 \|\| isrange \|\| (askrange && scg_yes("Ignore disk size? ")))
60	+ if ((end <= 0 && isrange) \|\| (askrange && scg_yes("Ignore disk size? ")))
61	end = 10000000; /* Hack to read empty (e.g. blank=fast) disks */
62
63	if (parmp) {

Line 0 Link Here

(-)sysutils/cdrtools/files/patch-rscsi-rscsi.dfl (+19 lines)
	1	--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003
	2	+++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003
	3	@@ -18,14 +18,13 @@
	4	# Each USER= entry adds the listed user to the users who may run rscsi
	5	#
	6	# A typical passwd entry looks like this:
	7	-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi
	8	+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi
	9	#
	10	-# Add entries for all valid remote users to /export/home/rscsi/.rhosts
	11	+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts
	12	#
	13	# USER= entries are checked with a pattern matcher. USER=* matches all users.
	14	#
	15	USER=rscsi
	16	-#USER=joerg
	17
	18	#
	19	# Each ACCESS= entry adds a target or group of targets to the list of visible

Lines 1-29 Link Here

(-)sysutils/cdrtools/files/patch-rscsi::rscsi.dfl (-29 lines)
1	--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003
2	+++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003
3	@@ -18,14 +18,13 @@
4	# Each USER= entry adds the listed user to the users who may run rscsi
5	#
6	# A typical passwd entry looks like this:
7	-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi
8	+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi
9	#
10	-# Add entries for all valid remote users to /export/home/rscsi/.rhosts
11	+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts
12	#
13	# USER= entries are checked with a pattern matcher. USER=* matches all users.
14	#
15	USER=rscsi
16	-USER=joerg
17
18	#
19	# Each ACCESS= entry adds a target or group of targets to the list of visible
20	@@ -52,6 +51,6 @@
21	# name name
22	#
23	#ACCESS=rscsi sparky -1 -1 -1 -1
24	-ACCESS=rscsi sparky 0 -1 6 -1
25	-ACCESS=rscsi sparky 1 -1 3 -1
26	-ACCESS=rscsi sparky 1 -1 4 -1
27	+#ACCESS=rscsi sparky 0 -1 6 -1
28	+#ACCESS=rscsi sparky 1 -1 3 -1
29	+#ACCESS=rscsi sparky 1 -1 4 -1

Lines 1-3 Link Here

(-)sysutils/cdrtools/pkg-plist (-15 / +66 lines)
		1	bin/btcflash
1	bin/cdda2wav	2	bin/cdda2wav
2	bin/cdrecord	3	bin/cdrecord
3	bin/devdump	4	bin/devdump
Lines 10-15 Link Here
10	bin/mkisofs	11	bin/mkisofs
11	bin/readcd	12	bin/readcd
12	bin/scgcheck	13	bin/scgcheck
		14	lib/siconv/cp10000
		15	lib/siconv/cp10006
		16	lib/siconv/cp10007
		17	lib/siconv/cp10029
		18	lib/siconv/cp10079
		19	lib/siconv/cp10081
		20	lib/siconv/cp1250
		21	lib/siconv/cp1251
		22	lib/siconv/cp1252
		23	lib/siconv/cp1253
		24	lib/siconv/cp1254
		25	lib/siconv/cp1255
		26	lib/siconv/cp1256
		27	lib/siconv/cp1257
		28	lib/siconv/cp1258
		29	lib/siconv/cp437
		30	lib/siconv/cp737
		31	lib/siconv/cp775
		32	lib/siconv/cp850
		33	lib/siconv/cp852
		34	lib/siconv/cp855
		35	lib/siconv/cp857
		36	lib/siconv/cp860
		37	lib/siconv/cp861
		38	lib/siconv/cp862
		39	lib/siconv/cp863
		40	lib/siconv/cp864
		41	lib/siconv/cp865
		42	lib/siconv/cp866
		43	lib/siconv/cp869
		44	lib/siconv/cp874
		45	lib/siconv/iso8859-1
		46	lib/siconv/iso8859-10
		47	lib/siconv/iso8859-11
		48	lib/siconv/iso8859-13
		49	lib/siconv/iso8859-14
		50	lib/siconv/iso8859-15
		51	lib/siconv/iso8859-16
		52	lib/siconv/iso8859-2
		53	lib/siconv/iso8859-3
		54	lib/siconv/iso8859-4
		55	lib/siconv/iso8859-5
		56	lib/siconv/iso8859-6
		57	lib/siconv/iso8859-7
		58	lib/siconv/iso8859-8
		59	lib/siconv/iso8859-9
		60	lib/siconv/koi8-r
		61	lib/siconv/koi8-u
		62	@dirrm lib/siconv
13	%%RSCSI%%sbin/rscsi	63	%%RSCSI%%sbin/rscsi
14	%%RSCSI%%@exec chmod u+s %B/%f	64	%%RSCSI%%@exec chmod u+s %B/%f
15	@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi	65	@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi
Lines 20-42 Link Here
20	%%RSCSI%%@exec [ -f %B/rscsi ] \|\| cp %B/%f %B/rscsi	70	%%RSCSI%%@exec [ -f %B/rscsi ] \|\| cp %B/%f %B/rscsi
21	%%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	71	%%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
22	%%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi	72	%%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi
23	%%PORTDOCS%%%%DOCSDIR%%/README
24	%%PORTDOCS%%%%DOCSDIR%%/README.ATAPI
25	%%PORTDOCS%%%%DOCSDIR%%/README.DiskT@2
26	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD	73	%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
27	%%PORTDOCS%%%%DOCSDIR%%/README.WORM
28	%%PORTDOCS%%%%DOCSDIR%%/README.audio
29	%%PORTDOCS%%%%DOCSDIR%%/README.cdplus
30	%%PORTDOCS%%%%DOCSDIR%%/README.cdrw
31	%%PORTDOCS%%%%DOCSDIR%%/README.cdtext
32	%%PORTDOCS%%%%DOCSDIR%%/README.clone
33	%%PORTDOCS%%%%DOCSDIR%%/README.copy
34	%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs	74	%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs
35	%%PORTDOCS%%%%DOCSDIR%%/README.multi
36	%%PORTDOCS%%%%DOCSDIR%%/README.raw
37	%%PORTDOCS%%%%DOCSDIR%%/README.rscsi
38	%%PORTDOCS%%%%DOCSDIR%%/README.sony
39	%%PORTDOCS%%%%DOCSDIR%%/README.verify
40	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ	75	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/FAQ
41	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends	76	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/Frontends
42	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE	77	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/HOWTOUSE
Lines 45-50 Link Here
45	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS	80	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/THANKS
46	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO	81	%%PORTDOCS%%%%DOCSDIR%%/cdda2wav/TODO
47	%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav	82	%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdda2wav
		83	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README
		84	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.ATAPI
		85	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.DiskT@2
		86	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.WORM
		87	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.audio
		88	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdplus
		89	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdrw
		90	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.cdtext
		91	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.clone
		92	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.copy
		93	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.multi
		94	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.raw
		95	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.rscsi
		96	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.sony
		97	%%PORTDOCS%%%%DOCSDIR%%/cdrecord/README.verify
		98	%%PORTDOCS%%@dirrm %%DOCSDIR%%/cdrecord
48	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README	99	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README
49	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression	100	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.compression
50	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito	101	%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.eltorito