diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index ebeb7685e0b..492510fe1d6 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/14 22:08:54 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2004/02/15 16:25:14 sturm Exp $
 
 COMMENT=	"command-line utility to rip and encode audio cds"
 
-V=		2.0.3
+V=		2.1.14
+# cd-diskid version number
+V2=		0.9
 DISTNAME=	abcde_$V.orig
 PKGNAME=	abcde-$V
 CATEGORIES=	audio
 
-HOMEPAGE=	http://frantica.lly.org/~rcw/abcde/page/
+HOMEPAGE=	http://www.hispalinux.es/~data/abcde.php
 
 # Artistic and GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,12 +17,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MS=		http://frantica.lly.org/~rcw/
-MASTER_SITES=	${MS}abcde/
-MASTER_SITES0=	${MS}cd-discid/old/
-MASTER_SITES1=	${MS}id3/
+MS=		http://www.hispalinux.es/~data/files/
+MASTER_SITES=	${MS}
+MASTER_SITES0=	${MS}cd-discid/
+MASTER_SITES1=	http://lly.org/~rcw/id3/
 DISTFILES=	${DISTNAME}.tar.gz \
-		cd-discid_0.7.orig.tar.gz:0
+		cd-discid_${V2}.orig.tar.gz:0
 
 RUN_DEPENDS=	:cdparanoia-*:audio/cdparanoia \
 		:wget-*:net/wget
@@ -44,7 +46,7 @@ post-patch:
 .endif
 
 do-build:
-	cd ${WRKDIR}/cd-discid-0.7 && \
+	cd ${WRKDIR}/cd-discid-${V2} && \
 		${CC} ${CFLAGS} -o cd-discid cd-discid.c
 .if ${FLAVOR:L:Mlame}
 	cd ${WRKDIR}/id3-0.12 && \
@@ -55,10 +57,10 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/cd-discid-0.7/cd-discid ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/cd-discid-${V2}/cd-discid ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/cd-discid-0.7/cd-discid.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/cd-discid-${V2}/cd-discid.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/abcde
 	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${PREFIX}/share/examples/abcde
 .if ${FLAVOR:L:Mlame}
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 4089e465040..a05f0ea5e65 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,9 +1,9 @@
-MD5 (abcde_2.0.3.orig.tar.gz) = e430e3d2fb87729d6452d495eabd7a7a
-MD5 (cd-discid_0.7.orig.tar.gz) = 677bf237de663d71a78a7a0611fd4469
+MD5 (abcde_2.1.14.orig.tar.gz) = c965218b4ca02d728c64396cc61f4d94
+MD5 (cd-discid_0.9.orig.tar.gz) = 64677b8b63d1db0db015043f5455171a
 MD5 (id3_0.12.orig.tar.gz) = 5791f634b928f39ec9eaa59efb3f9315
-RMD160 (abcde_2.0.3.orig.tar.gz) = 4425a9f660f992fae9d3241bce60180720c3084e
-RMD160 (cd-discid_0.7.orig.tar.gz) = dfbd4a9aae6cc281665745e221282e2ed2746e82
+RMD160 (abcde_2.1.14.orig.tar.gz) = a09206afeed8f957e7f2a1dd4832922e36ddb200
+RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa
 RMD160 (id3_0.12.orig.tar.gz) = 04bbb9077e606d4768e93a13b8f92cb9202a8f5c
-SHA1 (abcde_2.0.3.orig.tar.gz) = 66a7620a835baee29296f4d5e9322bb1679baa49
-SHA1 (cd-discid_0.7.orig.tar.gz) = ec66595e301ecac747e759116a3ec7edc438cdec
+SHA1 (abcde_2.1.14.orig.tar.gz) = 37e5fa6feb19db0d1294d351631f646f0b42a68f
+SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4
 SHA1 (id3_0.12.orig.tar.gz) = 6e74313f56214a73ef8b54edabd698444e07080f
diff --git a/audio/abcde/patches/patch-abcde b/audio/abcde/patches/patch-abcde
index 0e899827fa8..5f6d02782e3 100644
--- a/audio/abcde/patches/patch-abcde
+++ b/audio/abcde/patches/patch-abcde
@@ -1,123 +1,57 @@
-$OpenBSD: patch-abcde,v 1.3 2003/05/13 16:40:00 wilfried Exp $
---- abcde.orig	Sun Jan 27 22:44:02 2002
-+++ abcde	Tue May 13 07:11:24 2003
-@@ -574,7 +574,7 @@ do_cddbread ()
- 			fi
- 			# List out disc title/author and contents
- 			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"
- 			done
-@@ -590,7 +590,7 @@ do_cddbread ()
- 			$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"
- 			done
-@@ -620,7 +620,7 @@ do_cddbread ()
- 				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"
- 				done
-@@ -717,20 +717,16 @@ do_cddbedit ()
+$OpenBSD: patch-abcde,v 1.4 2004/02/15 16:25:14 sturm Exp $
+--- abcde.orig	2004-01-20 07:55:33.000000000 +0100
++++ abcde	2004-02-13 20:26:39.000000000 +0100
+@@ -1098,7 +1098,7 @@ do_cddbedit ()
  		EDITCDDB=n
  	fi
  	if [ "$EDITCDDB" = "y" ]; then
