Update abcde to 2.1.4nb5:

	Strip out \r from the end of the CDDB data to make editing easier

4 files changed, 27 insertions, 12 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 80c264defbb..aa41f863160 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/09/15 11:17:27 agc Exp $
+# $NetBSD: Makefile,v 1.18 2003/10/01 20:48:31 abs Exp $
 
 DISTNAME=	abcde-2.1.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hispalinux.es/~data/files/
 DISTFILES=	${DISTNAME:S/-/_/}.orig.tar.gz
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 3e70c170826..2a87bbf1107 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2003/09/15 11:17:27 agc Exp $
+$NetBSD: distinfo,v 1.20 2003/10/01 20:48:31 abs Exp $
 
 SHA1 (abcde_2.1.4.orig.tar.gz) = 0d00d1ab462f38c449b575b17828bdc20c35ca65
 Size (abcde_2.1.4.orig.tar.gz) = 42945 bytes
 SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872
-SHA1 (patch-ac) = a752b7f3e54c7bb2ed38b08c45c564428fedffba
+SHA1 (patch-ac) = 009c0cc4c2ff50bc0ace6d68aadfa71d51f09b68
 SHA1 (patch-ad) = d6aecd0279087d190fb2c467526dbc35496659e9
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 41d8a56a66a..a563b7d7dee 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $
+$NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
 
---- abcde.orig	Sun May 18 23:01:13 2003
+--- abcde.orig	Sun May 18 20:01:13 2003
 +++ abcde
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ do_batch_encode ()
  			do
  				TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"
  			done
@@ -11,7 +11,20 @@ $NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $
  			RETURN=$?
  			if [ "$RETURN" != "0" ]; then
  				echo "batch-encode: $ENCODER returned code $RETURN" >> errors
-@@ -1233,8 +1233,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+@@ -928,7 +928,12 @@ do_cddbedit ()
+ 		echo "abcde: internal error: cddb-choice not recorded." >&2
+ 		exit 1
+ 	fi
++
++	# Strip out ^M
+ 	CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
++	CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
++	tr -d '\r' < $CDDBDATA > $CDDBDATATMP
++	mv $CDDBDATATMP $CDDBDATA
+ 
+ 	if [ "$INTERACTIVE" = "y" ]; then
+ 		echo -n "Edit selected CDDB data? [y/n] (n): " >&2
+@@ -1233,8 +1238,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
  fi
  
  # Load system defaults
@@ -22,7 +35,7 @@ $NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -1260,8 +1260,8 @@ else
+@@ -1260,8 +1265,8 @@ else
  	elif [ -e /dev/acd0c ]; then
  		CDROM=/dev/acd0c
  	else
@@ -33,7 +46,7 @@ $NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $
  	fi
  fi
  
-@@ -1308,7 +1308,7 @@ done
+@@ -1308,7 +1313,7 @@ done
  case "$CDROMREADERSYNTAX" in
  	cdparanoia|debug)
  		CDROMREADER="$CDPARANOIA"
@@ -42,7 +55,7 @@ $NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $
  		;;
  	cdda2wav)
  		CDROMREADER="$CDDA2WAV"
-@@ -1427,7 +1427,8 @@
+@@ -1427,7 +1432,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
  do
  	# Cut off the command-line options we just added in
  	X=$(echo $X | cut -d' ' -f2)
diff --git a/doc/CHANGES b/doc/CHANGES
index 3f044d1ce61..9b1f23049d5 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3604 2003/10/01 20:22:52 dillo Exp $
+$NetBSD: CHANGES,v 1.3605 2003/10/01 20:49:29 abs Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4039,3 +4039,5 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated pkgchk to 1.43 [abs 2003-10-01]
 	Updated pkglint to 3.63 [abs 2003-10-01]
 	Updated level9 to 3.0nb1 [dillo 2003-10-01]
+	Updated abcde to 2.1.4nb5 [abs 2003-10-01]
+