update to 2.28.2

changes:
-Fix crasher when MusicBrainz can't read a disc
-translation updates

7 files changed, 249 insertions, 37 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 46d20f1e685..3c98cbee70b 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/05/18 20:03:04 drochner Exp $
 #
 
-DISTNAME=		sound-juicer-2.28.1
-PKGREVISION=		3
+DISTNAME=		sound-juicer-2.28.2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.burtonini.com/computing/ \
 			${MASTER_SITE_GNOME:=sources/sound-juicer/2.28/}
diff --git a/audio/sound-juicer/PLIST b/audio/sound-juicer/PLIST
index 1fe9a5a074c..9ef333082a9 100644
--- a/audio/sound-juicer/PLIST
+++ b/audio/sound-juicer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/12/09 19:05:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/05/18 20:03:04 drochner Exp $
 bin/sound-juicer
 man/man1/sound-juicer.1
 share/applications/sound-juicer.desktop
@@ -79,6 +79,7 @@ share/icons/hicolor/48x48/apps/sound-juicer.png
 share/icons/hicolor/scalable/apps/sound-juicer.svg
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/as/LC_MESSAGES/sound-juicer.mo
+share/locale/ast/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
 share/locale/be/LC_MESSAGES/sound-juicer.mo
 share/locale/be@latin/LC_MESSAGES/sound-juicer.mo
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index c2d1ae4cebd..cfcb5bd9509 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2009/12/09 19:05:28 drochner Exp $
+$NetBSD: distinfo,v 1.10 2010/05/18 20:03:04 drochner Exp $
 
-SHA1 (sound-juicer-2.28.1.tar.gz) = b4dcaf2a1b992ea55a06a878bed2839fc37b550c
-RMD160 (sound-juicer-2.28.1.tar.gz) = 306104cd52ba299439646f81469055ef8872caca
-Size (sound-juicer-2.28.1.tar.gz) = 2571375 bytes
-SHA1 (patch-aa) = a0e7df8572cd9fd7851d2f4722b15144a2bbc405
-SHA1 (patch-ab) = 523296c20f9193c32fbc31a120b8fb90875b6cf6
-SHA1 (patch-ac) = c0829a2522a2b4519b3cd69a1d461e3a97527b0b
+SHA1 (sound-juicer-2.28.2.tar.gz) = 686d251a1cee27e9bb4d74f1b070409c3f09eba5
+RMD160 (sound-juicer-2.28.2.tar.gz) = 6479256a91d46b7470658e467cf1c784ba37d511
+Size (sound-juicer-2.28.2.tar.gz) = 2594964 bytes
+SHA1 (patch-aa) = 6ebf792610b37c8a9c893205a56088c450065208
+SHA1 (patch-ac) = a84f8723708ac79d8dbacbac9c3745511eddcf4b
 SHA1 (patch-ad) = 6a908c4ed4aa8ca4890a9e0c445cb3f94ec6bb94
+SHA1 (patch-ae) = a0363fa03752f7d1c1d46b232ae3d4d08bd7b0a1
diff --git a/audio/sound-juicer/patches/patch-aa b/audio/sound-juicer/patches/patch-aa
index 5c9483d89ec..371618a76ee 100644
--- a/audio/sound-juicer/patches/patch-aa
+++ b/audio/sound-juicer/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/10/28 18:40:32 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2010/05/18 20:03:04 drochner Exp $
 
---- configure.orig	2009-09-22 21:21:31.000000000 +0200
+--- configure.orig	2010-03-30 17:14:06.000000000 +0000
 +++ configure
-@@ -16899,7 +16899,7 @@ fi
+@@ -19320,7 +19320,7 @@ fi
  
  # Find the GStreamer elements we use, and warn if they are not present.
  
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 2009/10/28 18:40:32 drochner Exp $
 +  if test "x$GST_INSPECT" = "x"; then
      # Extract the first word of "gst-inspect-0.10", so it can be a program name with args.
  set dummy gst-inspect-0.10; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -16955,7 +16955,7 @@ $as_echo "$as_me: WARNING: The 'vorbisen
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -19376,7 +19376,7 @@ $as_echo "$as_me: WARNING: The 'vorbisen
    fi
  
  
