The first raw cd device is _not_ rcd0d. Use sysctl kern.rawpartition.

4 files changed, 147 insertions, 146 deletions

diff --git a/audio/abcde/patches/patch-aa b/audio/abcde/patches/patch-aa
index 94df022d3a3..58bc12bac5f 100644
--- a/audio/abcde/patches/patch-aa
+++ b/audio/abcde/patches/patch-aa
@@ -1,29 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 06:02:45 lukem Exp $
+$NetBSD: patch-aa,v 1.2 2001/10/03 21:58:28 abs Exp $
 
---- cddb-tool.orig	Thu Aug 16 07:48:11 2001
-+++ cddb-tool	Thu Aug 16 15:45:59 2001
-@@ -121,7 +121,7 @@
- 	echo '#'
- 	echo '# Track frame offsets:'
- 	NUMTRACKS=$2
--	for x in $(seq 3 $(expr $NUMTRACKS + 2))
-+	for x in $(jot $NUMTRACKS 3)
- 	do
- 		echo -e "#\t$(echo "$DISCID" | cut -f$x -d' ')"
- 	done
-@@ -137,13 +137,13 @@
- 	echo DISCID="$DISCNUM"
- 	echo "DTITLE=Unknown Artist / Unknown Album"
- 	# TTITLE0 -- TTITLEn
--	for x in $(seq 1 $NUMTRACKS)
-+	for x in $(jot $NUMTRACKS)
- 	do
- 		echo "TTITLE$(expr $x - 1)=Track $x"
- 	done
- 	echo "EXTD="
- 	# EXTT0 -- EXTTn
--	for x in $(seq 1 $NUMTRACKS)
-+	for x in $(jot $NUMTRACKS)
- 	do
- 		echo "EXTT$(expr $x - 1)="
- 	done
+--- abcde.1.orig	Wed Aug 15 23:12:25 2001
++++ abcde.1
+@@ -42,7 +42,7 @@
+ .TP
+ .B \-c [filename]
+ Specifies an additional configuration file to parse. Configuration options
+-in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
++in this file override those in /usr/pkg/etc/abcde.conf or $HOME/.abcde.conf.
+ .TP
+ .B \-C [discid]
+ Allows you to resume a session for
+@@ -91,7 +91,7 @@
+ '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT
+ variables in your abcde.conf.
+ .SH CONFIGURATION
+-abcde sources two configuration files on startup - /etc/abcde.conf and
++abcde sources two configuration files on startup - /usr/pkg/etc/abcde.conf and
+ $HOME/.abcde.conf, in that order. Here is a list of options abcde recognizes:
+ .TP
+ .B CDDBURL
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index 8b6fe6cd00b..597e44bb9a0 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,88 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2001/09/14 22:32:13 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/10/03 21:58:28 abs Exp $
 
