diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index aff79956149..a73be7f59f4 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/03/25 22:45:42 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/07/09 10:52:24 wilfried Exp $
 
 COMMENT=	"command-line utility to rip and encode audio cds"
 
@@ -6,7 +6,6 @@ V=		2.0.3
 DISTNAME=	abcde_$V.orig
 PKGNAME=	abcde-$V
 CATEGORIES=	audio
-NEED_VERSION=	1.515
 
 HOMEPAGE=	http://frantica.lly.org/~rcw/abcde/page/
 
diff --git a/audio/abcde/patches/patch-abcde b/audio/abcde/patches/patch-abcde
index 762b8d3b174..fc42b2b4a7a 100644
--- a/audio/abcde/patches/patch-abcde
+++ b/audio/abcde/patches/patch-abcde
@@ -1,13 +1,13 @@
-$OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
+$OpenBSD: patch-abcde,v 1.2 2002/07/09 10:52:24 wilfried Exp $
 --- abcde.orig	Mon Jan 28 06:44:02 2002
-+++ abcde	Thu Mar 14 17:38:57 2002
++++ abcde	Sun Jul  7 17:35:39 2002
 @@ -12,6 +12,25 @@
  
  VERSION=2.0.3
  
 +f_seq_row () {
 +	i=$1
-+	while [ $i -ne $2+1 ]
++	while [ $i -ne `expr $2 + 1` ]
 +		do      
 +			echo $i
 +			i=`expr $i + 1`
@@ -16,7 +16,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
 +
 +f_seq_line () {
 +	i=$1
-+	while [ $i -ne $2+1 ]
++	while [ $i -ne `expr $2 + 1` ]
 +		do      
 +			printf $i" "
 +			i=`expr $i + 1`
@@ -54,7 +54,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  				do
  					echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
  				done
-@@ -717,20 +736,18 @@ do_cddbedit ()
+@@ -717,20 +736,16 @@ do_cddbedit ()
  		EDITCDDB=n
  	fi
  	if [ "$EDITCDDB" = "y" ]; then
@@ -64,12 +64,10 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
 -			/usr/bin/sensible-editor "$CDDBDATA"
 -		elif [ -x "$EDITOR" ]; then
 -			# That failed, try to load the preferred editor, starting
-+		if [ -x "$EDITOR" ]; then
++		if [ -x `which $EDITOR` ]; then
 +			# Try to load the preferred editor, starting
  			# with their EDITOR variable
  			$EDITOR "$CDDBDATA"
-+		elif [ -x "/usr/local/bin/$EDITOR" ]; then
-+			/usr/local/bin/$EDITOR "$CDDBDATA"
  		# If that fails, check for a vi
  		elif [ -x /usr/bin/vi ]; then
  			/usr/bin/vi "$CDDBDATA"
@@ -82,7 +80,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  		# bomb out
  		else
  			echo "No editor available. Check your EDITOR environment variable." >&2
-@@ -889,12 +906,12 @@ INTERACTIVE=y
+@@ -889,12 +904,12 @@ INTERACTIVE=y
  CDROMREADERSYNTAX=cdparanoia
  OUTPUTTYPE=ogg
  ENCODERSYNTAX=default
@@ -97,7 +95,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  ENCNICE=10
  READNICE=10
  VARIOUSARTISTS=n
-@@ -964,13 +981,7 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+@@ -964,13 +979,7 @@ if [ -z "$WAVOUTPUTDIR" ]; then
  	WAVOUTPUTDIR="$OUTPUTDIR"
  fi
  
@@ -112,7 +110,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  
  # Load system defaults
  if [ -r /etc/abcde.conf ]; then
-@@ -1010,7 +1021,7 @@ while [ $# -gt 0 ]; do
+@@ -1010,7 +1019,7 @@ while [ $# -gt 0 ]; do
  	if [ "$RSTART" = "$REND" ]; then 
  		NEWTRACKS="$RSTART"
  	else
@@ -121,7 +119,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  	fi
  	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
  
-@@ -1101,15 +1112,12 @@ if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDC
+@@ -1101,15 +1110,12 @@ if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDC
  
  # Make sure a buncha things exist
  for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \
@@ -140,7 +138,7 @@ $OpenBSD: patch-abcde,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
  		exit 1
  	fi 
  done
-@@ -1191,7 +1199,7 @@ fi
+@@ -1191,7 +1197,7 @@ fi
  # Figure out where each track is going to be encoded
  ENCODELOCATIONS="$(echo $REMOTEHOSTS | tr , ' ')"
  if [ "$MAXPROCS" != "0" ]; then