Wed Jan 18 09:52:13 2017 UTC ()
Install abcde-musicbrainz-tool and add dependencies for it.
Fix a bug in the script.

Bump PKGREVISION.


(wiz)
diff -r1.61 -r1.62 pkgsrc/audio/abcde/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/abcde/PLIST
diff -r1.44 -r1.45 pkgsrc/audio/abcde/distinfo
diff -r1.10 -r1.11 pkgsrc/audio/abcde/patches/patch-ab
diff -r0 -r1.1 pkgsrc/audio/abcde/patches/patch-abcde-musicbrainz-tool
cvs diff -r1.61 -r1.62 pkgsrc/audio/abcde/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/abcde/Makefile 2017/01/16 12:27:18 1.61
+++ pkgsrc/audio/abcde/Makefile 2017/01/18 09:52:13 1.62
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1# $NetBSD: Makefile,v 1.61 2017/01/16 12:27:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.62 2017/01/18 09:52:13 wiz Exp $
2 2
3DISTNAME= abcde-2.8 3DISTNAME= abcde-2.8
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= http://abcde.einval.com/download/ 6MASTER_SITES= http://abcde.einval.com/download/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://abcde.einval.com/ 9HOMEPAGE= http://abcde.einval.com/
9COMMENT= Command-line utility to rip and encode an audio CD 10COMMENT= Command-line utility to rip and encode an audio CD
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12DEPENDS+= cd-discid>=0.7:../../audio/cd-discid 13DEPENDS+= cd-discid>=0.7:../../audio/cd-discid
13DEPENDS+= eyeD3-[0-9]*:../../audio/eyeD3 14DEPENDS+= eyeD3-[0-9]*:../../audio/eyeD3
14DEPENDS+= id3-[0-9]*:../../audio/id3 15DEPENDS+= id3-[0-9]*:../../audio/id3
15DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia 16DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia
 17DEPENDS+= p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID
 18DEPENDS+= p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz
