Updated abcde to 2.8.

abcde 2.8

  * Make fdkaac the default for m4a encoding. Faac can still be selected
    for m4a encding via ~/.abcde.conf file but best not to :).
  * Split user-definable mungefilename function into mungetrackname,
    mungeartistname, and mungealbumname, each of which default to
    mungefilename Thanks to Gerald Turner for the patch and enhancement
    request. This closes Issue 39:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=39
  * FAQs: Clarify the exit from multi-result CDDB search.
  * Fix to allow multiple output formats when aac fallback is triggered.
    Thanks to Birk Bremer for the bug report. This closes Issue 35:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=35
  * Fix for some erroneous error and status logging. Thanks to Christian
    Wasem for the bug report and fix. This closes Issue 32:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=32
  * Add support for trying multiple CD lookup services in order. Thanks to
    Gabriel Rosenkoetter for the patch. Closes Issue 42:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=42
  * Add Recommends on glyrc and imagemagick in Debian packaging. Closes
    Debian Bug #827626
  * Fix up handling of the first few sectors when reading
    from a whole-CD flac file or using cdparanoia in one-track
    mode. Thanks to Matthias König for the patch. Closes Issue 44:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=44
  * Tweak the fix in musicbrainz for handling sketchy returned data
    some more. Hopefully closes Issue 30:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=30
  * Re-enable some commented out cdparanoia/debug code in do_discid.
    Closes Issue 14:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=14
  * Add "-a" to lots of grep calls in case of "binary" looking data,
    e.g. non-ascii text in track titles!
    Closes Issue 24:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=24
  * Add "-L" to default curl options, to follow redirects if needed
    Closes Issue 40:
    https://abcde.einval.com/bugzilla/show_bug.cgi?id=40
    Thanks to Gabriel Rosenkoetter for the patch.
  * Switch default from "cddb" to "musicbrainz" for track lookup
    Closes Debian Bug #842178

4 files changed, 10 insertions, 26 deletions

diff --git a/audio/abcde/MESSAGE b/audio/abcde/MESSAGE
index e94e0f57c7d..a9ebe3ef13b 100644
--- a/audio/abcde/MESSAGE
+++ b/audio/abcde/MESSAGE
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2015/01/04 12:03:07 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2017/01/16 12:27:18 wiz Exp $
 
 You need to install at least one encoder to use with abcde.  It has support
 for the following encoders in pkgsrc:
 
     audio/bladeenc
-    audio/faac
+    audio/fdk-aac
     audio/flac
     audio/gogo
     audio/lame
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 906806d840d..19a917d7b0e 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2016/07/09 06:37:47 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2017/01/16 12:27:18 wiz Exp $
 
-DISTNAME=	abcde-2.7.2
-PKGREVISION=	1
+DISTNAME=	abcde-2.8
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
@@ -14,6 +13,7 @@ DEPENDS+=	cd-discid>=0.7:../../audio/cd-discid
 DEPENDS+=	eyeD3-[0-9]*:../../audio/eyeD3
 DEPENDS+=	id3-[0-9]*:../../audio/id3
 DEPENDS+=	cdparanoia>=3.0.9.7:../../audio/cdparanoia
+# depend on cdrkit for icedax?
 DEPENDS+=	mkcue>=2.1:../../misc/mkcue
 
 NO_BUILD=	yes
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index a8fbe66a67c..0cd95563f31 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.43 2016/04/13 17:48:36 wiz Exp $
+$NetBSD: distinfo,v 1.44 2017/01/16 12:27:18 wiz Exp $
 
-SHA1 (abcde-2.7.2.tar.gz) = 0f40fc57907de4a58a7150e7983e37ce2261419a
-RMD160 (abcde-2.7.2.tar.gz) = d1d682c758e77b308d6c6ac3ce397d8ee7fa9533
-SHA512 (abcde-2.7.2.tar.gz) = b39af36d539de85b76e19da9fbe7ebb2dcbe69cc00a760eeaa163b402c9f7fbf399e28e6834904c12fc42706ab844522f3fc012bcd50a591b36f8c0b778af563
-Size (abcde-2.7.2.tar.gz) = 146407 bytes
+SHA1 (abcde-2.8.tar.gz) = 951071d3ed710d9e40dccaba9f47af2ff82b4c61
+RMD160 (abcde-2.8.tar.gz) = f080f1e499b8d6fec34d7777e5b396d01200682a
+SHA512 (abcde-2.8.tar.gz) = 2124b2fd4fcea984a258ebeffeb7654eecc92d62bb20e76f032ed2e0de5084e9afaf665cccf0b632983baeb572321ce6913e3a956c7865da40fecccc9d23243d
+Size (abcde-2.8.tar.gz) = 148444 bytes
 SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
-SHA1 (patch-abcde) = d6af00ab25100448f4c081e4b287909ef801506f
diff --git a/audio/abcde/patches/patch-abcde b/audio/abcde/patches/patch-abcde
deleted file mode 100644
index 53076755cc4..00000000000
--- a/audio/abcde/patches/patch-abcde
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-abcde,v 1.3 2015/10/15 09:50:22 wiz Exp $
-
-Default to cdda2wav since icedax is not in pkgsrc.
-
---- abcde.orig	2015-10-04 09:30:28.000000000 +0000
-+++ abcde
-@@ -3546,7 +3546,7 @@ ATOMICPARSLEY=AtomicParsley
- WINE=wine
- CDPARANOIA=cdparanoia
- CD_PARANOIA=cd-paranoia
--CDDA2WAV=icedax
-+CDDA2WAV=cdda2wav
- DAGRAB=dagrab
- CDDAFS=cp
- PIRD=pird