Update abcde to 2.0.3. Changes:

abcde 2.0.3
  * The Fixed-Yet?-How-About-Now?-What-About-Now?-Now? Release
  * SMP fixed, mad props to Steve Madsen, closes: #69828, #111806
  * Minor code cleanups thanks to Adam Heath
  * Multiple inexact match results are generated in a safe manner
    thanks to Nick Martin, closes: #126025
  * Removed cddb-tool template generation bashism, thanks to Greg
    Norris, closes: #126327
  * Windows can't handle double quotes in filenames either.
    The default mungefilename now removes them, closes: #127643
  * Using -C with WAVOUTPUTDIR fixed, closes: #127728
  * Resuming various artists discs fixed, closes: #127731

  -- Robert Woodcock <rcw@debian.org>  Sun, 27 Jan 2002

abcde 2.0.2
  * The One-More-Time-With-Feeling Release
  * Bladeenc really works this time. Honest. closes: #121988

  -- Robert Woodcock <rcw@debian.org>  Mon,  3 Dec 2001

abcde 2.0.1

  * The I-Don't-Listen-To-Sssca Release
  * Example abcde.conf fixes, closes: #111580
  * So much for bladeenc's l3enc compatibility, closes: #110863
  * CDDB submit fixes (to enable CDDB submitting, put
    UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE=y in your abcde.conf),
    closes: #111478, #111500
  * Minor mungefilename() cleanup
  * Small manpage fix
  * Works with oggenc when POSIXLY_CORRECT is defined, thanks to Juhapekka
    Tolvanen
  * Quote remote locations when calling distmp3
  * Allow remote encoding of oggs
  * Only remove wav files if the encoding succeeded
  * No-local-encoding via -j 0 fixed, thanks to Hans-Joachim Baader
  * CD read errors are trapped/resumed cleanly now thanks to Pete,
    closes: #111618
  * devfs device check fix, thanks to Clint Adams
  * Check for seq command - some BSD's have jot instead and abcde can't
    use that yet
  * Various Artists playlist generation fixed, thanks to William Lash

  -- Robert Woodcock <rcw@debian.org>  Tue,  6 Nov 2001

6 files changed, 68 insertions, 61 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 8d75d2214f1..fa8766d24f3 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 21:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/20 00:33:12 hubertf Exp $
 
-DISTNAME=	abcde_2.0.orig
-PKGNAME=	abcde-2.0
+DISTNAME=	abcde_2.0.3.orig
+PKGNAME=	abcde-2.0.3
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/abcde/
 
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 73841ccf8db..7abd09c6138 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/03/06 09:55:23 martin Exp $
+$NetBSD: distinfo,v 1.8 2002/09/20 00:33:12 hubertf Exp $
 
-SHA1 (abcde_2.0.orig.tar.gz) = 1ff89ebf0df6b202544d0f195b2c68be1a6108d5
-Size (abcde_2.0.orig.tar.gz) = 34588 bytes
-SHA1 (patch-aa) = f166d3ebb9966d238d42881d10f0dc8939c866fe
-SHA1 (patch-ab) = bb28cc318a671922f8dae5104b797f6a4bfe416a
-SHA1 (patch-ac) = 770ac0653cf670dec4ac4f3c496d53213058270c
-SHA1 (patch-ad) = 830eceb46d642dbfd128ce93d6c39f9a7d4d2fba
+SHA1 (abcde_2.0.3.orig.tar.gz) = 66a7620a835baee29296f4d5e9322bb1679baa49
+Size (abcde_2.0.3.orig.tar.gz) = 35655 bytes
+SHA1 (patch-aa) = 68afebe66ba20dcaeddbfeed795f4049c3ff8f99
+SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872
+SHA1 (patch-ac) = e1141bdbbbcbc7998574864081d71681afa1059e
+SHA1 (patch-ad) = 72550c6a7fa8231c9058a674e85781ec8d3adc18
diff --git a/audio/abcde/patches/patch-aa b/audio/abcde/patches/patch-aa
index 58bc12bac5f..46b06daf327 100644
--- a/audio/abcde/patches/patch-aa
+++ b/audio/abcde/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2001/10/03 21:58:28 abs Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/20 00:33:12 hubertf Exp $
 
