update to 2.24.0.1

This switches to the gnome-2.24 release branch.

4 files changed, 44 insertions, 118 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index bdd5a7e023f..dd652e50bad 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/10/16 17:36:38 drochner Exp $
 
-DISTNAME=		gnome-media-2.22.0
+DISTNAME=		gnome-media-2.24.0.1
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -38,7 +38,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-GCONF_SCHEMAS=		CDDB-Slave2.schemas
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
 GCONF_SCHEMAS+=	gnome-volume-control.schemas
@@ -53,7 +52,6 @@ BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/GConf-ui/buildlink3.mk"
-.include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/multimedia/gnome-media/PLIST b/multimedia/gnome-media/PLIST
index f64d1ae0ede..8ba687b0fb8 100644
--- a/multimedia/gnome-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,52 +1,33 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/15 18:45:41 drochner Exp $
-bin/cddb-slave2-properties
+@comment $NetBSD: PLIST,v 1.8 2008/10/16 17:36:38 drochner Exp $
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
-bin/vumeter
-include/cddb-slave2/cddb-slave-client.h
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
 include/gnome-media/profiles/audio-profiles-edit.h
 include/gnome-media/profiles/gnome-media-profiles.h
-lib/bonobo/servers/GNOME_Media_CDDBSlave2.server
-lib/libcddb-slave2.la
 lib/libglade/2.0/libgnome-media-profiles.la
 lib/libgnome-media-profiles.la
 lib/pkgconfig/gnome-media-profiles.pc
-libexec/CDDBSlave2
-libexec/cddb-track-editor
-share/applications/cddb-slave.desktop
 share/applications/gnome-sound-recorder.desktop
 share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
-share/applications/reclevel.desktop
-share/applications/vumeter.desktop
-share/gconf/schemas/CDDB-Slave2.schemas
 share/gconf/schemas/gnome-audio-profiles.schemas
 share/gconf/schemas/gnome-sound-recorder.schemas
 share/gconf/schemas/gnome-volume-control.schemas
 share/gnome-media/glade/gnome-audio-profiles.glade2
-share/gnome-media/pixmaps/3dsound.png
 share/gnome-media/pixmaps/chain-broken.png
 share/gnome-media/pixmaps/chain.png
-share/gnome-media/pixmaps/headphones.png
-share/gnome-media/pixmaps/mixer.png
-share/gnome-media/pixmaps/noplay.png
-share/gnome-media/pixmaps/norecord.png
-share/gnome-media/pixmaps/phone.png
-share/gnome-media/pixmaps/play.png
-share/gnome-media/pixmaps/record.png
-share/gnome-media/pixmaps/tone.png
-share/gnome-media/pixmaps/video.png
 share/gnome-sound-recorder/ui/ui.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
 share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
@@ -66,6 +47,8 @@ share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
 share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
 share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
@@ -83,6 +66,8 @@ share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/C/legal.xml
 share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
@@ -97,11 +82,18 @@ share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
 share/gstreamer-properties/glade/gstreamer-properties.glade
 share/gstreamer-properties/icons/gstreamer-properties.png
-share/icons/hicolor/48x48/apps/gnome-grecord.png
-share/icons/hicolor/48x48/apps/gnome-reclevel.png
-share/icons/hicolor/48x48/apps/gnome-vumeter.png
+share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
+share/icons/hicolor/16x16/devices/gvc-3d-sound.png
+share/icons/hicolor/16x16/devices/gvc-headphones.png
+share/icons/hicolor/16x16/devices/gvc-line-in.png
+share/icons/hicolor/16x16/devices/gvc-tone.png
+share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
+share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
+share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
+share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
-share/idl/GNOME_Media_CDDBSlave2.idl
+share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
@@ -139,6 +131,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
@@ -167,9 +160,10 @@ share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
@@ -182,6 +176,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
@@ -191,6 +186,7 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
 share/omf/gnome-volume-control/gnome-volume-control-C.omf
 share/omf/gnome-volume-control/gnome-volume-control-ca.omf
+share/omf/gnome-volume-control/gnome-volume-control-de.omf
 share/omf/gnome-volume-control/gnome-volume-control-es.omf
 share/omf/gnome-volume-control/gnome-volume-control-fr.omf
 share/omf/gnome-volume-control/gnome-volume-control-it.omf
@@ -199,6 +195,7 @@ share/omf/gnome-volume-control/gnome-volume-control-ru.omf
 share/omf/gnome-volume-control/gnome-volume-control-sv.omf
 share/omf/gstreamer-properties/gstreamer-properties-C.omf
 share/omf/gstreamer-properties/gstreamer-properties-ca.omf
+share/omf/gstreamer-properties/gstreamer-properties-de.omf
 share/omf/gstreamer-properties/gstreamer-properties-es.omf
 share/omf/gstreamer-properties/gstreamer-properties-fr.omf
 share/omf/gstreamer-properties/gstreamer-properties-it.omf
@@ -208,9 +205,14 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/omf/gstreamer-properties
 @dirrm share/omf/gnome-volume-control
 @dirrm share/omf/gnome-sound-recorder
-@comment in rarian: @dirrm share/omf
-@comment in ORBit2: @dirrm share/idl
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/status
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/devices
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gstreamer-properties/icons
 @dirrm share/gstreamer-properties/glade
