freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update cdrtools to 3.00. For changes since 2.01 see:

Browse Source 
ftp://ftp.berlios.de/pub/cdrecord/AN-3.00

Note that this breaks and obsoletes sysutils/cdrtools-cjk as mkisofs now
employs iconv for character conversion. Consequently USE_CDRTOOLS=cjk and
USE_CDRTOOLS together with WITH_CJK are now defunct and bsd.port.mk is
expected to be updated by portmgr@ accordingly (PR 150362).

PR:		127608, 149644
Approved by:	netchild
This commit is contained in:
Marius Strobl
2010-09-15 17:35:24 +00:00
parent 8fbb2240c2
commit 3db38e483c
19 changed files with 329 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
UPDATING
View File

@@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20100915:
AFFECTS: users of sysutils/cdrtools-cjk
AUTHOR: marius@FreeBSD.org
Version 3.00 of sysutils/cdrtools breaks but at the same time also
obsoletes sysutils/cdrtools-cjk as mkisofs now employs iconv for
character conversion. Consequently sysutils/cdrtools-cjk is marked
BROKEN and the use of USE_CDRTOOLS=cjk as well as USE_CDRTOOLS together
with the WITH_CJK knob left in a broken state until bsd.port.mk is
updated by portmgr@ accordingly. Once USE_CDRTOOLS is updated to no
longer refer to sysutils/cdrtools-cjk the latter will be removed.
Previous users of sysutils/cdrtools-cjk should switch to using
sysutils/cdrtools instead, which might require not using the WITH_CJK
knob until said update of bsd.port.mk has happened.
20100915:
AFFECTS: users of lang/perl5.12
AUTHOR: skv@FreeBSD.org

2
sysutils/cdrtools-cjk/Makefile
View File

@@ -23,4 +23,6 @@ MASTERDIR= ${.CURDIR}/../cdrtools
DESCR= ${.CURDIR}/pkg-descr
MD5_FILE= ${.CURDIR}/distinfo
BROKEN= does not build and is obsolete, please use sysutils/cdrtools instead
.include "${MASTERDIR}/Makefile"

97
sysutils/cdrtools/Makefile
View File

@@ -4,33 +4,55 @@
#
# $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
PORTREVISION?= 8
CATEGORIES?= sysutils audio
PORTVERSION= 3.00
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/CD-R[W] and ISO-9660 image creation and extraction tools
COMMENT= CD/DVD and ISO-9660 image creation and extraction tools
CONFLICTS?= cdrkit-* cdrtools-devel-* cjk-cdrtools-*
CONFLICTS= cdrkit-* cdrtools-devel-* cjk-cdrtools-*
MAN1= cdda2wav.1 cdrecord.1 readcd.1 scgcheck.1
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
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
USE_BZIP2= yes
USE_GMAKE= yes
@@ -39,6 +61,7 @@ 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
@@ -46,11 +69,19 @@ PKGNAMESUFFIX= -rscsi
PLIST_SUB= RSCSI="@comment "
.endif
MAKE_ENV= CCOM=cc LANG=C
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} ""
@@ -59,15 +90,16 @@ 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
post-extract:
.for i in config.guess config.sub
@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf
@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/cdda2wav
.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 \
@@ -79,26 +111,29 @@ post-patch:
.if !defined(WITH_RSCSI)
@${RM} ${WRKSRC}/TARGETS/55rscsi
.endif
.for i in README.rscsi include/deflts.h cdda2wav/cdda2wav.1 \
cdrecord/cdrecord.1 cdrecord/cdrecord.dfl cdrecord/defaults.c \
librscg/scsi-remote.c readcd/readcd.1 rscsi/rscsi.c rscsi/rscsi.dfl \
.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
.for i in include/schily.h libschily/fexec.c
@${REINPLACE_CMD} -e 's|fexecve|js_fexecve|g' ${WRKSRC}/${i}
@${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
@@ -120,9 +155,13 @@ do-install:
.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
@@ -131,6 +170,10 @@ do-install:
.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)
@@ -145,6 +188,10 @@ do-install:
@${MKDIR} ${DOCSDIR}/cdda2wav
.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}

6
sysutils/cdrtools/distinfo
View File

