diff options
author | snj <snj> | 2005-05-15 00:36:28 +0000 |
---|---|---|
committer | snj <snj> | 2005-05-15 00:36:28 +0000 |
commit | b6c6bae47867d19f64f8b6f02920b8cadaaac0c5 (patch) | |
tree | 3d2e3aca1153e4cc0d8fa647ca9c965cf47e8f4a /audio/abcde | |
parent | e9f053e1a05edde9331c4fde475a82337ede2db0 (diff) | |
download | pkgsrc-b6c6bae47867d19f64f8b6f02920b8cadaaac0c5.tar.gz |
Update to 2.2.6. Closes PR pkg/29463.
Set NORMALIZE to "normalize" by default, to match what is installed by
pkgsrc/audio/normalize. This fixes part of PR pkg/29755.
This release brings various bugfixes and small features. Check the
included changelog for details.
Diffstat (limited to 'audio/abcde')
-rw-r--r-- | audio/abcde/Makefile | 7 | ||||
-rw-r--r-- | audio/abcde/distinfo | 12 | ||||
-rw-r--r-- | audio/abcde/patches/patch-ab | 10 | ||||
-rw-r--r-- | audio/abcde/patches/patch-ac | 35 |
4 files changed, 36 insertions, 28 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index 606ff47dee2..575d50ff08d 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.30 2005/04/21 09:05:37 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2005/05/15 00:36:28 snj Exp $ -DISTNAME= abcde_2.2.0.orig +DISTNAME= abcde_2.2.6.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 1 CATEGORIES= audio -MASTER_SITES= http://www.hispalinux.es/~data/files/ +MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/a/abcde/} MAINTAINER= snj@NetBSD.org HOMEPAGE= http://www.hispalinux.es/~data/abcde.php diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo index 2fe05d668bc..62535532f06 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.27 2005/04/21 08:56:18 pooka Exp $ +$NetBSD: distinfo,v 1.28 2005/05/15 00:36:28 snj Exp $ -SHA1 (abcde_2.2.0.orig.tar.gz) = b94ebc7837f06b15f892bd083f7d91c2e0138c46 -RMD160 (abcde_2.2.0.orig.tar.gz) = 4bed4d3e10d4246a58ab23a246dcdab3baa2b3bf -Size (abcde_2.2.0.orig.tar.gz) = 62550 bytes -SHA1 (patch-ab) = d4f47d8bc01d58c477fbbe374bb6c2488e0def67 -SHA1 (patch-ac) = 7db777b8ad33334373f0af3632c3f85a3429337a +SHA1 (abcde_2.2.6.orig.tar.gz) = dfb7433d8f2a783dab572cb27c9f54d04d8bde09 +RMD160 (abcde_2.2.6.orig.tar.gz) = 88795c8d964887dbfb2b83541ffb1b5af3e56bfd +Size (abcde_2.2.6.orig.tar.gz) = 64213 bytes +SHA1 (patch-ab) = 920c34f3c59c9c7da93ed62a7335566d9cb7d424 +SHA1 (patch-ac) = 8b56a86366938e2deea5b7e7cad2a400cf3eb024 diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab index dc59f7cd828..40f90197a90 100644 --- a/audio/abcde/patches/patch-ab +++ b/audio/abcde/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.7 2004/11/14 21:55:29 snj Exp $ +$NetBSD: patch-ab,v 1.8 2005/05/15 00:36:28 snj Exp $ ---- abcde.conf.orig 2004-11-06 16:56:58.000000000 -0800 -+++ abcde.conf 2004-11-14 13:12:13.000000000 -0800 +--- abcde.conf.orig 2005-03-01 05:19:50.000000000 -0800 ++++ abcde.conf 2005-05-14 08:15:50.000000000 -0700 @@ -174,7 +174,7 @@ #ACTIONS=cddb,read,encode,tag,move,clean @@ -9,5 +9,5 @@ $NetBSD: patch-ab,v 1.7 2004/11/14 21:55:29 snj Exp $ -#CDROM=/dev/cdrom +#CDROM=/dev/rcd0d - # If you'd like to make a default location that overrides the current - # directory for putting mp3's, uncomment this. + # Optional CDROM device-ID for readers requiring the SCSI-syntax Bus,ID,Lun + #CDROMID=0,3,0 diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index 89bf4292250..3fd5581fa49 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ +$NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $ ---- abcde.orig 2004-11-08 16:40:30.000000000 +0200 -+++ abcde 2005-04-21 11:55:39.000000000 +0300 -@@ -1215,7 +1215,11 @@ +--- 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 () do_cddbedit () { if checkstatus cddb-edit >/dev/null; then @@ -14,16 +14,25 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ VARIOUSARTISTS="$(checkstatus variousartists)" VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)" return 0 -@@ -1470,7 +1474,7 @@ +@@ -1482,7 +1486,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 +- if [ $CDDBDATAMD5SUM != "" ] && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d" " -f1) ]; 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) -@@ -1799,6 +1803,7 @@ +@@ -1764,7 +1768,7 @@ MD5SUM=md5sum + DISTMP3=distmp3 + VORBISCOMMENT=vorbiscomment + METAFLAC=metaflac +-NORMALIZE=normalize-audio ++NORMALIZE=normalize + CDSPEED=eject + VORBISGAIN=vorbisgain + +@@ -1811,6 +1815,7 @@ if [ X$(uname) = "XFreeBSD" ] ; then HTTPGET=fetch NEEDCDROMID=y OSFLAVOUR=FBSD @@ -31,7 +40,7 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ elif [ X$(uname) = "XDarwin" ] ; then HTTPGET=curl OSFLAVOUR=OSX -@@ -1807,6 +1812,9 @@ +@@ -1819,6 +1824,9 @@ elif [ X$(uname) = "XDarwin" ] ; then elif [ X$(uname) = "XOpenBSD" ] ; then HTTPGET=wget MD5SUM=md5 @@ -41,7 +50,7 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ else HTTPGET=wget fi -@@ -1825,8 +1833,8 @@ +@@ -1837,8 +1845,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then fi # Load system defaults @@ -52,7 +61,7 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ fi # Load user preference defaults if [ -r $HOME/.abcde.conf ]; then -@@ -1859,6 +1867,9 @@ +@@ -1871,6 +1879,9 @@ if [ "$CDROM" = "" ] ; then CDROM=/dev/acd0c elif [ -e /dev/disk1 ]; then CDROM=/dev/disk1 @@ -62,7 +71,7 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ fi fi -@@ -1997,7 +2008,7 @@ +@@ -2011,7 +2022,7 @@ fi case "$CDROMREADERSYNTAX" in cdparanoia|debug) CDROMREADER="$CDPARANOIA" @@ -71,7 +80,7 @@ $NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $ ;; cdda2wav) CDROMREADER="$CDDA2WAV" -@@ -2148,7 +2159,8 @@ +@@ -2185,7 +2196,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA do # Cut off the command-line options we just added in X=$(echo $X | cut -d' ' -f2) |