1 files changed, 0 insertions, 81 deletions
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
deleted file mode 100644
index cf736c10432..00000000000
--- a/audio/abcde/patches/patch-ac
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $
-
---- abcde.orig	2005-10-04 21:39:38.000000000 +0100
-+++ abcde	2005-10-04 21:44:53.000000000 +0100
-@@ -1559,7 +1559,11 @@
- do_cddbedit ()
- {
- 	if checkstatus cddb-edit >/dev/null; then
-+		# Strip out ^M
- 		CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
-+		CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
-+		tr -d '\r' < $CDDBDATA > $CDDBDATATMP
-+		mv $CDDBDATATMP $CDDBDATA
- 		VARIOUSARTISTS="$(checkstatus variousartists)"
- 		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
- 		return 0
-@@ -1824,7 +1828,7 @@
- 	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' ' -f1)" ]; 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) 
-@@ -2114,7 +2118,7 @@
- DISTMP3=distmp3
- VORBISCOMMENT=vorbiscomment
- METAFLAC=metaflac
--NORMALIZE=normalize-audio
-+NORMALIZE=normalize
- CDSPEED=eject
- VORBISGAIN=vorbisgain
- MKCUE=mkcue
-@@ -2169,6 +2173,7 @@
- 	HTTPGET=fetch
- 	NEEDCDROMID=y
- 	OSFLAVOUR=FBSD
-+	MD5SUM=md5
- elif [ X$(uname) = "XDarwin" ] ; then
- 	HTTPGET=curl
- 	OSFLAVOUR=OSX
-@@ -2178,6 +2183,9 @@
- elif [ X$(uname) = "XOpenBSD" ] ; then
- 	HTTPGET=wget
- 	MD5SUM=md5
-+elif [ X$(uname) = "XNetBSD" ] ; then
-+	HTTPGET=wget
-+	MD5SUM=md5
- else
- 	HTTPGET=wget
- fi
-@@ -2231,6 +2239,9 @@
- 		CDROM=/dev/acd0c
- 	elif [ -e /dev/disk1 ]; then
- 		CDROM=/dev/disk1
-+	else
-+		RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
-+		CDROM=/dev/rcd0$RAWPART
- 	fi
- fi
- 
-@@ -2427,7 +2438,7 @@
- case "$CDROMREADERSYNTAX" in
- 	cdparanoia|debug)
- 		CDROMREADER="$CDPARANOIA"
--		CDROMREADEROPTS="$CDPARANOIAOPTS"
-+		CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}"
- 		;;
- 	cdda2wav)
- 		CDROMREADER="$CDDA2WAV"
-@@ -2681,7 +2692,8 @@
- do
- 	# Cut off the command-line options we just added in
- 	X=$(echo $X | cut -d' ' -f2)
--	if [ "$(which $X)" = "" ]; then
-+	Y="$(which $X | cut -d' ' -f1,2)"
-+	if [ "$Y" = "" -o "$Y" = "no $X" ]; then
- 		echo "abcde error: $X is not in your path." >&2
- 		exit 1
- 	elif [ ! -x $(which $X) ]; then