diff options
Diffstat (limited to 'audio/abcde/patches/patch-ac')
| -rw-r--r-- | audio/abcde/patches/patch-ac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index 3fd5581fa49..90a06bf740c 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ +$NetBSD: patch-ac,v 1.21 2005/10/04 20:58:43 sketch Exp $ ---- abcde.orig 2005-04-03 11:50:28.000000000 -0700 -+++ abcde 2005-05-14 09:21:24.000000000 -0700 -@@ -1227,7 +1227,11 @@ do_cddbread () +--- 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 @@ -14,16 +14,16 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ VARIOUSARTISTS="$(checkstatus variousartists)" VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)" return 0 -@@ -1482,7 +1486,7 @@ do_cddbedit () +@@ -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" " -f1) ]; 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) -@@ -1764,7 +1768,7 @@ MD5SUM=md5sum +@@ -2114,7 +2118,7 @@ DISTMP3=distmp3 VORBISCOMMENT=vorbiscomment METAFLAC=metaflac @@ -31,8 +31,8 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ +NORMALIZE=normalize CDSPEED=eject VORBISGAIN=vorbisgain - -@@ -1811,6 +1815,7 @@ if [ X$(uname) = "XFreeBSD" ] ; then + MKCUE=mkcue +@@ -2169,6 +2173,7 @@ HTTPGET=fetch NEEDCDROMID=y OSFLAVOUR=FBSD @@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ elif [ X$(uname) = "XDarwin" ] ; then HTTPGET=curl OSFLAVOUR=OSX -@@ -1819,6 +1824,9 @@ elif [ X$(uname) = "XDarwin" ] ; then +@@ -2178,6 +2183,9 @@ elif [ X$(uname) = "XOpenBSD" ] ; then HTTPGET=wget MD5SUM=md5 @@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ else HTTPGET=wget fi -@@ -1837,8 +1845,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then +@@ -2197,8 +2205,8 @@ fi # Load system defaults @@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ fi # Load user preference defaults if [ -r $HOME/.abcde.conf ]; then -@@ -1871,6 +1879,9 @@ if [ "$CDROM" = "" ] ; then +@@ -2231,6 +2239,9 @@ CDROM=/dev/acd0c elif [ -e /dev/disk1 ]; then CDROM=/dev/disk1 @@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ fi fi -@@ -2011,7 +2022,7 @@ fi +@@ -2427,7 +2438,7 @@ case "$CDROMREADERSYNTAX" in cdparanoia|debug) CDROMREADER="$CDPARANOIA" @@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ ;; cdda2wav) CDROMREADER="$CDDA2WAV" -@@ -2185,7 +2196,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA +@@ -2681,7 +2692,8 @@ do # Cut off the command-line options we just added in X=$(echo $X | cut -d' ' -f2) |