sound-juicer: Update to 3.24.0

Switch to gtk3 and away from gstreamer0.10.

7 files changed, 123 insertions, 441 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 1be9ccad800..039855b4622 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,51 +1,40 @@
-# $NetBSD: Makefile,v 1.106 2019/07/21 22:24:28 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.107 2019/10/18 12:34:19 nia Exp $
 
-DISTNAME=		sound-juicer-2.32.0
-PKGREVISION=		24
-CATEGORIES=		audio
-MASTER_SITES=		http://www.burtonini.com/computing/
-MASTER_SITES+=		${MASTER_SITE_GNOME:=sources/sound-juicer/2.32/}
+DISTNAME=	sound-juicer-3.24.0
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/sound-juicer/3.24/}
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.burtonini.com/computing/
-COMMENT=		CD ripping tool
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://wiki.gnome.org/Apps/SoundJuicer
+COMMENT=	CD ripping tool
+LICENSE=	gnu-gpl-v2
 
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config intltool msgfmt msgmerge xgettext
-USE_LANGUAGES=		c c++
+TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
+TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
 
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-CONFIGURE_ENV+=		GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.10"
+GNU_CONFIGURE=	yes
 
-GCONF_SCHEMAS+=	sound-juicer.schemas
+USE_TOOLS+=	pkg-config
+USE_TOOLS+=	msgfmt msgmerge xgettext
+USE_TOOLS+=	gmake
 
-DEPENDS+=	gst-plugins0.10-flac>=0.10.11:../../audio/gst-plugins0.10-flac
-DEPENDS+=	gst-plugins0.10-vorbis>=0.10.22:../../audio/gst-plugins0.10-vorbis
-DEPENDS+=	gst-plugins0.10-gio>=0.10.21:../../sysutils/gst-plugins0.10-gio
+# XXX fails without GNU msgfmt
+_TOOLS_USE_PKGSRC.msgfmt=	yes
 
 .include "../../audio/libcanberra/buildlink3.mk"
-.include "../../audio/libmusicbrainz/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.14.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-#.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../audio/libdiscid/buildlink3.mk"
+.include "../../audio/libmusicbrainz5/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../misc/libcdio-paranoia/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.15
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gnome-media/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../sysutils/brasero/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sound-juicer/PLIST b/audio/sound-juicer/PLIST
index e0910236469..6a0d4b91ccf 100644
--- a/audio/sound-juicer/PLIST
+++ b/audio/sound-juicer/PLIST
@@ -1,90 +1,97 @@
-@comment $NetBSD: PLIST,v 1.10 2018/01/01 22:29:18 rillig Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/10/18 12:34:19 nia Exp $
 bin/sound-juicer
 man/man1/sound-juicer.1