@@ -1,3 +1,3 @@
MD5 (cdrtools-2.01.tar.bz2) = d44a81460e97ae02931c31188fe8d3fd
SHA256 (cdrtools-2.01.tar.bz2) = 728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22
SIZE (cdrtools-2.01.tar.bz2) = 1400389
MD5 (cdrtools-3.00.tar.bz2) = f9fbab08fbd458b0d2312976d8c5f558
SHA256 (cdrtools-3.00.tar.bz2) = 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
SIZE (cdrtools-3.00.tar.bz2) = 1978563

66
sysutils/cdrtools/files/patch-ad
View File

@@ -1,32 +1,68 @@
--- RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002
+++ RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002
@@ -24,7 +24,8 @@
###########################################################################
# 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= $(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=
@@ -57,14 +58,14 @@
@@ -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
-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
+CCCOM= $(CC)
+LDCC= $(CCCOM)
+DYNLD= $(CCCOM)
+RANLIB= ranlib
ARFLAGS= cr
LORDER= lorder
TSORT= tsort
-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=

10
sysutils/cdrtools/files/patch-btcflash::btcflash.1 Normal file
View File

@@ -0,0 +1,10 @@
--- 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

20
sysutils/cdrtools/files/patch-cdda2wav-toc.c
View File

@@ -1,20 +0,0 @@
--- 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);

19
sysutils/cdrtools/files/patch-cdda2wav::interface.c
View File

@@ -1,19 +0,0 @@
--- 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);

88
sysutils/cdrtools/files/patch-cdda2wav::ioctl.c
View File

@@ -1,88 +0,0 @@
--- 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;

24
sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h
View File

@@ -1,24 +0,0 @@
--- 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

4
sysutils/cdrtools/files/patch-README.rscsi → sysutils/cdrtools/files/patch-cdrecord::README.rscsi
View File

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

17
sysutils/cdrtools/files/patch-cdrecord::cdrecord.1
View File

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

78
sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl
View File

@@ -1,36 +1,64 @@
--- 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 @@
#
@@ -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=yamaha
#CDR_DEVICE=yamaha
-#CDR_DEVICE=default
#
# The default speed, if not specified elswhere
@@ -21,7 +21,7 @@
#
# The default FIFO size if, not specified elswhere
-#
+#
# The default speed (speed=), if not specified elswhere
#
-CDR_FIFOSIZE=4m
+#CDR_FIFOSIZE=4m
# 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.
@@ -33,9 +33,9 @@
@@ -56,14 +55,14 @@
#
# drive name device speed fifosize driveropts
# drive name device speed fifosize driveropts transfersize
#
-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 ""
-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

17
sysutils/cdrtools/files/patch-readcd::readcd.1
View File

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

63
sysutils/cdrtools/files/patch-readcd::readcd.c
View File

@@ -1,63 +0,0 @@
--- 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) {

12
sysutils/cdrtools/files/patch-rscsi::rscsi.dfl
View File

@@ -13,17 +13,7 @@
# USER= entries are checked with a pattern matcher. USER=* matches all users.
#
USER=rscsi
-USER=joerg
-#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

17
sysutils/cdrtools/files/patch-scgcheck::scgcheck.1
View File

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

5
sysutils/cdrtools/pkg-descr
View File

@@ -3,8 +3,9 @@ ISO-9660 filesystems, verify their integrity, and write them to
disc.
This package contains the following programs:
- cdda2wav (an digital CD audio extraction program)
- cdrecord (a CD-R[W] recording program)
- btcflash (a firmware flash utility for BTC DRW1008 DVD+/-RW recorder)
- cdda2wav (a digital CD audio extraction program)
- cdrecord (a CD/DVD recording program)
- devdump (dump a device or file in hex)
- isodebug (show debug info contained in an ISO-9660 image)
- isodump (dump a device or file based on ISO-9660)

81
sysutils/cdrtools/pkg-plist
View File

@@ -1,3 +1,4 @@
bin/btcflash
bin/cdda2wav
bin/cdrecord
bin/devdump
@@ -10,6 +11,55 @@ bin/mkhybrid
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
@@ -20,23 +70,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
@@ -45,6 +80,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