diff -ruN /usr/ports/audio/abcde/Makefile abcde/Makefile
--- /usr/ports/audio/abcde/Makefile	Fri Nov  1 07:34:40 2002
+++ abcde/Makefile	Thu Jan  9 23:59:02 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	abcde
 PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/abcde/
 DISTNAME= 	abcde_2.0.3.orig
@@ -15,7 +15,7 @@
 MAINTAINER=	mchopra@engmail.uwaterloo.ca
 
 RUN_DEPENDS=    cd-discid:${PORTSDIR}/audio/cd-discid \
-		dagrab:${PORTSDIR}/audio/dagrab \
+		cdparanoia:${PORTSDIR}/audio/cdparanoia \
 		id3v2:${PORTSDIR}/audio/id3v2 \
 		oggenc:${PORTSDIR}/audio/vorbis-tools
 
@@ -28,8 +28,16 @@
 .else
 pre-fetch:
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build option:"
-	@${ECHO_MSG} "WITH_CDDA2WAV=yes           enable support for cdda2wav"
+	@${ECHO_MSG} "Define WITH_CDDA2WAV to enable support for cdda2wav."
+	@${ECHO_MSG} ""
+.endif
+
+.if defined(WITH_DAGRAB)
+RUN_DEPENDS+=   dagrab:${PORTSDIR}/audio/dagrab
+.else
+pre-fetch:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Define WITH_DAGRAB to enable support for dagrab."
 	@${ECHO_MSG} ""
 .endif
 
diff -ruN /usr/ports/audio/abcde/files/patch-ab abcde/files/patch-ab
--- /usr/ports/audio/abcde/files/patch-ab	Wed Oct 30 06:15:09 2002
+++ abcde/files/patch-ab	Thu Jan  9 23:46:32 2003
@@ -1,14 +1,5 @@
---- abcde.conf.orig	Tue Oct 29 13:00:04 2002
-+++ abcde.conf	Tue Oct 29 13:04:22 2002
-@@ -27,7 +27,7 @@
- 
- # CD reader program to use - currently recognized options are 'cdparanoia'
- # and 'cdda2wav'.
--#CDROMREADERSYNTAX=cdparanoia
-+CDROMREADERSYNTAX=dagrab
- 
- # Specify 'nice'ness of the encoder and of the CD reader.
- # This is a relative 'nice'ness (that is, if the parent process is at a
+--- abcde.conf.orig	Sun Jan 20 21:35:31 2002
++++ abcde.conf	Thu Jan  9 23:45:53 2003
 @@ -51,7 +51,7 @@
  #ID3V2=id3v2
  #CDPARANOIA=cdparanoia