@@ -19,8 +19,8 @@ $NetBSD: patch-aa,v 1.3 2009/10/28 18:40:32 drochner Exp $
 +  if test "x$GST_INSPECT" = "x"; then
      # Extract the first word of "gst-inspect-0.10", so it can be a program name with args.
  set dummy gst-inspect-0.10; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -17011,7 +17011,7 @@ $as_echo "$as_me: WARNING: The 'flacenc'
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -19432,7 +19432,7 @@ $as_echo "$as_me: WARNING: The 'flacenc'
    fi
  
  
@@ -28,8 +28,8 @@ $NetBSD: patch-aa,v 1.3 2009/10/28 18:40:32 drochner Exp $
 +  if test "x$GST_INSPECT" = "x"; then
      # Extract the first word of "gst-inspect-0.10", so it can be a program name with args.
  set dummy gst-inspect-0.10; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -17067,7 +17067,7 @@ $as_echo "$as_me: WARNING: The 'wavenc' 
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -19488,7 +19488,7 @@ $as_echo "$as_me: WARNING: The 'wavenc' 
    fi
  
  
@@ -37,4 +37,4 @@ $NetBSD: patch-aa,v 1.3 2009/10/28 18:40:32 drochner Exp $
 +  if test "x$GST_INSPECT" = "x"; then
      # Extract the first word of "gst-inspect-0.10", so it can be a program name with args.
  set dummy gst-inspect-0.10; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/audio/sound-juicer/patches/patch-ab b/audio/sound-juicer/patches/patch-ab
deleted file mode 100644
index d4b67b2f003..00000000000
--- a/audio/sound-juicer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);
diff --git a/audio/sound-juicer/patches/patch-ac b/audio/sound-juicer/patches/patch-ac
index f0624137788..c20d82dd405 100644
--- a/audio/sound-juicer/patches/patch-ac
+++ b/audio/sound-juicer/patches/patch-ac
@@ -1,8 +1,157 @@
-$NetBSD: patch-ac,v 1.1 2009/08/10 10:00:19 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/05/18 20:03:04 drochner Exp $
 
---- src/sj-main.c.orig	2009-02-24 13:05:50.000000000 +0100
+--- src/sj-main.c.orig	2010-03-30 14:29:55.000000000 +0000
 +++ src/sj-main.c
