$NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $

--- abcde.orig	2004-04-09 14:12:15.000000000 -0400
+++ abcde	2004-04-25 23:19:43.000000000 -0400
@@ -1129,7 +1129,11 @@
 do_cddbedit ()
 {
 	if checkstatus cddb-edit >/dev/null; then
+		# Strip out ^M
 		CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
+		CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
+		tr -d '\r' < $CDDBDATA > $CDDBDATATMP
+		mv $CDDBDATATMP $CDDBDATA
 		VARIOUSARTISTS="$(checkstatus variousartists)"
 		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
 		return 0
@@ -1373,7 +1377,7 @@
 	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
 
 	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
-		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; then
+		if [ "$CDDBDATAMD5SUM" != "" ]  && [ "$CDDBDATAMD5SUM" != "$($MD5SUM '$CDDBDATA' | cut -d ' ' -f 1)" ]; then
 			# This works but does not have the necessary error checking
 			# yet. If you are familiar with the CDDB spec
 			# (see http://www.freedb.org/src/latest/DBFORMAT) 
@@ -1703,8 +1707,8 @@
 fi
 
 # Load system defaults
-if [ -r /etc/abcde.conf ]; then
-	. /etc/abcde.conf
+if [ -r @PKG_SYSCONFDIR@/abcde.conf ]; then
+	. @PKG_SYSCONFDIR@/abcde.conf
 fi
 # Load user preference defaults
 if [ -r $HOME/.abcde.conf ]; then
@@ -1737,6 +1741,9 @@
 		CDROM=/dev/acd0c
 	elif [ -e /dev/disk1 ]; then
 		CDROM=/dev/disk1
+	else
+		RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
+		CDROM=/dev/rcd0$RAWPART
 	fi
 fi
 
@@ -1837,7 +1844,7 @@
 case "$CDROMREADERSYNTAX" in
 	cdparanoia|debug)
 		CDROMREADER="$CDPARANOIA"
-		CDROMREADEROPTS="$CDPARANOIAOPTS"
+		CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}"
 		;;
 	cdda2wav)
 		CDROMREADER="$CDDA2WAV"
@@ -1979,7 +1986,8 @@
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)
-	if [ "$(which $X)" = "" ]; then
+	Y="$(which $X | cut -d' ' -f1,2)"
+	if [ "$Y" = "" -o "$Y" = "no $X" ]; then
 		echo "abcde error: $X is not in your path." >&2
 		exit 1
 	elif [ ! -x $(which $X) ]; then