Update abcde to 2.1.9

	80 lines of changelog since 2.1.4, mainly small fixes

5 files changed, 23 insertions, 34 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index aa41f863160..73f6fef5f9c 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/10/01 20:48:31 abs Exp $
+# $NetBSD: Makefile,v 1.19 2003/11/27 17:38:29 abs Exp $
 
-DISTNAME=	abcde-2.1.4
-PKGREVISION=	5
+DISTNAME=	abcde-2.1.9
 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 2a87bbf1107..4b51f0610ff 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2003/10/01 20:48:31 abs Exp $
+$NetBSD: distinfo,v 1.21 2003/11/27 17:38:29 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) = 009c0cc4c2ff50bc0ace6d68aadfa71d51f09b68
-SHA1 (patch-ad) = d6aecd0279087d190fb2c467526dbc35496659e9
+SHA1 (abcde_2.1.9.orig.tar.gz) = c139a3f0eca5a1a84101c634775668575a343824
+Size (abcde_2.1.9.orig.tar.gz) = 45859 bytes
+SHA1 (patch-ab) = 9b56c23dce4571301e9bbe38f3b30429a39efddb
+SHA1 (patch-ac) = 64eb6ec97e22ae6b1df6af659709c2dfb90cc9bb
+SHA1 (patch-ad) = 24ba8cbb1fd366a4c46cc0175d1cea0543bebcc2
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index dae530853b9..3e89cbd3a18 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2002/09/20 00:33:12 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2003/11/27 17:38:29 abs Exp $
 
---- abcde.conf.orig	Mon Jan 21 03:35:31 2002
+--- abcde.conf.orig	2003-11-05 16:07:09.000000000 +0000
 +++ abcde.conf
-@@ -96,7 +96,7 @@
+@@ -131,7 +131,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 a563b7d7dee..06e2e0edb33 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
+$NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
 
---- abcde.orig	Sun May 18 20:01:13 2003
+--- abcde.orig	2003-11-05 16:08:37.000000000 +0000
 +++ abcde
-@@ -337,7 +337,7 @@ do_batch_encode ()
- 			do
- 				TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"
- 			done
--			nice $ENCNICE $ENCODER $ENCODEROPTS --nogap $TRACKFILES
-+			nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES
- 			RETURN=$?
- 			if [ "$RETURN" != "0" ]; then
- 				echo "batch-encode: $ENCODER returned code $RETURN" >> errors
-@@ -928,7 +928,12 @@ do_cddbedit ()
+@@ -963,7 +963,12 @@ do_cddbedit ()
  		echo "abcde: internal error: cddb-choice not recorded." >&2
  		exit 1
  	fi
@@ -24,7 +15,7 @@ $NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
  
  	if [ "$INTERACTIVE" = "y" ]; then
  		echo -n "Edit selected CDDB data? [y/n] (n): " >&2
-@@ -1233,8 +1238,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+@@ -1281,8 +1286,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
  fi
  
  # Load system defaults
@@ -35,7 +26,7 @@ $NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -1260,8 +1265,8 @@ else
+@@ -1308,8 +1313,8 @@ else
  	elif [ -e /dev/acd0c ]; then
  		CDROM=/dev/acd0c
  	else
@@ -46,7 +37,7 @@ $NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
  	fi
  fi
  
-@@ -1308,7 +1313,7 @@ done
+@@ -1356,7 +1361,7 @@ done
  case "$CDROMREADERSYNTAX" in
  	cdparanoia|debug)
  		CDROMREADER="$CDPARANOIA"
@@ -55,7 +46,7 @@ $NetBSD: patch-ac,v 1.15 2003/10/01 20:48:31 abs Exp $
  		;;
  	cdda2wav)
  		CDROMREADER="$CDDA2WAV"
-@@ -1427,7 +1432,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
+@@ -1485,7 +1490,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/audio/abcde/patches/patch-ad b/audio/abcde/patches/patch-ad
index 39d7daebe50..7e93fb3e79b 100644
--- a/audio/abcde/patches/patch-ad
+++ b/audio/abcde/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2003/06/19 22:42:31 seb Exp $
+$NetBSD: patch-ad,v 1.7 2003/11/27 17:38:29 abs Exp $
 
---- cddb-tool.orig      2003-05-25 12:32:29.000000000 +0200
-+++ cddb-tool   2003-05-25 12:34:12.000000000 +0200
-@@ -153,7 +153,7 @@
+--- cddb-tool.orig	2003-11-05 16:07:11.000000000 +0000
++++ cddb-tool
+@@ -153,7 +153,7 @@ template)
  	echo '#'
  	echo '# Track frame offsets:'
  	NUMTRACKS=$2
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.6 2003/06/19 22:42:31 seb Exp $
  	do
  		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
  	done
-@@ -171,13 +171,13 @@
+@@ -171,13 +171,13 @@ template)
  	echo "DYEAR="
  	echo "DGENRE="
  	# TTITLE0 -- TTITLEn
@@ -27,4 +27,3 @@ $NetBSD: patch-ad,v 1.6 2003/06/19 22:42:31 seb Exp $
  	do
  		echo "EXTT$(expr $x - 1)="
  	done
-