-share/applications/sound-juicer.desktop
-share/gconf/schemas/sound-juicer.schemas
-share/gnome/help/sound-juicer/C/figures/prefs.png
-share/gnome/help/sound-juicer/C/figures/startup.png
-share/gnome/help/sound-juicer/C/legal.xml
-share/gnome/help/sound-juicer/C/sound-juicer.xml
-share/gnome/help/sound-juicer/ar/figures/prefs.png
-share/gnome/help/sound-juicer/ar/figures/startup.png
-share/gnome/help/sound-juicer/ar/legal.xml
-share/gnome/help/sound-juicer/ar/sound-juicer.xml
-share/gnome/help/sound-juicer/ca/figures/prefs.png
-share/gnome/help/sound-juicer/ca/figures/startup.png
-share/gnome/help/sound-juicer/ca/legal.xml
-share/gnome/help/sound-juicer/ca/sound-juicer.xml
-share/gnome/help/sound-juicer/cs/figures/prefs.png
-share/gnome/help/sound-juicer/cs/figures/startup.png
-share/gnome/help/sound-juicer/cs/legal.xml
-share/gnome/help/sound-juicer/cs/sound-juicer.xml
-share/gnome/help/sound-juicer/de/figures/prefs.png
-share/gnome/help/sound-juicer/de/figures/startup.png
-share/gnome/help/sound-juicer/de/legal.xml
-share/gnome/help/sound-juicer/de/sound-juicer.xml
-share/gnome/help/sound-juicer/el/figures/prefs.png
-share/gnome/help/sound-juicer/el/figures/startup.png
-share/gnome/help/sound-juicer/el/legal.xml
-share/gnome/help/sound-juicer/el/sound-juicer.xml
-share/gnome/help/sound-juicer/en_GB/figures/prefs.png
-share/gnome/help/sound-juicer/en_GB/figures/startup.png
-share/gnome/help/sound-juicer/en_GB/legal.xml
-share/gnome/help/sound-juicer/en_GB/sound-juicer.xml
-share/gnome/help/sound-juicer/es/figures/prefs.png
-share/gnome/help/sound-juicer/es/figures/startup.png
-share/gnome/help/sound-juicer/es/legal.xml
-share/gnome/help/sound-juicer/es/sound-juicer.xml
-share/gnome/help/sound-juicer/eu/figures/prefs.png
-share/gnome/help/sound-juicer/eu/figures/startup.png
-share/gnome/help/sound-juicer/eu/legal.xml
-share/gnome/help/sound-juicer/eu/sound-juicer.xml
-share/gnome/help/sound-juicer/fr/figures/prefs.png
-share/gnome/help/sound-juicer/fr/figures/startup.png
-share/gnome/help/sound-juicer/fr/legal.xml
-share/gnome/help/sound-juicer/fr/sound-juicer.xml
-share/gnome/help/sound-juicer/ja/figures/prefs.png
-share/gnome/help/sound-juicer/ja/figures/startup.png
-share/gnome/help/sound-juicer/ja/legal.xml
-share/gnome/help/sound-juicer/ja/sound-juicer.xml
-share/gnome/help/sound-juicer/nl/figures/prefs.png
-share/gnome/help/sound-juicer/nl/figures/startup.png
-share/gnome/help/sound-juicer/nl/legal.xml
-share/gnome/help/sound-juicer/nl/sound-juicer.xml
-share/gnome/help/sound-juicer/oc/figures/prefs.png
-share/gnome/help/sound-juicer/oc/figures/startup.png
-share/gnome/help/sound-juicer/oc/legal.xml
-share/gnome/help/sound-juicer/oc/sound-juicer.xml
-share/gnome/help/sound-juicer/pl/figures/prefs.png
-share/gnome/help/sound-juicer/pl/figures/startup.png
-share/gnome/help/sound-juicer/pl/legal.xml
-share/gnome/help/sound-juicer/pl/sound-juicer.xml
-share/gnome/help/sound-juicer/pt_BR/figures/prefs.png
-share/gnome/help/sound-juicer/pt_BR/figures/startup.png
-share/gnome/help/sound-juicer/pt_BR/legal.xml
-share/gnome/help/sound-juicer/pt_BR/sound-juicer.xml
-share/gnome/help/sound-juicer/ru/figures/prefs.png
-share/gnome/help/sound-juicer/ru/figures/startup.png
-share/gnome/help/sound-juicer/ru/legal.xml
-share/gnome/help/sound-juicer/ru/sound-juicer.xml
-share/gnome/help/sound-juicer/sv/figures/prefs.png
-share/gnome/help/sound-juicer/sv/figures/startup.png
-share/gnome/help/sound-juicer/sv/legal.xml
-share/gnome/help/sound-juicer/sv/sound-juicer.xml
-share/gnome/help/sound-juicer/uk/figures/prefs.png
-share/gnome/help/sound-juicer/uk/figures/startup.png
-share/gnome/help/sound-juicer/uk/legal.xml
-share/gnome/help/sound-juicer/uk/sound-juicer.xml
-share/gnome/help/sound-juicer/zh_CN/figures/prefs.png
-share/gnome/help/sound-juicer/zh_CN/figures/startup.png
-share/gnome/help/sound-juicer/zh_CN/legal.xml
-share/gnome/help/sound-juicer/zh_CN/sound-juicer.xml
+share/GConf/gsettings/sound-juicer.convert
+share/appdata/org.gnome.SoundJuicer.appdata.xml
+share/applications/org.gnome.SoundJuicer.desktop
+share/dbus-1/services/org.gnome.SoundJuicer.service
+share/glib-2.0/schemas/org.gnome.sound-juicer.gschema.xml
+share/help/C/sound-juicer/figures/prefs.png
+share/help/C/sound-juicer/figures/startup.png
+share/help/C/sound-juicer/index.docbook
+share/help/C/sound-juicer/legal.xml
+share/help/ar/sound-juicer/figures/prefs.png
+share/help/ar/sound-juicer/figures/startup.png
+share/help/ar/sound-juicer/index.docbook
+share/help/ar/sound-juicer/legal.xml
+share/help/ca/sound-juicer/figures/prefs.png
+share/help/ca/sound-juicer/figures/startup.png
+share/help/ca/sound-juicer/index.docbook
+share/help/ca/sound-juicer/legal.xml
+share/help/cs/sound-juicer/figures/prefs.png
+share/help/cs/sound-juicer/figures/startup.png
+share/help/cs/sound-juicer/index.docbook
+share/help/cs/sound-juicer/legal.xml
+share/help/de/sound-juicer/figures/prefs.png
+share/help/de/sound-juicer/figures/startup.png
+share/help/de/sound-juicer/index.docbook
+share/help/de/sound-juicer/legal.xml
+share/help/el/sound-juicer/figures/prefs.png
+share/help/el/sound-juicer/figures/startup.png
+share/help/el/sound-juicer/index.docbook
+share/help/el/sound-juicer/legal.xml
+share/help/en_GB/sound-juicer/figures/prefs.png
+share/help/en_GB/sound-juicer/figures/startup.png
+share/help/en_GB/sound-juicer/index.docbook
+share/help/en_GB/sound-juicer/legal.xml
+share/help/es/sound-juicer/figures/prefs.png
+share/help/es/sound-juicer/figures/startup.png
+share/help/es/sound-juicer/index.docbook
+share/help/es/sound-juicer/legal.xml
+share/help/eu/sound-juicer/figures/prefs.png
+share/help/eu/sound-juicer/figures/startup.png
+share/help/eu/sound-juicer/index.docbook
+share/help/eu/sound-juicer/legal.xml
+share/help/fr/sound-juicer/figures/prefs.png
+share/help/fr/sound-juicer/figures/startup.png
+share/help/fr/sound-juicer/index.docbook
+share/help/fr/sound-juicer/legal.xml
+share/help/ja/sound-juicer/figures/prefs.png
+share/help/ja/sound-juicer/figures/startup.png
+share/help/ja/sound-juicer/index.docbook
+share/help/ja/sound-juicer/legal.xml
+share/help/nl/sound-juicer/figures/prefs.png
+share/help/nl/sound-juicer/figures/startup.png
+share/help/nl/sound-juicer/index.docbook
+share/help/nl/sound-juicer/legal.xml
+share/help/oc/sound-juicer/figures/prefs.png
+share/help/oc/sound-juicer/figures/startup.png
+share/help/oc/sound-juicer/index.docbook
+share/help/oc/sound-juicer/legal.xml
+share/help/pl/sound-juicer/figures/prefs.png
+share/help/pl/sound-juicer/figures/startup.png
+share/help/pl/sound-juicer/index.docbook
+share/help/pl/sound-juicer/legal.xml
+share/help/pt_BR/sound-juicer/figures/prefs.png
+share/help/pt_BR/sound-juicer/figures/startup.png
+share/help/pt_BR/sound-juicer/index.docbook
+share/help/pt_BR/sound-juicer/legal.xml
+share/help/ru/sound-juicer/figures/prefs.png
+share/help/ru/sound-juicer/figures/startup.png
+share/help/ru/sound-juicer/index.docbook
+share/help/ru/sound-juicer/legal.xml
+share/help/sl/sound-juicer/figures/prefs.png
+share/help/sl/sound-juicer/figures/startup.png
+share/help/sl/sound-juicer/index.docbook
+share/help/sl/sound-juicer/legal.xml
+share/help/sv/sound-juicer/figures/prefs.png
+share/help/sv/sound-juicer/figures/startup.png
+share/help/sv/sound-juicer/index.docbook
+share/help/sv/sound-juicer/legal.xml
+share/help/uk/sound-juicer/figures/prefs.png
+share/help/uk/sound-juicer/figures/startup.png
+share/help/uk/sound-juicer/index.docbook
+share/help/uk/sound-juicer/legal.xml
+share/help/zh_CN/sound-juicer/figures/prefs.png
+share/help/zh_CN/sound-juicer/figures/startup.png
+share/help/zh_CN/sound-juicer/index.docbook
+share/help/zh_CN/sound-juicer/legal.xml
 share/icons/hicolor/16x16/apps/sound-juicer.png
 share/icons/hicolor/22x22/apps/sound-juicer.png
 share/icons/hicolor/24x24/apps/sound-juicer.png
