diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/abcde/Makefile | 4 | ||||
| -rw-r--r-- | audio/abcde/distinfo | 4 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ac | 44 |
3 files changed, 37 insertions, 15 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index bd4358418a1..06696cb0141 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2008/03/02 06:10:30 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2009/09/15 10:46:10 drochner Exp $ DISTNAME= abcde_2.3.3.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.hispalinux.es/~data/files/ diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo index 0b7f5bd8171..82658125a1b 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.30 2006/10/14 13:20:46 rillig Exp $ +$NetBSD: distinfo,v 1.31 2009/09/15 10:46:10 drochner Exp $ SHA1 (abcde_2.3.3.orig.tar.gz) = 76486a0bcb4ac85d052e0d244da3abbeab3c5db0 RMD160 (abcde_2.3.3.orig.tar.gz) = a96030891e263e765cd86151ec227b1d3babbcea Size (abcde_2.3.3.orig.tar.gz) = 73458 bytes SHA1 (patch-ab) = 9fe36ee69e628a4c460dd8ee30b4e9bca29d7081 -SHA1 (patch-ac) = 7aa2adc9cc9eb34eff1e12a1093d25e81ec3fa31 +SHA1 (patch-ac) = 1098e695035b6aeac265cdb5fa9e32580282114d diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index cf736c10432..57d5e580ef9 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,8 +1,30 @@ -$NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ +$NetBSD: patch-ac,v 1.23 2009/09/15 10:46:10 drochner Exp $ ---- abcde.orig 2005-10-04 21:39:38.000000000 +0100 -+++ abcde 2005-10-04 21:44:53.000000000 +0100 -@@ -1559,7 +1559,11 @@ +--- abcde.orig 2005-08-26 00:43:27.000000000 +0200 ++++ abcde +@@ -1302,14 +1302,20 @@ do_cleancue() + # FIXME It doesn't preserve spaces! Why? + # FIXME parse $track into PERFORMER and TITLE - abcde already has code for this? + n=1 ++ newtrack=0 + echo "PERFORMER \"$DARTIST\"" >> "$CUEFILE_OUT" + echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT" + cat "$CUEFILE_IN" | while read line + do +- if echo "$line" | grep -q "INDEX" ++ if echo "$line" | grep -q "TRACK" ++ then ++ newtrack=1 ++ fi ++ if echo "$line" | grep -q "INDEX" && [ $newtrack = 1 ] + then + eval track="\$TRACK$n" + n=$(expr $n + 1) ++ newtrack=0 + echo "TITLE \"$track\"" >> "$CUEFILE_OUT" + fi + echo "$line" >> "$CUEFILE_OUT" +@@ -1559,7 +1565,11 @@ do_cddbread () do_cddbedit () { if checkstatus cddb-edit >/dev/null; then @@ -14,7 +36,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ VARIOUSARTISTS="$(checkstatus variousartists)" VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)" return 0 -@@ -1824,7 +1828,7 @@ +@@ -1824,7 +1834,7 @@ do_cddbedit () echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status" if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then @@ -23,7 +45,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ # 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 @@ +@@ -2114,7 +2124,7 @@ MD5SUM=md5sum DISTMP3=distmp3 VORBISCOMMENT=vorbiscomment METAFLAC=metaflac @@ -32,7 +54,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ CDSPEED=eject VORBISGAIN=vorbisgain MKCUE=mkcue -@@ -2169,6 +2173,7 @@ +@@ -2169,6 +2179,7 @@ if [ X$(uname) = "XFreeBSD" ] ; then HTTPGET=fetch NEEDCDROMID=y OSFLAVOUR=FBSD @@ -40,7 +62,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ elif [ X$(uname) = "XDarwin" ] ; then HTTPGET=curl OSFLAVOUR=OSX -@@ -2178,6 +2183,9 @@ +@@ -2178,6 +2189,9 @@ elif [ X$(uname) = "XDarwin" ] ; then elif [ X$(uname) = "XOpenBSD" ] ; then HTTPGET=wget MD5SUM=md5 @@ -50,7 +72,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ else HTTPGET=wget fi -@@ -2231,6 +2239,9 @@ +@@ -2231,6 +2245,9 @@ if [ "$CDROM" = "" ] ; then CDROM=/dev/acd0c elif [ -e /dev/disk1 ]; then CDROM=/dev/disk1 @@ -60,7 +82,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ fi fi -@@ -2427,7 +2438,7 @@ +@@ -2427,7 +2444,7 @@ fi case "$CDROMREADERSYNTAX" in cdparanoia|debug) CDROMREADER="$CDPARANOIA" @@ -69,7 +91,7 @@ $NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ ;; cdda2wav) CDROMREADER="$CDDA2WAV" -@@ -2681,7 +2692,8 @@ +@@ -2681,7 +2698,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA do # Cut off the command-line options we just added in X=$(echo $X | cut -d' ' -f2) |