Install abcde-musicbrainz-tool and add dependencies for it.

Fix a bug in the script.

Bump PKGREVISION.

5 files changed, 34 insertions, 8 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 19a917d7b0e..4a904b9c41b 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2017/01/16 12:27:18 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2017/01/18 09:52:13 wiz Exp $
 
 DISTNAME=	abcde-2.8
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
@@ -13,13 +14,15 @@ 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
+DEPENDS+=	p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID
+DEPENDS+=	p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz
 # depend on cdrkit for icedax?
 DEPENDS+=	mkcue>=2.1:../../misc/mkcue
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-USE_TOOLS+=	bash:run ftp:run gsed:run
+USE_TOOLS+=	bash:run ftp:run gsed:run perl:run
 REPLACE_BASH=	abcde cddb-tool
 REPLACE_PERL+=	abcde-musicbrainz-tool
 
@@ -50,7 +53,7 @@ SUBST_SED.gsed=		-e "s, sed , ${TOOLS_PATH.gsed} ,g"
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
-#	${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
 	${INSTALL_MAN} ${WRKSRC}/abcde.1 \
diff --git a/audio/abcde/PLIST b/audio/abcde/PLIST
index 3d4c7564443..2801be81196 100644
--- a/audio/abcde/PLIST
+++ b/audio/abcde/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2015/01/04 12:03:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/01/18 09:52:13 wiz Exp $
 bin/abcde
-@comment bin/abcde-musicbrainz-tool
+bin/abcde-musicbrainz-tool
 bin/cddb-tool
 man/man1/abcde.1
 man/man1/cddb-tool.1
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 0cd95563f31..7c5565cd356 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.44 2017/01/16 12:27:18 wiz Exp $
+$NetBSD: distinfo,v 1.45 2017/01/18 09:52:13 wiz Exp $
 
 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-ab) = 04771bb4d0ace2886fe7612a06b4476696d0429d
+SHA1 (patch-abcde-musicbrainz-tool) = 9cf135bb2682fa72a801ba1358098663370f9fc9
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index 1690894d1e8..9a7ddae9b07 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2010/04/10 13:20:11 sekiya Exp $
+$NetBSD: patch-ab,v 1.11 2017/01/18 09:52:13 wiz Exp $
+
+Adapt path in examplef or NetBSD.
 
 --- abcde.conf.orig	2006-10-02 03:26:11.000000000 +0900
 +++ abcde.conf	2010-04-10 10:03:49.000000000 +0900
diff --git a/audio/abcde/patches/patch-abcde-musicbrainz-tool b/audio/abcde/patches/patch-abcde-musicbrainz-tool
new file mode 100644
index 00000000000..60fa5fe4cdd
--- /dev/null
+++ b/audio/abcde/patches/patch-abcde-musicbrainz-tool
@@ -0,0 +1,20 @@
+$NetBSD: patch-abcde-musicbrainz-tool,v 1.1 2017/01/18 09:52:13 wiz Exp $
+
+Fix undefined variable problem.
+
+--- abcde-musicbrainz-tool.orig	2017-01-14 00:53:48.000000000 +0000
++++ abcde-musicbrainz-tool
+@@ -92,12 +92,12 @@ if ($command =~ m/^id/) {
+     foreach my $release (@releases) {
+         my $a_artist = $release->artist()->name();
+         my $va = 0;
++        my $rel_year = "";
+         if ($a_artist =~ /Various Artists/) {
+             $va = 1;
+         }
+ 	if ($release->release_event_list()->count() > 0) {
+ 	    my @events = @{$release->release_event_list()->events()};
+-	    my $rel_year = "";
+ 	    $rel_year =  substr($events[0]->date(),0,4);
+ 	}
+