+share/icons/hicolor/256x256/apps/sound-juicer.png
 share/icons/hicolor/32x32/apps/sound-juicer.png
 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
@@ -95,6 +102,7 @@ share/locale/bg/LC_MESSAGES/sound-juicer.mo
 share/locale/bn/LC_MESSAGES/sound-juicer.mo
 share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
 share/locale/br/LC_MESSAGES/sound-juicer.mo
+share/locale/bs/LC_MESSAGES/sound-juicer.mo
 share/locale/ca/LC_MESSAGES/sound-juicer.mo
 share/locale/ca@valencia/LC_MESSAGES/sound-juicer.mo
 share/locale/cs/LC_MESSAGES/sound-juicer.mo
@@ -106,6 +114,7 @@ share/locale/el/LC_MESSAGES/sound-juicer.mo
 share/locale/en@shaw/LC_MESSAGES/sound-juicer.mo
 share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
 share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
+share/locale/eo/LC_MESSAGES/sound-juicer.mo
 share/locale/es/LC_MESSAGES/sound-juicer.mo
 share/locale/et/LC_MESSAGES/sound-juicer.mo
 share/locale/eu/LC_MESSAGES/sound-juicer.mo
@@ -165,23 +174,4 @@ share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
-share/omf/sound-juicer/sound-juicer-C.omf
-share/omf/sound-juicer/sound-juicer-ar.omf
-share/omf/sound-juicer/sound-juicer-ca.omf
-share/omf/sound-juicer/sound-juicer-cs.omf
-share/omf/sound-juicer/sound-juicer-de.omf
-share/omf/sound-juicer/sound-juicer-el.omf
-share/omf/sound-juicer/sound-juicer-en_GB.omf
-share/omf/sound-juicer/sound-juicer-es.omf
-share/omf/sound-juicer/sound-juicer-eu.omf
-share/omf/sound-juicer/sound-juicer-fr.omf
-share/omf/sound-juicer/sound-juicer-ja.omf
-share/omf/sound-juicer/sound-juicer-nl.omf
-share/omf/sound-juicer/sound-juicer-oc.omf
-share/omf/sound-juicer/sound-juicer-pl.omf
-share/omf/sound-juicer/sound-juicer-pt_BR.omf
-share/omf/sound-juicer/sound-juicer-ru.omf
-share/omf/sound-juicer/sound-juicer-sv.omf
-share/omf/sound-juicer/sound-juicer-uk.omf
-share/omf/sound-juicer/sound-juicer-zh_CN.omf
-share/sound-juicer/sound-juicer.ui
+share/sound-juicer/rhythmbox.gep
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index e8ddad44910..303d2c726b6 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 01:12:51 agc Exp $
+$NetBSD: distinfo,v 1.15 2019/10/18 12:34:19 nia Exp $
 