--		# Use the debian sensible-editor wrapper to pick the editor that the
--		# user has requested via their $EDITOR environment variable
--		if [ -x "/usr/bin/sensible-editor" ]; then
--			/usr/bin/sensible-editor "$CDDBDATA"
--		elif [ -x "$EDITOR" ]; then
--			# That failed, try to load the preferred editor, starting
-+		if [ -x `which $EDITOR` ]; then
-+			# Try to load the preferred editor, starting
- 			# with their EDITOR variable
- 			$EDITOR "$CDDBDATA"
- 		# If that fails, check for a vi
- 		elif [ -x /usr/bin/vi ]; then
- 			/usr/bin/vi "$CDDBDATA"
--		# ae should be on all debian systems
--		elif [ -x /bin/ae ]; then
--			/bin/ae "$CDDBDATA"
-+		# mg should be on all OpenBSD systems
-+		elif [ -x /usr/bin/mg ]; then
-+			/usr/bin/mg "$CDDBDATA"
- 		# bomb out
- 		else
- 			echo "No editor available. Check your EDITOR environment variable." >&2
-@@ -889,12 +885,12 @@ INTERACTIVE=y
- CDROMREADERSYNTAX=cdparanoia
- OUTPUTTYPE=ogg
- ENCODERSYNTAX=default
--OUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.$OUTPUTTYPE'
-+OUTPUTFORMAT='${ARTISTFILE}/${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
- VAOUTPUTFORMAT=${OUTPUTFORMAT}
- PLAYLISTFORMAT='${ARTISTFILE}_-_${ALBUMFILE}.m3u'
- PLAYLISTDATAPREFIX=''
+-		CDDBDATAMD5SUM=$(md5sum "$CDDBDATA" | cut -d " " -f 1);
++		CDDBDATAMD5SUM=$($MD5SUM "$CDDBDATA" | cut -d " " -f 1);
+ 		
+ 		# Use the debian sensible-editor wrapper to pick the editor that the
+ 		# user has requested via their $EDITOR environment variable
+@@ -1214,7 +1214,7 @@ do_cddbedit ()
+ 	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
+ 
+ 	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
+-		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $(md5sum "$CDDBDATA" | cut -d " " -f 1) ]; then
++		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; then
+ 			# This works but does not have the necessary error checking
+ 			# yet. If you are familiar with the CDDB spec
+ 			# (see http://www.freedb.org/src/latest/DBFORMAT) 
+@@ -1338,7 +1338,7 @@ PLAYLISTDATAPREFIX=''
+ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
+ VAPLAYLISTDATAPREFIX=''
  COMMENT=''
 -ID3TAGV=2
 +ID3TAGV=1
  ENCNICE=10
  READNICE=10
- VARIOUSARTISTS=n
-@@ -964,13 +960,7 @@ if [ -z "$WAVOUTPUTDIR" ]; then
- 	WAVOUTPUTDIR="$OUTPUTDIR"
+ DISTMP3NICE=10
+@@ -1380,6 +1380,7 @@ CDDAFS=cp
+ CDDISCID=cd-discid
+ CDDBTOOL=cddb-tool
+ EJECT=eject
++MD5SUM=md5sum
+ DISTMP3=distmp3
+ VORBISCOMMENT=vorbiscomment
+ METAFLAC=metaflac
+@@ -1436,6 +1437,9 @@ elif [ X$(uname) = "XDarwin" ] ; then
+ 	OSFLAVOUR=OSX
+ 	# We should have disktool in OSX, but let's be sure...
+ 	NEEDDISKTOOL=y
++elif [ X$(uname) = "XOpenBSD" ] ; then
++	HTTPGET=wget
++	MD5SUM=md5
+ else
+ 	HTTPGET=wget
  fi
+@@ -1709,7 +1713,7 @@ HTTPGET="$HTTPGET $HTTPGETOPTS"
  
--# If this is a devfs system, default to /dev/cdroms/cdrom0
--# instead of /dev/cdrom
--if [ -e /dev/cdroms/cdrom0 ]; then
--	CDROM=/dev/cdroms/cdrom0
--else
--	CDROM=/dev/cdrom
--fi
-+CDROM=/dev/cd0c
+ # Export needed things so they can be read in this subshell
+ export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
+-export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET
++export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM
  
