diff options
Diffstat (limited to 'sysutils/cdrtools/files')
| -rw-r--r-- | sysutils/cdrtools/files/patch-ad | 66 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-btcflash::btcflash.1 | 10 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdda2wav-toc.c | 20 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdda2wav::interface.c | 19 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdda2wav::ioctl.c | 88 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h | 24 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdrecord::README.rscsi (renamed from sysutils/cdrtools/files/patch-README.rscsi) | 4 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 | 17 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl | 78 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-readcd::readcd.1 | 17 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-readcd::readcd.c | 63 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-rscsi::rscsi.dfl | 12 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 | 17 |
13 files changed, 168 insertions, 267 deletions
diff --git a/sysutils/cdrtools/files/patch-ad b/sysutils/cdrtools/files/patch-ad index 9627dae9d485..ead64aaf1330 100644 --- a/sysutils/cdrtools/files/patch-ad +++ b/sysutils/cdrtools/files/patch-ad @@ -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= diff --git a/sysutils/cdrtools/files/patch-btcflash::btcflash.1 b/sysutils/cdrtools/files/patch-btcflash::btcflash.1 new file mode 100644 index 000000000000..c8b30d32f974 --- /dev/null +++ b/sysutils/cdrtools/files/patch-btcflash::btcflash.1 @@ -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 diff --git a/sysutils/cdrtools/files/patch-cdda2wav-toc.c b/sysutils/cdrtools/files/patch-cdda2wav-toc.c deleted file mode 100644 index c89084eb03f9..000000000000 --- a/sysutils/cdrtools/files/patch-cdda2wav-toc.c +++ /dev/null @@ -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); diff --git a/sysutils/cdrtools/files/patch-cdda2wav::interface.c b/sysutils/cdrtools/files/patch-cdda2wav::interface.c deleted file mode 100644 index c379b032b691..000000000000 --- a/sysutils/cdrtools/files/patch-cdda2wav::interface.c +++ /dev/null @@ -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); diff --git a/sysutils/cdrtools/files/patch-cdda2wav::ioctl.c b/sysutils/cdrtools/files/patch-cdda2wav::ioctl.c deleted file mode 100644 index 1c13170bf8b4..000000000000 --- a/sysutils/cdrtools/files/patch-cdda2wav::ioctl.c +++ /dev/null @@ -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, §or_size) ==-1) -+ sector_size = CD_FRAMESIZE; -+ ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, &uSectorsize); -+ } else -+ ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, §or_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; diff --git a/sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h b/sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h deleted file mode 100644 index 49c7b484d701..000000000000 --- a/sysutils/cdrtools/files/patch-cdda2wav::mycdrom.h +++ /dev/null @@ -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 - diff --git a/sysutils/cdrtools/files/patch-README.rscsi b/sysutils/cdrtools/files/patch-cdrecord::README.rscsi index 8fed06bfc876..9398843e937a 100644 --- a/sysutils/cdrtools/files/patch-README.rscsi +++ b/sysutils/cdrtools/files/patch-cdrecord::README.rscsi @@ -1,5 +1,5 @@ ---- README.rscsi.orig Sun Aug 17 11:31:39 2003 -+++ README.rscsi Sun Aug 17 14:38:57 2003 +--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 ++++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 @@ -18,24 +18,21 @@ NOTE: In this case, rscsi must be installed suid root. **** This is the preferred method **** diff --git a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 b/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 index 4413a3a8604d..88dc6bf0398f 100644 --- a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 +++ b/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 @@ -1,3 +1,20 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + --- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 +++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 @@ -1738,8 +1738,6 @@ diff --git a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl b/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl index 3eebcb7bab92..859f92768c34 100644 --- a/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl +++ b/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl @@ -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 diff --git a/sysutils/cdrtools/files/patch-readcd::readcd.1 b/sysutils/cdrtools/files/patch-readcd::readcd.1 index f6618e3f419a..ebd5ae8842c3 100644 --- a/sysutils/cdrtools/files/patch-readcd::readcd.1 +++ b/sysutils/cdrtools/files/patch-readcd::readcd.1 @@ -1,3 +1,20 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + --- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 +++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 @@ -432,9 +432,7 @@ diff --git a/sysutils/cdrtools/files/patch-readcd::readcd.c b/sysutils/cdrtools/files/patch-readcd::readcd.c deleted file mode 100644 index 4d2f2502011f..000000000000 --- a/sysutils/cdrtools/files/patch-readcd::readcd.c +++ /dev/null @@ -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) { diff --git a/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl b/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl index 85eab6940d08..edbd1340c469 100644 --- a/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl +++ b/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl @@ -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 diff --git a/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 b/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 index 0120c5231a34..d42f4c8c1c98 100644 --- a/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 +++ b/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 @@ -1,3 +1,20 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + --- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 +++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 @@ -234,8 +234,7 @@ |