[pkgsrc/trunk]: pkgsrc/audio/sound-juicer -avoid crash if the disk device can...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0902943a1f4
branches:  trunk
changeset: 562369:e0902943a1f4
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sun Jul 26 18:31:22 2009 +0000

description:
-avoid crash if the disk device cannot be accessed
-g/c bl3 include which is only needed indirectly
bump PKGREVISION

diffstat:

 audio/sound-juicer/Makefile         |   4 ++--
 audio/sound-juicer/distinfo         |   3 ++-
 audio/sound-juicer/patches/patch-ab |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r b7856249e3df -r e0902943a1f4 audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile       Sun Jul 26 18:25:01 2009 +0000
+++ b/audio/sound-juicer/Makefile       Sun Jul 26 18:31:22 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/07/22 17:13:18 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/26 18:31:22 drochner Exp $
 #
 
 DISTNAME=              sound-juicer-2.26.1
+PKGREVISION=           1
 CATEGORIES=            audio
 MASTER_SITES=          http://www.burtonini.com/computing/ \
                        ${MASTER_SITE_GNOME:=sources/sound-juicer/2.26/}
@@ -43,7 +44,6 @@
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../sysutils/brasero/buildlink3.mk"
-.include "../../sysutils/hal/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff -r b7856249e3df -r e0902943a1f4 audio/sound-juicer/distinfo
--- a/audio/sound-juicer/distinfo       Sun Jul 26 18:25:01 2009 +0000
+++ b/audio/sound-juicer/distinfo       Sun Jul 26 18:31:22 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/07/22 15:16:44 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/07/26 18:31:22 drochner Exp $
 
 SHA1 (sound-juicer-2.26.1.tar.gz) = 46c705d49ec97a4679218387533af20020c26ddb
 RMD160 (sound-juicer-2.26.1.tar.gz) = 322003ffefa9c0c33afb22593af53fc5a7d6618b
 Size (sound-juicer-2.26.1.tar.gz) = 2457595 bytes
 SHA1 (patch-aa) = d7b6bc02f0a6abd4178639f80098c7fac21ea32b
+SHA1 (patch-ab) = 523296c20f9193c32fbc31a120b8fb90875b6cf6
diff -r b7856249e3df -r e0902943a1f4 audio/sound-juicer/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sound-juicer/patches/patch-ab       Sun Jul 26 18:31:22 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/07/26 18:31:22 drochner Exp $
+
+--- libjuicer/sj-metadata-musicbrainz3.c.orig  2009-04-06 18:28:51.000000000 +0200
++++ libjuicer/sj-metadata-musicbrainz3.c
+@@ -231,6 +231,8 @@ mb_list_albums (SjMetadata *metadata, ch
+   }
+ 
+   priv->disc = mb_read_disc (priv->cdrom);
++  if (!priv->disc)
++      return NULL;
+   if (url != NULL) {
+     mb_get_submission_url (priv->disc, NULL, 0, buffer, sizeof (buffer));
+     *url = g_strdup (buffer);