---- abcde.1.orig	Wed Aug 15 23:12:25 2001
+--- abcde.1.orig	Tue Aug 21 03:22:33 2001
 +++ abcde.1
 @@ -42,7 +42,7 @@
  .TP
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2001/10/03 21:58:28 abs Exp $
  .B \-C [discid]
  Allows you to resume a session for
 @@ -91,7 +91,7 @@
- '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT
+ or '.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
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index 597e44bb9a0..dae530853b9 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/10/03 21:58:28 abs Exp $
+$NetBSD: patch-ab,v 1.5 2002/09/20 00:33:12 hubertf Exp $
 
---- abcde.conf.orig	Wed Aug 15 23:32:10 2001
+--- abcde.conf.orig	Mon Jan 21 03:35:31 2002
 +++ abcde.conf
-@@ -93,7 +93,7 @@
+@@ -96,7 +96,7 @@
  #NOCDDBQUERY=n
  
  # CD device you want to read from
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 9dc2b7e08c4..ed3a8ea01ee 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
+$NetBSD: patch-ac,v 1.6 2002/09/20 00:33:13 hubertf Exp $
 
---- abcde.orig	Wed Aug 15 23:39:29 2001
-+++ abcde	Wed Mar  6 10:47:22 2002
-@@ -199,6 +199,11 @@
+--- abcde.orig	Mon Jan 28 06:44:02 2002
++++ abcde
+@@ -206,6 +206,11 @@
  			TRACKARTIST="$(echo $DTITLEARTIST | cut -f1 -d~)"
  			TRACKNAME="$(echo $DTITLEARTIST | cut -f2 -d~)"
  			;;
@@ -14,43 +14,34 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  		esac
  	else
  		TRACKARTIST=$DARTIST
-@@ -268,7 +273,7 @@
- 			mp3enc) run_command encodetrack-$1 nice $ENCNICE $ENCODER -if "$IN" -of "$OUT" $ENCODEROPTS ;;
- 			esac
- 		else
--			run_command encodetrack-$1 $DISTMP3 $DISTMP3OPTS $2 "$IN" "$OUT" >/dev/null 2>&1
-+			run_command encodetrack-$1 $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
- 		fi
- 		;;
- 	ogg)
-@@ -552,7 +557,7 @@
+@@ -574,7 +579,7 @@
  			fi
  			# List out disc title/author and contents