- # Load system defaults
- if [ -r /etc/abcde.conf ]; then
-@@ -1010,7 +1000,7 @@ while [ $# -gt 0 ]; do
- 	if [ "$RSTART" = "$REND" ]; then 
- 		NEWTRACKS="$RSTART"
- 	else
--		NEWTRACKS=$(seq -s ' ' $RSTART $REND)
-+		NEWTRACKS=$(jot -s ' ' $(expr $REND - $RSTART + 1) $RSTART)
- 	fi
- 	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
+ do_discid # Get ABCDETEMPDIR created and status file initialized
  
-@@ -1101,15 +1091,12 @@ if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDC
- 
- # Make sure a buncha things exist
- for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \
--	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} seq
-+	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT}
- do
- 	# Cut off the command-line options we just added in
- 	X=$(echo $X | cut -d' ' -f2)
--	if [ "$(which $X)" = "" ]; then
--		echo "abcde error: $X is not in your path." >&2
--		exit 1
--	elif [ ! -x $(which $X) ]; then
--		echo "abcde error: $X is not executable." >&2
-+	if [ ! -x "$(which $X)" ]; then
-+		echo "abcde error: Can't find $X." >&2
- 		exit 1
- 	fi 
- done
-@@ -1191,7 +1178,7 @@ fi
- # 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-abcde_conf b/audio/abcde/patches/patch-abcde_conf
deleted file mode 100644
index e07cf80df1b..00000000000
--- a/audio/abcde/patches/patch-abcde_conf
+++ /dev/null
@@ -1,38 +0,0 @@
-$OpenBSD: patch-abcde_conf,v 1.1.1.1 2002/03/18 15:08:45 wilfried Exp $
---- abcde.conf.orig	Mon Jan 21 03:35:31 2002
-+++ abcde.conf	Thu Mar 14 17:38:02 2002
-@@ -59,14 +59,14 @@
- #VORBISCOMMENT=vorbiscomment
- 
- # Options to call programs with
--#LAMEOPTS=
-+#LAMEOPTS='-b 192'
- #GOGOOPTS=
- #BLADEENCOPTS=
- #L3ENCOPTS=
- #XINGMP3ENCOPTS=
- #MP3ENCOPTS=
- #VORBIZEOPTS=
--#OGGENCOPTS=
-+#OGGENCOPTS='-b 192'
- #ID3OPTS=
- #ID3V2OPTS=
- #CDPARANOIAOPTS=
-@@ -96,7 +96,7 @@
- #NOCDDBQUERY=n
- 
- # CD device you want to read from
--#CDROM=/dev/cdrom
-+#CDROM=/dev/cd0c
- 
- # If you'd like to make a default location that overrides the current
- # directory for putting mp3's, uncomment this.
-@@ -115,7 +115,7 @@
- # OUTPUTTYPE, ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
- # Make sure to single-quote this variable. abcde will automatically create
- # the directory portion of this filename.
--#OUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
-+#OUTPUTFORMAT='${ARTISTFILE}/${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
- 
- # Like OUTPUTFORMAT but for Various Artists discs.
- #VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
diff --git a/audio/abcde/patches/patch-cddb-tool b/audio/abcde/patches/patch-cddb-tool
deleted file mode 100644
index d19b2af71c4..00000000000
--- a/audio/abcde/patches/patch-cddb-tool
+++ /dev/null
@@ -1,28 +0,0 @@
-$OpenBSD: patch-cddb-tool,v 1.1 2003/05/13 15:46:39 wilfried Exp $
---- cddb-tool.orig	Sun Jan 20 19:29:23 2002
-+++ cddb-tool	Tue May 13 07:11:58 2003
-@@ -119,7 +119,7 @@ template)
- 	echo '#'
- 	echo '# Track frame offsets:'
- 	NUMTRACKS=$2
--	for x in $(seq 3 $(expr $NUMTRACKS + 2))
-+	for x in $(jot $NUMTRACKS 3)
- 	do
- 		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
- 	done
-@@ -135,13 +135,13 @@ template)
- 	echo DISCID="$DISCNUM"
- 	echo "DTITLE=Unknown Artist / Unknown Album"
- 	# TTITLE0 -- TTITLEn
--	for x in $(seq 1 $NUMTRACKS)
-+	for x in $(jot $NUMTRACKS)
- 	do
- 		echo "TTITLE$(expr $x - 1)=Track $x"
- 	done
- 	echo "EXTD="
- 	# EXTT0 -- EXTTn
--	for x in $(seq 1 $NUMTRACKS)
-+	for x in $(jot $NUMTRACKS)
- 	do
- 		echo "EXTT$(expr $x - 1)="
- 	done