-SHA1 (sound-juicer-2.32.0.tar.gz) = db8494570298bd3f8b85902271b6d4caf580316c
-RMD160 (sound-juicer-2.32.0.tar.gz) = d040669ae902390fb1c6ad03212dc414f1710da2
-SHA512 (sound-juicer-2.32.0.tar.gz) = 29637c2c258c799cc6a87a12578de159076e808e395f4485a4f78282649d2f00784a4599dc9ffd56460a14756ec09a7e88140ab968f65d64f1e541a6bf8e9c40
-Size (sound-juicer-2.32.0.tar.gz) = 2628352 bytes
-SHA1 (patch-aa) = 449c22730d83a624247c96406ffb0272d73cf3e9
-SHA1 (patch-ac) = 8e5a52b48d2479f7018922d61094f30bf137da46
-SHA1 (patch-ad) = 6a908c4ed4aa8ca4890a9e0c445cb3f94ec6bb94
-SHA1 (patch-ae) = a0363fa03752f7d1c1d46b232ae3d4d08bd7b0a1
+SHA1 (sound-juicer-3.24.0.tar.xz) = 32664b83fd1efbe5c424368c495e264c3bba1fa8
+RMD160 (sound-juicer-3.24.0.tar.xz) = 02f029c9cc2977ef3b0fc2a1c37ac53c3b205429
+SHA512 (sound-juicer-3.24.0.tar.xz) = 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
+Size (sound-juicer-3.24.0.tar.xz) = 1019588 bytes
diff --git a/audio/sound-juicer/patches/patch-aa b/audio/sound-juicer/patches/patch-aa
deleted file mode 100644
index 5d53c26a2aa..00000000000
--- a/audio/sound-juicer/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2015/08/25 07:13:03 richard Exp $
-
---- configure.orig	2010-09-28 09:56:08.000000000 +0000
-+++ configure
-@@ -16949,7 +16949,7 @@ fi
- 
- # Find the GStreamer elements we use, and warn if they are not present.
- 
--  if test "x$GST_INSPECT" == "x"; then
-+  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
-@@ -17005,7 +17005,7 @@ $as_echo "$as_me: WARNING: The 'vorbisen
-   fi
- 
- 
--  if test "x$GST_INSPECT" == "x"; then
-+  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
-@@ -17061,7 +17061,7 @@ $as_echo "$as_me: WARNING: The 'flacenc'
-   fi
- 
- 
--  if test "x$GST_INSPECT" == "x"; then
-+  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
-@@ -17117,7 +17117,7 @@ $as_echo "$as_me: WARNING: The 'wavenc'
-   fi
- 
- 
--  if test "x$GST_INSPECT" == "x"; then
-+  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
diff --git a/audio/sound-juicer/patches/patch-ac b/audio/sound-juicer/patches/patch-ac
deleted file mode 100644
index 4794e59568a..00000000000
--- a/audio/sound-juicer/patches/patch-ac
+++ /dev/null
@@ -1,163 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2015/08/25 07:13:03 richard Exp $
-
---- src/sj-main.c.orig	2010-08-04 13:35:35.000000000 +0000
-+++ src/sj-main.c
-@@ -673,11 +673,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));
-@@ -690,8 +690,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 {
-@@ -705,8 +705,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 {
-@@ -720,8 +720,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);
-@@ -736,8 +736,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);
-@@ -749,8 +749,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);
-@@ -762,8 +762,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);
-@@ -775,10 +775,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 = GET_WIDGET ("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));
-@@ -1099,9 +1099,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
-@@ -1128,8 +1128,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);
-@@ -1181,8 +1181,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);
- }
- 
-@@ -1191,8 +1191,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);
- }
- 
-@@ -1201,8 +1201,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);
- }
- 
-@@ -1404,7 +1404,8 @@ G_MODULE_EXPORT void on_artist_edit_chan
- 
-   if (current_album->artist) {
-     former_album_artist = current_album->artist;
--  }
-+  } else
-+    former_album_artist = g_strdup("");
-   current_album->artist = gtk_editable_get_chars (widget, 0, -1); /* get all the characters */
- 
-   if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (track_store), &iter)) {
diff --git a/audio/sound-juicer/patches/patch-ad b/audio/sound-juicer/patches/patch-ad
deleted file mode 100644
index adb816df48c..00000000000
--- a/audio/sound-juicer/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/08/10 10:00:19 drochner Exp $
-
---- src/sj-extracting.c.orig	2009-02-10 22:55:51.000000000 +0100
-+++ src/sj-extracting.c
-@@ -855,6 +855,9 @@ sanitize_path (const char* str, const ch
-   gchar *res = NULL;
-   gchar *s;
- 
-+  if (!str)
-+    return NULL;
-+
-   /* Skip leading periods, otherwise files disappear... */
-   while (*str == '.')
-     str++;
diff --git a/audio/sound-juicer/patches/patch-ae b/audio/sound-juicer/patches/patch-ae
deleted file mode 100644
index 26271870e46..00000000000
--- a/audio/sound-juicer/patches/patch-ae
+++ /dev/null
@@ -1,76 +0,0 @@
-$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);