16# depend on cdrkit for icedax? 19# depend on cdrkit for icedax?
17DEPENDS+= mkcue>=2.1:../../misc/mkcue 20DEPENDS+= mkcue>=2.1:../../misc/mkcue
18 21
19NO_BUILD= yes 22NO_BUILD= yes
20WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 23WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
21 24
22USE_TOOLS+= bash:run ftp:run gsed:run 25USE_TOOLS+= bash:run ftp:run gsed:run perl:run
23REPLACE_BASH= abcde cddb-tool 26REPLACE_BASH= abcde cddb-tool
24REPLACE_PERL+= abcde-musicbrainz-tool 27REPLACE_PERL+= abcde-musicbrainz-tool
25 28
26# even with all these installed, abcde-musicbrainz-tool does not work 29# even with all these installed, abcde-musicbrainz-tool does not work
27#USE_TOOLS= perl:run 30#USE_TOOLS= perl:run
28#DEPENDS+= p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID 31#DEPENDS+= p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID
29#DEPENDS+= p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz 32#DEPENDS+= p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz
30 33
31EGDIR= ${PREFIX}/share/examples/abcde 34EGDIR= ${PREFIX}/share/examples/abcde
32 35
33MESSAGE_SUBST+= EGDIR=${EGDIR} 36MESSAGE_SUBST+= EGDIR=${EGDIR}
34MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 37MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
35 38
@@ -40,22 +43,22 @@ SUBST_STAGE.abcde= pre-configure @@ -40,22 +43,22 @@ SUBST_STAGE.abcde= pre-configure
40SUBST_MESSAGE.abcde= Adjusting the directory for configuration files 43SUBST_MESSAGE.abcde= Adjusting the directory for configuration files
41SUBST_FILES.abcde= abcde abcde.1 44SUBST_FILES.abcde= abcde abcde.1
42SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g" 45SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g"
43 46
44SUBST_CLASSES+= gsed 47SUBST_CLASSES+= gsed
45SUBST_STAGE.gsed= pre-configure 48SUBST_STAGE.gsed= pre-configure
46SUBST_MESSAGE.gsed= Adjusting gsed path 49SUBST_MESSAGE.gsed= Adjusting gsed path
47SUBST_FILES.gsed= abcde 50SUBST_FILES.gsed= abcde
48SUBST_SED.gsed= -e "s, sed , ${TOOLS_PATH.gsed} ,g" 51SUBST_SED.gsed= -e "s, sed , ${TOOLS_PATH.gsed} ,g"
49 52
50do-install: 53do-install:
51 ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin 54 ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
52 ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin 55 ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
53# ${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin 56 ${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin
54 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 57 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
55 ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR} 58 ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
56 ${INSTALL_MAN} ${WRKSRC}/abcde.1 \ 59 ${INSTALL_MAN} ${WRKSRC}/abcde.1 \
57 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 60 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
58 ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \ 61 ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
59 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 62 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
60 63
61.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/audio/abcde/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/abcde/PLIST 2015/01/04 12:03:07 1.5
+++ pkgsrc/audio/abcde/PLIST 2017/01/18 09:52:13 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1@comment $NetBSD: PLIST,v 1.5 2015/01/04 12:03:07 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2017/01/18 09:52:13 wiz Exp $
2bin/abcde 2bin/abcde
3@comment bin/abcde-musicbrainz-tool 3bin/abcde-musicbrainz-tool
4bin/cddb-tool 4bin/cddb-tool
5man/man1/abcde.1 5man/man1/abcde.1
6man/man1/cddb-tool.1 6man/man1/cddb-tool.1
7share/examples/abcde/abcde.conf 7share/examples/abcde/abcde.conf
cvs diff -r1.44 -r1.45 pkgsrc/audio/abcde/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/abcde/distinfo 2017/01/16 12:27:18 1.44
+++ pkgsrc/audio/abcde/distinfo 2017/01/18 09:52:13 1.45
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.44 2017/01/16 12:27:18 wiz Exp $ 1$NetBSD: distinfo,v 1.45 2017/01/18 09:52:13 wiz Exp $
2 2
3SHA1 (abcde-2.8.tar.gz) = 951071d3ed710d9e40dccaba9f47af2ff82b4c61 3SHA1 (abcde-2.8.tar.gz) = 951071d3ed710d9e40dccaba9f47af2ff82b4c61
4RMD160 (abcde-2.8.tar.gz) = f080f1e499b8d6fec34d7777e5b396d01200682a 4RMD160 (abcde-2.8.tar.gz) = f080f1e499b8d6fec34d7777e5b396d01200682a
5SHA512 (abcde-2.8.tar.gz) = 2124b2fd4fcea984a258ebeffeb7654eecc92d62bb20e76f032ed2e0de5084e9afaf665cccf0b632983baeb572321ce6913e3a956c7865da40fecccc9d23243d 5SHA512 (abcde-2.8.tar.gz) = 2124b2fd4fcea984a258ebeffeb7654eecc92d62bb20e76f032ed2e0de5084e9afaf665cccf0b632983baeb572321ce6913e3a956c7865da40fecccc9d23243d
6Size (abcde-2.8.tar.gz) = 148444 bytes 6Size (abcde-2.8.tar.gz) = 148444 bytes
7SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc 7SHA1 (patch-ab) = 04771bb4d0ace2886fe7612a06b4476696d0429d
 8SHA1 (patch-abcde-musicbrainz-tool) = 9cf135bb2682fa72a801ba1358098663370f9fc9
cvs diff -r1.10 -r1.11 pkgsrc/audio/abcde/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/abcde/patches/patch-ab 2010/04/10 13:20:11 1.10
+++ pkgsrc/audio/abcde/patches/patch-ab 2017/01/18 09:52:13 1.11
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.10 2010/04/10 13:20:11 sekiya Exp $ 1$NetBSD: patch-ab,v 1.11 2017/01/18 09:52:13 wiz Exp $
 2
 3Adapt path in examplef or NetBSD.
2 4
3--- abcde.conf.orig 2006-10-02 03:26:11.000000000 +0900 5--- abcde.conf.orig 2006-10-02 03:26:11.000000000 +0900
4+++ abcde.conf 2010-04-10 10:03:49.000000000 +0900 6+++ abcde.conf 2010-04-10 10:03:49.000000000 +0900
5@@ -221,7 +221,7 @@ 7@@ -221,7 +221,7 @@
6 # CD device you want to read from 8 # CD device you want to read from
7 # It can be defined as a singletrack flac file, but since it might change from 9 # It can be defined as a singletrack flac file, but since it might change from
8 # file to file it makes little sense to define it here. 10 # file to file it makes little sense to define it here.
9-#CDROM=/dev/cdrom 11-#CDROM=/dev/cdrom
10+#CDROM=/dev/rcd0d 12+#CDROM=/dev/rcd0d
11 # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d" 13 # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
12 # If we are using the ide-scsi emulation layer, we need to define a "g" 14 # If we are using the ide-scsi emulation layer, we need to define a "g"
13 #CDPARANOIACDROMBUS="d" 15 #CDPARANOIACDROMBUS="d"
File Added: pkgsrc/audio/abcde/patches/Attic/patch-abcde-musicbrainz-tool
$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);
 	}