diff options
| author | kim <kim@pkgsrc.org> | 2004-05-02 07:37:19 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2004-05-02 07:37:19 +0000 |
| commit | 797eacf22fa35bd3cf16c5cf89594da928884657 (patch) | |
| tree | c69e7723ef899b7b70d13e2ce190b8c8ff07ff66 /audio/abcde/patches/patch-ac | |
| parent | 60f45dd6529e00b09ef5ebede58cfaff718cb839 (diff) | |
| download | pkgsrc-797eacf22fa35bd3cf16c5cf89594da928884657.tar.gz | |
Make abcde not barf when UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE=y
although it still won't email anything (I will look at that more).
Diffstat (limited to 'audio/abcde/patches/patch-ac')
| -rw-r--r-- | audio/abcde/patches/patch-ac | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index d39c1732a7a..a0cfc20ce1d 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $ +$NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $ ---- abcde.orig 2004-02-15 16:19:36.000000000 -0800 -+++ abcde 2004-02-23 10:50:21.000000000 -0800 -@@ -1026,7 +1026,11 @@ do_cddbread () +--- abcde.orig 2004-04-09 14:12:15.000000000 -0400 ++++ abcde 2004-04-25 23:19:43.000000000 -0400 +@@ -1129,7 +1129,11 @@ do_cddbedit () { if checkstatus cddb-edit >/dev/null; then @@ -14,7 +14,16 @@ $NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $ VARIOUSARTISTS="$(checkstatus variousartists)" VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)" return 0 -@@ -1494,8 +1498,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then +@@ -1373,7 +1377,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 ' ' -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) +@@ -1703,8 +1707,8 @@ fi # Load system defaults @@ -25,7 +34,7 @@ $NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $ fi # Load user preference defaults if [ -r $HOME/.abcde.conf ]; then -@@ -1528,6 +1532,9 @@ if [ "$CDROM" = "" ] ; then +@@ -1737,6 +1741,9 @@ CDROM=/dev/acd0c elif [ -e /dev/disk1 ]; then CDROM=/dev/disk1 @@ -35,7 +44,7 @@ $NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $ fi fi -@@ -1603,7 +1610,7 @@ fi +@@ -1837,7 +1844,7 @@ case "$CDROMREADERSYNTAX" in cdparanoia|debug) CDROMREADER="$CDPARANOIA" @@ -44,7 +53,7 @@ $NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $ ;; cdda2wav) CDROMREADER="$CDDA2WAV" -@@ -1737,7 +1744,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA +@@ -1979,7 +1986,8 @@ do # Cut off the command-line options we just added in X=$(echo $X | cut -d' ' -f2) |