update to 2.28.1

This switches to the gnome-2.28 release branch.

4 files changed, 87 insertions, 50 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 2ce037cf87d..64ece966796 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: Makefile,v 1.24 2009/10/22 17:48:39 drochner Exp $
 
-DISTNAME=		gnome-media-2.26.0
-PKGREVISION=		2
+DISTNAME=		gnome-media-2.28.1
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -19,6 +18,7 @@ USE_TOOLS+=		gmake intltool msgfmt perl pkg-config xgettext
 
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
+GCONF_SCHEMAS+=	gnome-volume-control.schemas
 
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
@@ -27,11 +27,6 @@ GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnome+=		libgnome>=2.13.7
-.include "../../devel/libgnome/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.3
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff --git a/multimedia/gnome-media/PLIST b/multimedia/gnome-media/PLIST
index 48e39d6d1f5..f1196573b83 100644
--- a/multimedia/gnome-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:08:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/10/22 17:48:39 drochner Exp $
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
 bin/gnome-volume-control
-bin/gnome-volume-control-applet
 bin/gstreamer-properties
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
@@ -17,37 +16,27 @@ share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
 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/icons/hicolor/16x16/status/audio-input-microphone-high.png
-share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-low.png
-share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-share/gnome-media/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-high.png
-share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-low.png
-share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-share/gnome-media/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-high.png
-share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-low.png
-share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-share/gnome-media/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-high.png
-share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-low.png
-share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-share/gnome-media/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-share/gnome-media/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+share/gnome-media/pixmaps/chain-broken.png
+share/gnome-media/pixmaps/chain.png
 share/gnome-media/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
-share/gnome/autostart/gnome-volume-control-applet.desktop
+share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/C/legal.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/cs/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/cs/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/el/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/el/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/en_GB/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/en_GB/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
@@ -64,13 +53,46 @@ share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/zh_CN/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/zh_CN/gnome-sound-recorder.xml
+share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
+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/cs/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/cs/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/el/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/el/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/en_GB/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/en_GB/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
+share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/zh_CN/figures/gnome-volume-control_window.png
+share/gnome/help/gnome-volume-control/zh_CN/gnome-volume-control.xml
 share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
 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/cs/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/cs/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/el/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/el/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/en_GB/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/en_GB/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
@@ -81,42 +103,43 @@ share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/pt_BR/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/pt_BR/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/ru/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/ru/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/th/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/th/gstreamer-properties.xml
-share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gnome/help/gstreamer-properties/zh_CN/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
+share/gstreamer-properties/gstreamer-properties.ui
 share/gstreamer-properties/icons/gstreamer-properties.png
 share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-share/icons/hicolor/16x16/apps/gnome-volume-control.png
-share/icons/hicolor/16x16/apps/gnome-volume-control.svg
+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/22x22/apps/gnome-volume-control.png
-share/icons/hicolor/22x22/apps/gnome-volume-control.svg
 share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-share/icons/hicolor/24x24/apps/gnome-volume-control.png
 share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-share/icons/hicolor/32x32/apps/gnome-volume-control.png
-share/icons/hicolor/32x32/apps/gnome-volume-control.svg
 share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-share/icons/hicolor/48x48/apps/gnome-volume-control.png
 share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-share/icons/hicolor/scalable/apps/gnome-volume-control.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
+share/locale/ast/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/br/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
@@ -186,9 +209,12 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 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-audio-profiles/gnome-audio-profiles-C.omf
 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-cs.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-el.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-en_GB.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
@@ -197,17 +223,35 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
 share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-zh_CN.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-cs.omf
+share/omf/gnome-volume-control/gnome-volume-control-de.omf
+share/omf/gnome-volume-control/gnome-volume-control-el.omf
+share/omf/gnome-volume-control/gnome-volume-control-en_GB.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
+share/omf/gnome-volume-control/gnome-volume-control-oc.omf
+share/omf/gnome-volume-control/gnome-volume-control-ru.omf
+share/omf/gnome-volume-control/gnome-volume-control-sv.omf
+share/omf/gnome-volume-control/gnome-volume-control-zh_CN.omf
 share/omf/gstreamer-properties/gstreamer-properties-C.omf
 share/omf/gstreamer-properties/gstreamer-properties-ca.omf
+share/omf/gstreamer-properties/gstreamer-properties-cs.omf
 share/omf/gstreamer-properties/gstreamer-properties-de.omf
+share/omf/gstreamer-properties/gstreamer-properties-el.omf
 share/omf/gstreamer-properties/gstreamer-properties-en_GB.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
 share/omf/gstreamer-properties/gstreamer-properties-oc.omf
+share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
 share/omf/gstreamer-properties/gstreamer-properties-ru.omf
 share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 share/omf/gstreamer-properties/gstreamer-properties-th.omf
+share/omf/gstreamer-properties/gstreamer-properties-zh_CN.omf
 share/sounds/gnome/default/alerts/bark.ogg
 share/sounds/gnome/default/alerts/drip.ogg
 share/sounds/gnome/default/alerts/glass.ogg
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index b99d882e52f..98d3e61e5bd 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/10/22 17:48:39 drochner Exp $
 
 BUILDLINK_TREE+=	gnome-media
 
@@ -11,8 +11,6 @@ BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome-media
 
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # GNOME_MEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/gnome-media/distinfo b/multimedia/gnome-media/distinfo
index 30a8bc28dc1..2b1b562185e 100644
--- a/multimedia/gnome-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/07/26 18:38:14 drochner Exp $
+$NetBSD: distinfo,v 1.10 2009/10/22 17:48:39 drochner Exp $
 
-SHA1 (gnome-media-2.26.0.tar.bz2) = 23ec588fdf5df3eef542278952fe78ed032d354a
-RMD160 (gnome-media-2.26.0.tar.bz2) = 0720cf0394148d8dc3cf6423a8b817a70f1486ed
-Size (gnome-media-2.26.0.tar.bz2) = 2662523 bytes
+SHA1 (gnome-media-2.28.1.tar.bz2) = a6d096733f420bd5153a6cbe23514748434db44d
+RMD160 (gnome-media-2.28.1.tar.bz2) = 219893ebf1f21c3175cafaa9c9f77d3655c403af
+Size (gnome-media-2.28.1.tar.bz2) = 2557601 bytes
 SHA1 (patch-ac) = f5ab6343f8b80a655ea2641dcbf61296f3643b98