-@@ -1416,7 +1416,8 @@ void on_artist_edit_changed(GtkEditable 
+@@ -680,11 +680,11 @@ AlbumDetails* multiple_album_dialog(GLis
+  */
+ static void baseuri_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_BASEURI) == 0);
++  g_assert (!entry || strcmp (entry->key, GCONF_BASEURI) == 0);
+   if (base_uri) {
+     g_object_unref (base_uri);
+   }
+-  if (entry->value == NULL) {
++  if (!entry || entry->value == NULL) {
+     base_uri = sj_get_default_music_directory ();
+   } else {
+     base_uri = g_file_new_for_uri (gconf_value_get_string (entry->value));
+@@ -697,8 +697,8 @@ static void baseuri_changed_cb (GConfCli
+  */
+ static void path_pattern_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
++  if (!entry || entry->value == NULL) {
+     /* TODO: this value and the value in sj-prefs need to be in one place */
+     path_pattern = g_strdup ("%aa/%at");
+   } else {
+@@ -712,8 +712,8 @@ static void path_pattern_changed_cb (GCo
+  */
+ static void file_pattern_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
++  if (!entry || entry->value == NULL) {
+     /* TODO: this value and the value in sj-prefs need to be in one place */
+     file_pattern = g_strdup ("%tN-%tt");
+   } else {
+@@ -727,8 +727,8 @@ static void file_pattern_changed_cb (GCo
+  */
+ static void paranoia_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_PARANOIA) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_PARANOIA) == 0);
++  if (!entry || entry->value == NULL) {
+     sj_extractor_set_paranoia (extractor, DEFAULT_PARANOIA);
+   } else {
+     int value = gconf_value_get_int (entry->value);
+@@ -743,8 +743,8 @@ static void paranoia_changed_cb (GConfCl
+  */
+ static void strip_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_STRIP) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_STRIP) == 0);
++  if (!entry || entry->value == NULL) {
+     strip_chars = FALSE;
+   } else {
+     strip_chars = gconf_value_get_bool (entry->value);
+@@ -756,8 +756,8 @@ static void strip_changed_cb (GConfClien
+  */
+ static void eject_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_EJECT) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_EJECT) == 0);
++  if (!entry || entry->value == NULL) {
+     eject_finished = FALSE;
+   } else {
+     eject_finished = gconf_value_get_bool (entry->value);
+@@ -769,8 +769,8 @@ static void eject_changed_cb (GConfClien
+  */
+ static void open_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_OPEN) == 0);
+-  if (entry->value == NULL) {
++  g_assert (!entry || strcmp (entry->key, GCONF_OPEN) == 0);
++  if (!entry || entry->value == NULL) {
+     open_finished = FALSE;
+   } else {
+     open_finished = gconf_value_get_bool (entry->value);
+@@ -782,10 +782,10 @@ static void open_changed_cb (GConfClient
+  */
+ static void audio_volume_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_AUDIO_VOLUME) == 0);
++  g_assert (!entry || strcmp (entry->key, GCONF_AUDIO_VOLUME) == 0);
+ 
+   GtkWidget *volb = glade_xml_get_widget (glade, "volume_button");
+-  if (entry->value == NULL) {
++  if (!entry || entry->value == NULL) {
+     gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), 1.0);
+   } else {
+     gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), gconf_value_get_float (entry->value));
+@@ -1107,9 +1107,9 @@ static void device_changed_cb (GConfClie
+ {
+   const char *device;
+   gboolean ignore_no_media = GPOINTER_TO_INT (user_data);
+-  g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
++  g_assert (!entry || strcmp (entry->key, GCONF_DEVICE) == 0);
+ 
+-  if (entry->value == NULL || !cd_drive_exists (gconf_value_get_string (entry->value))) {
++  if (!entry || entry->value == NULL || !cd_drive_exists (gconf_value_get_string (entry->value))) {
+     device = prefs_get_default_device();
+     if (device == NULL) {
+ #ifndef IGNORE_MISSING_CD
+@@ -1137,8 +1137,8 @@ static void profile_changed_cb (GConfCli
+ {
+   GMAudioProfile *profile;
+ 
+-  g_assert (strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
+-  if (!entry->value) return;
++  g_assert (!entry || strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
++  if (!entry || !entry->value) return;
+   profile = gm_audio_profile_lookup (gconf_value_get_string (entry->value));
+   if (profile != NULL)
+     g_object_set (extractor, "profile", profile, NULL);
+@@ -1190,8 +1190,8 @@ http_proxy_setup (GConfClient *client)
+  */
+ static void http_proxy_enable_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY_ENABLE) == 0);
+-  if (entry->value == NULL) return;
++  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY_ENABLE) == 0);
++  if (!entry || entry->value == NULL) return;
+   http_proxy_setup (client);
+ }
+ 
+@@ -1200,8 +1200,8 @@ static void http_proxy_enable_changed_cb
+  */
+ static void http_proxy_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY) == 0);
+-  if (entry->value == NULL) return;
++  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY) == 0);
++  if (!entry || entry->value == NULL) return;
+   http_proxy_setup (client);
+ }
+ 
+@@ -1210,8 +1210,8 @@ static void http_proxy_changed_cb (GConf
+  */
+ static void http_proxy_port_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY_PORT) == 0);
+-  if (entry->value == NULL) return;
++  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY_PORT) == 0);
++  if (!entry || entry->value == NULL) return;
+   http_proxy_setup (client);
+ }
+ 
+@@ -1414,7 +1414,8 @@ void on_artist_edit_changed(GtkEditable 
  
    if (current_album->artist) {
      former_album_artist = current_album->artist;
diff --git a/audio/sound-juicer/patches/patch-ae b/audio/sound-juicer/patches/patch-ae
new file mode 100644
index 00000000000..26271870e46
--- /dev/null
+++ b/audio/sound-juicer/patches/patch-ae
@@ -0,0 +1,76 @@
+$NetBSD: patch-ae,v 1.1 2010/05/18 20:03:04 drochner Exp $
+
+--- src/sj-prefs.c.orig	2010-04-13 18:06:56.000000000 +0000
++++ src/sj-prefs.c
+@@ -171,8 +171,8 @@ void prefs_edit_profile_clicked (GtkButt
+ static void audio_profile_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+   const char *value;
+-  g_return_if_fail (strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
+-  if (!entry->value) return;
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
++  if (!entry || !entry->value) return;
+   value = gconf_value_get_string (entry->value);
+   
+   /* If the value is empty, unset the combo. Otherwise try and set it. */
+@@ -193,10 +193,10 @@ static void baseuri_changed_cb (GConfCli
+    * into sj-utils?
+    */
+   const char* base_uri, *current_uri;
+-  g_return_if_fail (strcmp (entry->key, GCONF_BASEURI) == 0);
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_BASEURI) == 0);
+ 
+   base_uri = NULL;
+-  if (entry->value != NULL)
++  if (entry && entry->value != NULL)
+     base_uri = gconf_value_get_string (entry->value);
+ 
+   if (base_uri == NULL || base_uri[0] == '\0') {
+@@ -288,9 +288,9 @@ static void path_pattern_changed_cb (GCo
+ {
+   char *value;
+   int i = 0;
+-  g_return_if_fail (strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
+ 
+-  if (entry->value == NULL) {
++  if (!entry || entry->value == NULL) {
+     value = g_strdup (path_patterns[0].pattern);
+   } else if (entry->value->type == GCONF_VALUE_STRING) {
+     value = g_strdup (gconf_value_get_string (entry->value));
+@@ -309,9 +309,9 @@ static void file_pattern_changed_cb (GCo
+   char *value;
+   int i = 0;
+   
+-  g_return_if_fail (strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
+   
+-  if (entry->value == NULL) {
++  if (!entry || entry->value == NULL) {
+     value = g_strdup (file_patterns[0].pattern);
+   } else if (entry->value->type == GCONF_VALUE_STRING) {
+     value = g_strdup (gconf_value_get_string (entry->value));
+@@ -330,9 +330,9 @@ static void file_pattern_changed_cb (GCo
+  */
+ static void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+ {
+-  g_return_if_fail (strcmp (entry->key, GCONF_DEVICE) == 0);
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_DEVICE) == 0);
+ 
+-  if (entry->value == NULL)
++  if (!entry || entry->value == NULL)
+     return;
+ 
+   if (entry->value->type == GCONF_VALUE_STRING) {
+@@ -363,9 +363,9 @@ static void strip_changed_cb (GConfClien
+   /* NOTE that strip_changed_cb in sj-main.c will also be called, and will also update
+      the global value strip_chars - but which function will get called first?
+      Make sure strip_chars is up to date BEFORE calling pattern_label_update */
+-  g_return_if_fail (strcmp (entry->key, GCONF_STRIP) == 0);
++  g_return_if_fail (!entry || strcmp (entry->key, GCONF_STRIP) == 0);
+ 
+-  if (entry->value == NULL) {
++  if (!entry || entry->value == NULL) {
+     strip_chars = FALSE;
+   } else {
+     strip_chars = gconf_value_get_bool (entry->value);