head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.6 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.4 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.2 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.3.0.74 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.72 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.70 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.68 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.66 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.64 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.62 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.60 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.58 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.56 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.54 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.52 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.50 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.48 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.46 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.44 pkgsrc-2008Q1:1.3.0.42 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.40 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.38 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.36 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.34 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.32 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.30 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.28 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.26 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.24 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.22 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.20 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.18 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.16 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.14 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.12 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.10 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.8 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.4 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.6 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.2 pkgviews-base:1.3 buildlink2-base:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.4 date 2011.11.23.18.59.24; author wiz; state dead; branches; next 1.3; 1.3 date 2002.07.19.04.18.25; author mycroft; state Exp; branches; next 1.2; 1.2 date 2001.01.06.06.47.20; author simonb; state dead; branches; next 1.1; 1.1 date 98.11.04.08.27.38; author garbled; state Exp; branches; next ; desc @@ 1.4 log @Remove libscsi and the two packages using it, tosha and cdd. The FreeBSD SCSI library on which libscsi was based, was removed in 1998. The two other packages were last updated 1997 and 2001, respectively. Better software exists (e.g. cdparanoia, cdrecord). Ok agc@@, gdt@@ @ text @$NetBSD: patch-ab,v 1.3 2002/07/19 04:18:25 mycroft Exp $ --- st/stdriver.c.orig Tue Jun 24 19:46:28 1997 +++ st/stdriver.c Fri Jul 19 04:10:44 2002 @@@@ -607,8 +607,8 @@@@ int st_read(SOCK *entry, int timeout) { int ret; /* Generic return variable */ -long starttime; -long endtime; +time_t starttime; +time_t endtime; static struct timeval read_timer; /* Timeout struct for select */ static fd_set local_readfds; /* Socket bit sets for select */ @ 1.3 log @Fix LP64 errors. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to cdd-1.0nb3, with the following changes (by me): + Add a -w flag to output WAV files instead of raw audio. + Add the "TOSHIBA DVD-ROM SD-C2402" DVD drive. + Handle a CDDCPPFLAGS mk.conf variable, can be used to set a C preprocessor CDD_MMC_SPEED define (maximum value of 65535) for some DVD's that don't get MMC setspeed requests right (eg, the drive mentioned above). + Fold existing pkgsrc patches into distribution tar file. @ text @d1 6 a6 21 $NetBSD: patch-ab,v 1.1 1998/11/04 08:27:38 garbled Exp $ --- cdd.c.orig Wed Nov 4 01:14:06 1998 +++ cdd.c Wed Nov 4 01:14:11 1998 @@@@ -56,8 +56,10 @@@@ #include #include #include +#include #include #include +#include #include "cdd.h" #include "cdd_cdcmds.h" #include "cdd_util.h" @@@@ -68,11 +70,13 @@@@ OPTS G_opts; int F_cdctlfd; +char cd_raw_partition[11]; int main(int argc, char *argv[]) d8 7 a14 128 CDTOC cdtoc; int count; +char ctldev[MAXPATHLEN]; strcpy(G_opts.workdir, "/tmp"); G_opts.onlyaudio = FALSE; @@@@ -83,27 +87,12 @@@@ G_opts.bequiet = FALSE; G_opts.dostdout = FALSE; G_opts.cddb = FALSE; +strcpy(G_opts.cddev, "cd0"); signal(SIGINT, resetcd); signal(SIGBUS, resetcd); signal(SIGSEGV, resetcd); -#ifdef __NetBSD__ -F_cdctlfd=scsi_open("/dev/rcd0d", O_RDWR); -#else -F_cdctlfd=scsi_open("/dev/rcd0.ctl", O_RDWR); -#endif - -if(F_cdctlfd < 0) - { -#ifdef __NetBSD__ - fprintf(stderr,"Unable to open /dev/rcd0d [%d]\n", errno); -#else - fprintf(stderr,"Unable to open /dev/rcd0.ctl [%d]\n", errno); -#endif - exit(0); - } - for(count=1;count][-a][-d][-r][-n][-noed][-h]", argv[0]); fprintf(stderr,"[-p][-q][destdir|-]\n\n"); fprintf(stderr," -h This help\n"); + fprintf(stderr," -c dev Use CD-ROM drive (default: %s)\n", G_opts.cddev); fprintf(stderr," -t # Copy only Track #\n"); fprintf(stderr," -a Copy only AUDIO tracks\n"); fprintf(stderr," -p Play AUDIO during Copy\n"); @@@@ -155,11 +156,27 @@@@ fprintf(stderr,"any error checking\n\n"); fprintf(stderr,"Running CDD with no options will show the table of "); fprintf(stderr,"contents of the CD in the \ndrive\n\n"); - close(F_cdctlfd); exit(0); } } +#ifdef __NetBSD__ +if (G_opts.cddev[0] == '/') + strcpy(ctldev, G_opts.cddev); +else + sprintf(ctldev, "/dev/r%s%c", G_opts.cddev, getrawpartition() + 'a'); +#else +sprintf(ctldev, "/dev/r%s.ctl", G_opts.cddev); +#endif + +F_cdctlfd=scsi_open(ctldev, O_RDWR); + +if(F_cdctlfd < 0) + { + fprintf(stderr,"Unable to open %s [%d]\n", ctldev, errno); + exit(0); + } + cdd_printf("\nCDD v%s, Copyright (C) 1996, ", VERSION); cdd_printf("Charles R. Henrich, All Rights Reserved.\n\n"); @@@@ -367,7 +384,8 @@@@ #ifdef __NetBSD__ ifd=dup(F_cdctlfd); #else -ifd=open("/dev/rcd0c", O_RDONLY, 0600); +sprintf(buffer, "/dev/r%sc", G_opts.cddev); +ifd=open(buffer, O_RDONLY, 0600); #endif if(ifd < 0) @@@@ -375,7 +393,7 @@@@ #ifdef __NetBSD__ fprintf(stderr,"Unable to dup descriptor\n"); #else - fprintf(stderr,"Unable to open /dev/rcd0c\n"); + fprintf(stderr,"Unable to open %s\n", buffer); #endif close(F_cdctlfd); exit(0); @@@@ -435,7 +453,8 @@@@ #ifdef __NetBSD__ ifd=dup(F_cdctlfd); #else -ifd=open("/dev/rcd0c", O_RDONLY); +sprintf(buffer, "/dev/r%sc", G_opts.cddev); +ifd=open(buffer, O_RDONLY); #endif a15 10 if(ifd < 0) @@@@ -443,7 +462,7 @@@@ #ifdef __NetBSD__ fprintf(stderr,"Unable to dup descriptor\n"); #else - fprintf(stderr,"Unable to open /dev/rcd0c\n"); + fprintf(stderr,"Unable to open %s\n", buffer); #endif close(F_cdctlfd); exit(0); @ 1.1 log @Patches to fix PR's: 6270 and 6391. Mainly dealing with cdd's assumption that /dev/rcd0d is the correct raw device. It now handles multiple drives, and guesses the right raw device. Thanks to Rene Hexel for the patch for the multiple devices. @ text @d1 1 a1 1 $NetBSD$ @