---- abcde.orig	Wed Aug 15 23:39:29 2001
-+++ abcde
-@@ -552,7 +552,7 @@
- 			fi
- 			# List out disc title/author and contents
- 			echo ---- $(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery") ---- >> "$ABCDETEMPDIR/cddbchoices"
--			for TRACK in $(seq 1 $TRACKS)
-+			for TRACK in $(jot $TRACKS)
- 			do
- 				echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
- 			done
-@@ -568,7 +568,7 @@
- 			$CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
- 			# List out disc title/author and contents of template
- 			echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
--			for TRACK in $(seq 1 $TRACKS)
-+			for TRACK in $(jot $TRACKS)
- 			do
- 				echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
- 			done
-@@ -598,7 +598,7 @@
- 				fi
- 				# List out disc title/author and contents
- 				echo \#$X: ---- "$DISCINFO" ---- >> "$ABCDETEMPDIR/cddbchoices"
--				for TRACK in $(seq 1 $TRACKS)
-+				for TRACK in $(jot $TRACKS)
- 				do
- 					echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= $ABCDETEMPDIR/cddbread.$X | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
- 				done
-@@ -757,7 +757,7 @@
- 			echo $DEFAULTSTYLE >&2
- 			VARIOUSARTISTSTYLE=$DEFAULTSTYLE
- 		fi
--		VARIOUSARTISTSTYLE=$(echo $VARIOUSARTISTSTYLE | xargs printf %d)
-+		VARIOUSARTISTSTYLE=$(echo 0$VARIOUSARTISTSTYLE | xargs printf %d)
- 		# If they press Enter, then the default style (0) was chosen
- 		while [ $VARIOUSARTISTSTYLE -lt 0 ] || [ $VARIOUSARTISTSTYLE -gt 6 ]; do
- 			echo "Invalid selection. Please choose a number between 1 and 6."
-@@ -765,7 +765,7 @@
+--- abcde.conf.orig	Wed Aug 15 23:32:10 2001
++++ abcde.conf
+@@ -93,7 +93,7 @@
+ #NOCDDBQUERY=n
  
+ # CD device you want to read from
+-#CDROM=/dev/cdrom
++#CDROM=/dev/rcd0d
  
- 			read VARIOUSARTISTSTYLE
--			VARIOUSARTISTSTYLE=$(echo $VARIOUSARTISTSTYLE | xargs printf %d)
-+			VARIOUSARTISTSTYLE=$(echo 0$VARIOUSARTISTSTYLE | xargs printf %d)
- 		done
- 		if [ "$VARIOUSARTISTSTYLE" = "0" ]; then
- 			VARIOUSARTISTSTYLE=$DEFAULTSTYLE
-@@ -926,17 +926,11 @@
- 	WAVOUTPUTDIR="$OUTPUTDIR"
- fi
- 
--# If this is a devfs system, default to /dev/cdroms/cdrom0
--# instead of /dev/cdrom
--if [ -f /dev/cdroms/cdrom0 ]; then
--	CDROM=/dev/cdroms/cdrom0
--else
--	CDROM=/dev/cdrom
--fi
-+CDROM=/dev/rcd0d
- 
- # Load system defaults
--if [ -r /etc/abcde.conf ]; then
--	. /etc/abcde.conf
-+if [ -r @ETCDIR@/abcde.conf ]; then
-+	. @ETCDIR@/abcde.conf
- fi
- # Load user preference defaults
- if [ -r $HOME/.abcde.conf ]; then
-@@ -972,7 +966,7 @@
- 	if [ "$RSTART" = "$REND" ]; then 
- 		NEWTRACKS="$RSTART"
- 	else
--		NEWTRACKS=$(seq -s ' ' $RSTART $REND)
-+ 		NEWTRACKS=$(jot -s ' ' $(($REND - $RSTART + 1)) $RSTART $REND)
- 	fi
- 	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
- 
-@@ -1145,7 +1139,7 @@
- do
- 	ENCODELOCATIONS="$ENCODELOCATIONS $REMOTEHOST"
- done
--for NUM in $(seq 1 "$MAXPROCS")
-+for NUM in $(jot "$MAXPROCS")
- do
- 	ENCODELOCATIONS="$ENCODELOCATIONS %local%"
- done
+ # If you'd like to make a default location that overrides the current
+ # directory for putting mp3's, uncomment this.
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 854b5bf183e..5f5600989b6 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,22 +1,89 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/16 06:02:48 lukem Exp $
+$NetBSD: patch-ac,v 1.2 2001/10/03 21:58:28 abs Exp $
 
---- abcde.1.orig	Thu Aug 16 08:12:25 2001
-+++ abcde.1	Thu Aug 16 15:55:04 2001
-@@ -42,7 +42,7 @@
- .TP
- .B \-c [filename]
- Specifies an additional configuration file to parse. Configuration options
--in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
-+in this file override those in @ETCDIR@/abcde.conf or $HOME/.abcde.conf.
- .TP
- .B \-C [discid]
- Allows you to resume a session for
-@@ -91,7 +91,7 @@
- '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT
- variables in your abcde.conf.
- .SH CONFIGURATION
--abcde sources two configuration files on startup - /etc/abcde.conf and
-+abcde sources two configuration files on startup - @ETCDIR@/abcde.conf and
- $HOME/.abcde.conf, in that order. Here is a list of options abcde recognizes:
- .TP
- .B CDDBURL
+--- abcde.orig	Wed Aug 15 22:39:29 2001
++++ abcde
+@@ -552,7 +552,7 @@
+ 			fi
+ 			# List out disc title/author and contents
+ 			echo ---- $(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery") ---- >> "$ABCDETEMPDIR/cddbchoices"
+-			for TRACK in $(seq 1 $TRACKS)
++			for TRACK in $(jot $TRACKS)
+ 			do
+ 				echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
+ 			done
+@@ -568,7 +568,7 @@
+ 			$CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
+ 			# List out disc title/author and contents of template
+ 			echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
+-			for TRACK in $(seq 1 $TRACKS)
++			for TRACK in $(jot $TRACKS)
+ 			do
+ 				echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
+ 			done
+@@ -598,7 +598,7 @@
+ 				fi
+ 				# List out disc title/author and contents
+ 				echo \#$X: ---- "$DISCINFO" ---- >> "$ABCDETEMPDIR/cddbchoices"
+-				for TRACK in $(seq 1 $TRACKS)
++				for TRACK in $(jot $TRACKS)
+ 				do
+ 					echo $TRACK: $(grep ^TTITLE$(expr $TRACK - 1)= $ABCDETEMPDIR/cddbread.$X | cut -f2- -d= | tr -d \\r\\n) >> "$ABCDETEMPDIR/cddbchoices"
+ 				done
+@@ -757,7 +757,7 @@
+ 			echo $DEFAULTSTYLE >&2
+ 			VARIOUSARTISTSTYLE=$DEFAULTSTYLE
+ 		fi
+-		VARIOUSARTISTSTYLE=$(echo $VARIOUSARTISTSTYLE | xargs printf %d)
++		VARIOUSARTISTSTYLE=$(echo 0$VARIOUSARTISTSTYLE | xargs printf %d)
+ 		# If they press Enter, then the default style (0) was chosen
+ 		while [ $VARIOUSARTISTSTYLE -lt 0 ] || [ $VARIOUSARTISTSTYLE -gt 6 ]; do
+ 			echo "Invalid selection. Please choose a number between 1 and 6."
+@@ -765,7 +765,7 @@
+ 
+ 
+ 			read VARIOUSARTISTSTYLE
+-			VARIOUSARTISTSTYLE=$(echo $VARIOUSARTISTSTYLE | xargs printf %d)
++			VARIOUSARTISTSTYLE=$(echo 0$VARIOUSARTISTSTYLE | xargs printf %d)
+ 		done
+ 		if [ "$VARIOUSARTISTSTYLE" = "0" ]; then
+ 			VARIOUSARTISTSTYLE=$DEFAULTSTYLE
+@@ -926,17 +926,12 @@
+ 	WAVOUTPUTDIR="$OUTPUTDIR"
+ fi
+ 
+-# If this is a devfs system, default to /dev/cdroms/cdrom0
+-# instead of /dev/cdrom
+-if [ -f /dev/cdroms/cdrom0 ]; then
+-	CDROM=/dev/cdroms/cdrom0
+-else
+-	CDROM=/dev/cdrom
+-fi
++RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
++CDROM=/dev/rcd0$RAWPART
+ 
+ # Load system defaults
+-if [ -r /etc/abcde.conf ]; then
+-	. /etc/abcde.conf
++if [ -r /usr/pkg/etc/abcde.conf ]; then
++	. /usr/pkg/etc/abcde.conf
+ fi
+ # Load user preference defaults
+ if [ -r $HOME/.abcde.conf ]; then
+@@ -972,7 +967,7 @@
+ 	if [ "$RSTART" = "$REND" ]; then 
+ 		NEWTRACKS="$RSTART"
+ 	else
+-		NEWTRACKS=$(seq -s ' ' $RSTART $REND)
++ 		NEWTRACKS=$(jot -s ' ' $(($REND - $RSTART + 1)) $RSTART $REND)
+ 	fi
+ 	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
+ 
+@@ -1145,7 +1140,7 @@
+ do
+ 	ENCODELOCATIONS="$ENCODELOCATIONS $REMOTEHOST"
+ done
+-for NUM in $(seq 1 "$MAXPROCS")
++for NUM in $(jot "$MAXPROCS")
+ do
+ 	ENCODELOCATIONS="$ENCODELOCATIONS %local%"
+ done
diff --git a/audio/abcde/patches/patch-ad b/audio/abcde/patches/patch-ad
index 2a5584031cd..8ac9a8503e6 100644
--- a/audio/abcde/patches/patch-ad
+++ b/audio/abcde/patches/patch-ad
@@ -1,13 +1,29 @@
-$NetBSD: patch-ad,v 1.1 2001/08/17 05:48:09 lukem Exp $
+$NetBSD: patch-ad,v 1.2 2001/10/03 21:58:28 abs Exp $
 
---- abcde.conf.orig	Thu Aug 16 08:32:10 2001
-+++ abcde.conf	Fri Aug 17 15:29:59 2001
-@@ -93,7 +93,7 @@
- #NOCDDBQUERY=n
- 
- # CD device you want to read from
--#CDROM=/dev/cdrom
-+#CDROM=/dev/rcd0d
- 
- # If you'd like to make a default location that overrides the current
- # directory for putting mp3's, uncomment this.
+--- cddb-tool.orig	Wed Aug 15 22:48:11 2001
++++ cddb-tool
+@@ -121,7 +121,7 @@
+ 	echo '#'
+ 	echo '# Track frame offsets:'
+ 	NUMTRACKS=$2
+-	for x in $(seq 3 $(expr $NUMTRACKS + 2))
++	for x in $(jot $NUMTRACKS 3)
+ 	do
+ 		echo -e "#\t$(echo "$DISCID" | cut -f$x -d' ')"
+ 	done
+@@ -137,13 +137,13 @@
+ 	echo DISCID="$DISCNUM"
+ 	echo "DTITLE=Unknown Artist / Unknown Album"
+ 	# TTITLE0 -- TTITLEn
+-	for x in $(seq 1 $NUMTRACKS)
++	for x in $(jot $NUMTRACKS)
+ 	do
+ 		echo "TTITLE$(expr $x - 1)=Track $x"
+ 	done
+ 	echo "EXTD="
+ 	# EXTT0 -- EXTTn
+-	for x in $(seq 1 $NUMTRACKS)
++	for x in $(jot $NUMTRACKS)
+ 	do
+ 		echo "EXTT$(expr $x - 1)="
+ 	done