- 			echo ---- $(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery") ---- >> "$ABCDETEMPDIR/cddbchoices"
+ 			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"
+ 				echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
  			done
-@@ -568,7 +573,7 @@
+@@ -590,7 +595,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"
+ 				echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
  			done
-@@ -598,7 +603,7 @@
+@@ -620,7 +625,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"
+ 					echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
  				done
-@@ -742,6 +747,9 @@
+@@ -766,6 +771,9 @@
  		elif [ "$(grep -c "^TTITLE.*\-" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
  			# More than 1/2 contain a "-", so guess forward-dash
  			DEFAULTSTYLE=2
@@ -60,7 +51,7 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  		fi
  
  		echo "1) Artist / Title" >&2
-@@ -749,23 +757,24 @@
+@@ -773,21 +781,22 @@
  		echo "3) Title / Artist" >&2
  		echo "4) Title - Artist" >&2
  		echo "5) Artist: Title" >&2
@@ -84,15 +75,13 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
 +		while [ $VARIOUSARTISTSTYLE -lt 0 ] || [ $VARIOUSARTISTSTYLE -gt 7 ]; do
 +			echo "Invalid selection. Please choose a number between 1 and 7."
 +			echo -n "Selection [1-7]: "
- 
- 
  			read VARIOUSARTISTSTYLE
 -			VARIOUSARTISTSTYLE=$(echo $VARIOUSARTISTSTYLE | xargs printf %d)
 +			VARIOUSARTISTSTYLE=$(echo 0$VARIOUSARTISTSTYLE | xargs printf %d)
  		done
  		if [ "$VARIOUSARTISTSTYLE" = "0" ]; then
  			VARIOUSARTISTSTYLE=$DEFAULTSTYLE
-@@ -787,7 +796,10 @@
+@@ -809,7 +818,10 @@
  		5) # Artist: Title
  			VARIOUSARTISTSTYLE=colon
  			;;
@@ -104,7 +93,7 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  			VARIOUSARTISTS=n
  			;;
  		esac
-@@ -856,7 +868,7 @@
+@@ -894,7 +906,7 @@
  PLAYLISTFORMAT='${ARTISTFILE}_-_${ALBUMFILE}.m3u'
  PLAYLISTDATAPREFIX=''
  COMMENT=''
@@ -113,28 +102,37 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  ENCNICE=10
  READNICE=10
  VARIOUSARTISTS=n
-@@ -910,7 +922,7 @@
+@@ -931,7 +943,6 @@
+ OGGENCOPTS=
+ ID3OPTS=
+ ID3V2OPTS=
+-CDPARANOIAOPTS=
+ CDDA2WAVOPTS=
+ WGETOPTS=
+ CDDBTOOLOPTS=
+@@ -948,7 +959,7 @@
  # Custom filename munging:
  mungefilename ()
  {
--	echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\? | tr -d \[:cntrl:\]
-+	echo "$@" | sed s,:,\ -,g | tr / _ | tr -d \`\'\"\? | tr -d \[:cntrl:\]
+-	echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
++	echo "$@" | sed s,:,\ -,g | tr / _ | tr -d \`\'\"\?\[:cntrl:\]
  }
  
  # If CDDBAVAIL is set to n, no CDDB read is done
-@@ -926,17 +938,12 @@
+@@ -964,17 +975,13 @@
  	WAVOUTPUTDIR="$OUTPUTDIR"
  fi
  
 -# If this is a devfs system, default to /dev/cdroms/cdrom0
 -# instead of /dev/cdrom
--if [ -f /dev/cdroms/cdrom0 ]; then
+-if [ -e /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
++CDPARANOIAOPTS="-g ${CDROM}"
  
  # Load system defaults
 -if [ -r /etc/abcde.conf ]; then
@@ -144,7 +142,7 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -972,7 +979,7 @@
+@@ -1010,7 +1017,7 @@
  	if [ "$RSTART" = "$REND" ]; then 
  		NEWTRACKS="$RSTART"
  	else
@@ -153,12 +151,21 @@ $NetBSD: patch-ac,v 1.5 2002/03/06 09:55:23 martin Exp $
  	fi
  	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
  
-@@ -1145,7 +1152,7 @@
- do
- 	ENCODELOCATIONS="$ENCODELOCATIONS $REMOTEHOST"
- done
--for NUM in $(seq 1 "$MAXPROCS")
-+for NUM in $(jot "$MAXPROCS")
+@@ -1101,7 +1108,7 @@
+ 
+ # Make sure a buncha things exist
+ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \
+-	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} seq
++	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} jot
  do
- 	ENCODELOCATIONS="$ENCODELOCATIONS %local%"
- done
+ 	# Cut off the command-line options we just added in
+ 	X=$(echo $X | cut -d' ' -f2)
+@@ -1191,7 +1198,7 @@
+ # Figure out where each track is going to be encoded
+ ENCODELOCATIONS="$(echo $REMOTEHOSTS | tr , ' ')"
+ if [ "$MAXPROCS" != "0" ]; then
+-	for NUM in $(seq 1 "$MAXPROCS")
++	for NUM in $(jot "$MAXPROCS")
+ 	do
+ 		ENCODELOCATIONS="$ENCODELOCATIONS %local$NUM%"
+ 	done
diff --git a/audio/abcde/patches/patch-ad b/audio/abcde/patches/patch-ad
index 8ac9a8503e6..41136cf811e 100644
--- a/audio/abcde/patches/patch-ad
+++ b/audio/abcde/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.2 2001/10/03 21:58:28 abs Exp $
+$NetBSD: patch-ad,v 1.3 2002/09/20 00:33:13 hubertf Exp $
 
---- cddb-tool.orig	Wed Aug 15 22:48:11 2001
+--- cddb-tool.orig	Mon Jan 21 03:29:23 2002
 +++ cddb-tool
-@@ -121,7 +121,7 @@
+@@ -119,7 +119,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' ')"
+ 		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
  	done
-@@ -137,13 +137,13 @@
+@@ -135,13 +135,13 @@
  	echo DISCID="$DISCNUM"
  	echo "DTITLE=Unknown Artist / Unknown Album"
  	# TTITLE0 -- TTITLEn