@@ -227,6 +229,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/gnome/help/gstreamer-properties/fr
 @dirrm share/gnome/help/gstreamer-properties/es/figures
 @dirrm share/gnome/help/gstreamer-properties/es
+@dirrm share/gnome/help/gstreamer-properties/de/figures
+@dirrm share/gnome/help/gstreamer-properties/de
 @dirrm share/gnome/help/gstreamer-properties/ca/figures
 @dirrm share/gnome/help/gstreamer-properties/ca
 @dirrm share/gnome/help/gstreamer-properties/C/figures
@@ -244,6 +248,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/gnome/help/gnome-volume-control/fr
 @dirrm share/gnome/help/gnome-volume-control/es/figures
 @dirrm share/gnome/help/gnome-volume-control/es
+@dirrm share/gnome/help/gnome-volume-control/de/figures
+@dirrm share/gnome/help/gnome-volume-control/de
 @dirrm share/gnome/help/gnome-volume-control/ca/figures
 @dirrm share/gnome/help/gnome-volume-control/ca
 @dirrm share/gnome/help/gnome-volume-control/C/figures
@@ -263,12 +269,13 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/gnome/help/gnome-sound-recorder/fr
 @dirrm share/gnome/help/gnome-sound-recorder/es/figures
 @dirrm share/gnome/help/gnome-sound-recorder/es
+@dirrm share/gnome/help/gnome-sound-recorder/de/figures
+@dirrm share/gnome/help/gnome-sound-recorder/de
 @dirrm share/gnome/help/gnome-sound-recorder/ca/figures
 @dirrm share/gnome/help/gnome-sound-recorder/ca
 @dirrm share/gnome/help/gnome-sound-recorder/C/figures
 @dirrm share/gnome/help/gnome-sound-recorder/C
 @dirrm share/gnome/help/gnome-sound-recorder
-@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-sound-recorder/ui
 @dirrm share/gnome-sound-recorder
 @dirrm share/gnome-media/pixmaps
@@ -277,7 +284,5 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libglade: @dirrm lib/libglade/2.0
-@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
-@dirrm include/cddb-slave2
diff --git a/multimedia/gnome-media/distinfo b/multimedia/gnome-media/distinfo
index 6b0821521be..27d5c3226b0 100644
--- a/multimedia/gnome-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2008/04/15 18:45:41 drochner Exp $
+$NetBSD: distinfo,v 1.7 2008/10/16 17:36:38 drochner Exp $
 
-SHA1 (gnome-media-2.22.0.tar.bz2) = 9dc92fbde0dda0ef2e7028bf2b80f190b8b6b016
-RMD160 (gnome-media-2.22.0.tar.bz2) = 3e88758867df535668c29322bf27aefb2b79cd21
-Size (gnome-media-2.22.0.tar.bz2) = 2237463 bytes
+SHA1 (gnome-media-2.24.0.1.tar.bz2) = 2704b4cd13b7f776a358e517a5baf5d97455b85b
+RMD160 (gnome-media-2.24.0.1.tar.bz2) = 695f4cf9b170a381c243846749f5fad916f8bbca
+Size (gnome-media-2.24.0.1.tar.bz2) = 2344888 bytes
 SHA1 (patch-aa) = 022c909690b5521a93e1ce0eab025eb4c1598181
 SHA1 (patch-ab) = 5b48beaf188f916cc9052b3c1ac2978258f73e0d
-SHA1 (patch-ac) = 9a85ad16eb5fdda6e391d4f750e2bfd655bcdc07
diff --git a/multimedia/gnome-media/patches/patch-ac b/multimedia/gnome-media/patches/patch-ac
deleted file mode 100644
index 121b8897a61..00000000000
--- a/multimedia/gnome-media/patches/patch-ac
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/11/03 16:32:49 drochner Exp $
-
---- configure.orig	2007-09-19 12:00:40.000000000 +0200
-+++ configure
-@@ -6419,7 +6419,7 @@ else
-   enable_cddbslave=yes
- fi
- 
--if test "x$enable_cddbslave" == "xyes"; then
-+if test "x$enable_cddbslave" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
-@@ -7314,7 +7314,7 @@ else
-   enable_profiles=yes
- fi
- 
--if test "x$enable_profiles" == "xyes"; then
-+if test "x$enable_profiles" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GMP" >&5
-@@ -7535,7 +7535,7 @@ echo "$as_me: WARNING:  Grecord will be 
-   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
- fi
- 
--if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
-   PROGRAMS_GRECORD="grecord"
- 
-   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
-@@ -25100,7 +25100,7 @@ else
-   enable_vumeter=yes
- fi
- 
--if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
-+if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for VUMETER" >&5
-@@ -25220,7 +25220,7 @@ else
-   enable_gnomecd=yes
- fi
- 
--if test "x$enable_gnomecd" == "xyes"; then
-+if test "x$enable_gnomecd" = "xyes"; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GNOMECD" >&5
-@@ -25564,7 +25564,7 @@ fi
- 
- 
- 
--if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
-+if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
-   cdrom_header=""
- 
- for ac_header in linux/cdrom.h
-@@ -26392,7 +26392,7 @@ else
-   enable_gstprops=yes
- fi
- 
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
- then
-       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ"
- 
-@@ -26555,7 +26555,7 @@ else
-   enable_gstmix=yes
- fi
- 
--if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
-+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
- then
- 
- pkg_failed=no