summaryrefslogtreecommitdiff
path: root/sysutils/cdrtools/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cdrtools/files')
-rw-r--r--sysutils/cdrtools/files/patch-ac11
-rw-r--r--sysutils/cdrtools/files/patch-ad31
-rw-r--r--sysutils/cdrtools/files/patch-ae38
-rw-r--r--sysutils/cdrtools/files/patch-af89
-rw-r--r--sysutils/cdrtools/files/patch-ag20
-rw-r--r--sysutils/cdrtools/files/patch-ah20
-rw-r--r--sysutils/cdrtools/files/patch-ai87
-rw-r--r--sysutils/cdrtools/files/patch-aj42
-rw-r--r--sysutils/cdrtools/files/patch-ba10
9 files changed, 0 insertions, 348 deletions
diff --git a/sysutils/cdrtools/files/patch-ac b/sysutils/cdrtools/files/patch-ac
deleted file mode 100644
index c729a75dfe76..000000000000
--- a/sysutils/cdrtools/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/schily.h.orig Mon Aug 30 16:50:46 1999
-+++ include/schily.h Sat Sep 18 17:25:57 1999
-@@ -34,7 +34,7 @@
- #define _SCHILY_H
-
- #ifndef _STANDARD_H
--#include <standard.h.h>
-+#include <standard.h>
- #endif
-
- #if defined(_SIZE_T) || defined(_T_SIZE_) || defined(_T_SIZE) || \
diff --git a/sysutils/cdrtools/files/patch-ad b/sysutils/cdrtools/files/patch-ad
deleted file mode 100644
index 7b89394c29d7..000000000000
--- a/sysutils/cdrtools/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- RULES/i386-freebsd-cc.rul.orig Sun Aug 29 16:09:56 1999
-+++ RULES/i386-freebsd-cc.rul Wed Sep 22 13:21:08 1999
-@@ -24,7 +24,8 @@
- ###########################################################################
-
- CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
--CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
-+XCFLAGS:= $(CFLAGS)
-+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
-
- CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
- COPTS=
-@@ -57,14 +58,13 @@
-
- FLOAT_OPTIONS=
-
--CC= @echo " ==> COMPILING \"$@\""; gcc
--LDCC= @echo " ==> LINKING \"$@\""; gcc
--DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
--RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+LDCC= $(CC)
-+DYNLD= $(CC)
-+RANLIB= ranlib
- ARFLAGS= cr
- LORDER= lorder
- TSORT= tsort
-
- RMDEP= :
--MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP= $(CC) -M
- MKDEP_OUT=
diff --git a/sysutils/cdrtools/files/patch-ae b/sysutils/cdrtools/files/patch-ae
deleted file mode 100644
index 03f40b8e9ec0..000000000000
--- a/sysutils/cdrtools/files/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
---- cdrecord/drv_philips.c.orig Sun May 7 14:39:57 2000
-+++ cdrecord/drv_philips.c Fri Aug 18 22:40:38 2000
-@@ -518,7 +518,7 @@
- int *speedp;
- int dummy;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- char mode[256];
- int len = 16;
- int page = 0x31;
-@@ -539,7 +539,7 @@
- if (len == 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
-@@ -567,7 +567,7 @@
- int *speedp;
- int dummy;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- char mode[256];
- int len = 20;
- int page = 0x23;
-@@ -588,7 +588,7 @@
- if (len == 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
diff --git a/sysutils/cdrtools/files/patch-af b/sysutils/cdrtools/files/patch-af
deleted file mode 100644
index 3e6ff143cf50..000000000000
--- a/sysutils/cdrtools/files/patch-af
+++ /dev/null
@@ -1,89 +0,0 @@
---- cdrecord/drv_sony.c.orig Sun Jul 2 23:11:58 2000
-+++ cdrecord/drv_sony.c Fri Aug 18 22:40:38 2000
-@@ -399,12 +399,12 @@
- msf_t msf;
-
- char mode[256];
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- struct sony_924_mode_page_22 *xp;
-
- dummy = get_page22_sony(scgp, mode);
- if (dummy >= 0) {
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
-@@ -572,7 +572,7 @@
- int sectype;
- int tracktype;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- char mode[256];
- int len = 0x30;
- int page = 0x23;
-@@ -590,7 +590,7 @@
- if (len == 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
-@@ -613,7 +613,7 @@
- int sectype;
- int tracktype;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- char mode[256];
- int len = 0x30;
- int page = 0x23;
-@@ -635,7 +635,7 @@
- if (len == 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
-@@ -707,7 +707,7 @@
- int toctype;
- int multi;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- char mode[256];
- int i;
- int len = 0x30;
-@@ -718,7 +718,7 @@
- if ((len = get_page22_sony(scgp, mode)) < 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
-@@ -747,7 +747,7 @@
- SCSI *scgp;
- char *mode;
- {
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
- int len = 0x30;
- int page = 0x22;
- struct sony_924_mode_page_22 *xp;
-@@ -764,7 +764,7 @@
- if (len == 0)
- return (-1);
-
-- mp = (struct scsi_mode_page_header *)
-+ mp = (struct scg_scsi_mode_page_header *)
- (mode + sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len);
-
diff --git a/sysutils/cdrtools/files/patch-ag b/sysutils/cdrtools/files/patch-ag
deleted file mode 100644
index e1b0f3b748e2..000000000000
--- a/sysutils/cdrtools/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- cdrecord/modes.c.orig Sun May 7 14:49:37 2000
-+++ cdrecord/modes.c Fri Aug 18 22:40:38 2000
-@@ -58,7 +58,7 @@
- int hdlen;
- int len = 1; /* Nach SCSI Norm */
- int try = 0;
-- struct scsi_mode_page_header *mp;
-+ struct scg_scsi_mode_page_header *mp;
-
- again:
- fillbytes((caddr_t)mode, sizeof(mode), '\0');
-@@ -89,7 +89,7 @@
- scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp));
- hdlen = sizeof(struct scsi_mode_header) +
- ((struct scsi_mode_header *)mode)->blockdesc_len;
-- mp = (struct scsi_mode_page_header *)(mode + hdlen);
-+ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen);
- if (scgp->verbose)
- scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2);
-
diff --git a/sysutils/cdrtools/files/patch-ah b/sysutils/cdrtools/files/patch-ah
deleted file mode 100644
index d9bc5cd64fc0..000000000000
--- a/sysutils/cdrtools/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
---- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000
-+++ libscg/scg/scsireg.h Fri Aug 18 22:40:38 2000
-@@ -244,7 +244,7 @@
-
- #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */
-
--struct scsi_mode_page_header {
-+struct scg_scsi_mode_page_header {
- Ucbit p_code : 6;
- Ucbit res : 1;
- Ucbit parsave : 1;
-@@ -262,7 +262,7 @@
-
- #else /* Motorola byteorder */
-
--struct scsi_mode_page_header {
-+struct scg_scsi_mode_page_header {
- Ucbit parsave : 1;
- Ucbit res : 1;
- Ucbit p_code : 6;
diff --git a/sysutils/cdrtools/files/patch-ai b/sysutils/cdrtools/files/patch-ai
deleted file mode 100644
index 6106947467d8..000000000000
--- a/sysutils/cdrtools/files/patch-ai
+++ /dev/null
@@ -1,87 +0,0 @@
---- cdrecord/drv_philips.c.orig Fri Feb 2 15:14:16 2001
-+++ cdrecord/drv_philips.c Fri Feb 2 16:00:48 2001
-@@ -62,6 +62,7 @@
- LOCAL int write_track_info_philips __PR((SCSI *scgp, int));
- LOCAL int write_track_philips __PR((SCSI *scgp, long, int));
- LOCAL int open_track_philips __PR((SCSI *scgp, cdr_t *dp, int track, track_t *track_info));
-+LOCAL int open_track_plasmon __PR((SCSI *scgp, cdr_t *dp, int track, track_t *track_info));
- LOCAL int open_track_oldphilips __PR((SCSI *scgp, cdr_t *dp, int track, track_t *track_info));
- LOCAL int open_track_yamaha __PR((SCSI *scgp, cdr_t *dp, int track, track_t *track_info));
- LOCAL int close_track_philips __PR((SCSI *scgp, int track, track_t *trackp));
-@@ -71,6 +72,7 @@
- LOCAL int plasmon_attach __PR((SCSI *scgp, cdr_t *));
- LOCAL int ricoh_attach __PR((SCSI *scgp, cdr_t *));
- LOCAL int philips_getlilo __PR((SCSI *scgp, long *lilenp, long *lolenp));
-+LOCAL int plasmon_buf __PR((SCSI *, long *, long *));
-
-
- struct cdd_52x_mode_page_21 { /* write track information */
-@@ -284,7 +286,7 @@
- philips_getdisktype,
- philips_load,
- philips_unload,
-- buf_dummy,
-+ plasmon_buf,
- recovery_needed,
- recover_philips,
- speed_select_philips,
-@@ -293,7 +295,7 @@
- reserve_track_philips,
- scsi_cdr_write_philips,
- no_sendcue,
-- open_track_philips,
-+ open_track_plasmon,
- close_track_philips,
- (int(*)__PR((SCSI *, cdr_t *, int, track_t *, int, int)))cmd_dummy,
- cmd_dummy,
-@@ -922,6 +924,22 @@
- }
-
- LOCAL int
-+open_track_plasmon(scgp, dp, track, track_info)
-+ SCSI *scgp;
-+ cdr_t *dp;
-+ int track;
-+ track_t *track_info;
-+{
-+ if (select_secsize(scgp, track_info->secsize) < 0)
-+ return (-1);
-+
-+ if (write_track_info_philips(scgp, track_info->sectype) < 0)
-+ return (-1);
-+
-+ return (0);
-+}
-+
-+LOCAL int
- open_track_oldphilips(scgp, dp, track, track_info)
- SCSI *scgp;
- cdr_t *dp;
-@@ -1211,4 +1229,27 @@
- *lolenp = lo;
-
- return (0);
-+}
-+
-+LOCAL int
-+plasmon_buf(scgp, sp, fp)
-+ SCSI *scgp;
-+ long *sp; /* Size pointer */
-+ long *fp; /* Free space pointer */
-+{
-+ /*
-+ * There's no way to obtain these values from the
-+ * Plasmon RF41xx devices. This function stub is only
-+ * present to prevent cdrecord.c from calling a pointless
-+ * READ BUFFER SCSI cmd which is meant to be used for
-+ * something totally else, and which would only jam the
-+ * Plasmon due to the incorrect parameters used.
-+ */
-+
-+ if (sp)
-+ *sp = 2 * 1024 * 1024; /* assume 2 MB */
-+ if (fp)
-+ *fp = 2 * 1024 * 1024; /* assume 2 MB */
-+
-+ return 100;
- }
diff --git a/sysutils/cdrtools/files/patch-aj b/sysutils/cdrtools/files/patch-aj
deleted file mode 100644
index fbc2f5ad3a22..000000000000
--- a/sysutils/cdrtools/files/patch-aj
+++ /dev/null
@@ -1,42 +0,0 @@
---- lib/cvt.c.orig Wed Sep 8 15:03:20 1999
-+++ lib/cvt.c Sun Feb 25 10:06:50 2001
-@@ -31,7 +31,7 @@
- #include <standard.h>
-
- #ifdef HAVE_DTOA /* 4.4BSD floating point implementation */
--extern char *__dtoa __PR((double value, int mode, int ndigit, int *decpt, int *sign, char **ep));
-+extern char *__dtoa __PR((double value, int mode, int ndigit, int *decpt, int *sign, char **ep, char **resultp));
- #endif
-
- #ifndef HAVE_ECVT
-@@ -57,7 +57,13 @@
- static char *buf;
- char *bufend;
- char *ep;
-- char *bp = __dtoa(value, 2, ndigit, decpt, sign, &ep);
-+ char *bp;
-+ static char *dtoaresult = NULL;
-+
-+ free(dtoaresult);
-+ dtoaresult = NULL;
-+
-+ bp = __dtoa(value, 2, ndigit, decpt, sign, &ep, &dtoaresult);
-
- if (value == 0.0) {
- /*
-@@ -102,7 +108,13 @@
- static char *buf;
- char *bufend;
- char *ep;
-- char *bp = __dtoa(value, 3, ndigit, decpt, sign, &ep);
-+ char *bp;
-+ static char *dtoaresult = NULL;
-+
-+ free(dtoaresult);
-+ dtoaresult = NULL;
-+
-+ bp = __dtoa(value, 3, ndigit, decpt, sign, &ep, &dtoaresult);
-
- if (value == 0.0) {
- /*
-
diff --git a/sysutils/cdrtools/files/patch-ba b/sysutils/cdrtools/files/patch-ba
deleted file mode 100644
index 87417c340c18..000000000000
--- a/sysutils/cdrtools/files/patch-ba
+++ /dev/null
@@ -1,10 +0,0 @@
---- TARGETS/Targetdirs.orig Sat Apr 29 18:14:51 2000
-+++ TARGETS/Targetdirs Sun Jul 30 22:06:58 2000
-@@ -1,5 +1,5 @@
- #ident %W% %E% %Q%
- ###########################################################################
--DIRS= patches conf inc lib libdeflt libscg libhfs_iso libfile libunls \
-- cdrecord mkisofs mkisofs/diag cdda2wav misc man
-+DIRS= patches conf inc lib libdeflt libscg \
-+ cdrecord cdda2wav misc man
- ###########################################################################