Update gnome-media to 2.26.0.

==============
Version 2.26.0
==============

- gnome-volume-control
  + Fix tooltip when dB changes, bug #575093 (Bastien)
  + Update the volume immediately, bug #564313 (Bastien)
  + Added --debug (Matthias Clasen)
- gst-mixer (gstreamer based g-v-c)
  + Add new icons mappings, bug #571084 (Garrett D'Amore)
  + Make options update when changed, bug #571083 (Garrett D'Amore)
  + Make pagenum logic simpler, bug #571068 (Garrett D'Amore)
  + Remove page name duplication, bug #570979 (Garrett D'Amore)
  + Add sound theme page (Brian Cameron)
- Updated translations:
  + Abhishek Jacob (ml)
  + Adi Roiban (ro)
  + Ankit Patel (gu)
  + Ask Hjorth Larsen (da)
  + Changwoo Ryu (ko)
  + Claude Paroz (fr)
  + Daniel Nylander (sv)
  + David Lodge (en_GB)
  + Duarte Loreto (pt)
  + Fotis Tsamis (el)
  + Gabor Kelemen (hu)
  + Gil 'Dolfin' Osher (he)
  + Hendrik Richter (de)
  + I. Felix (ta)
  + Ilkka Tuohela (fi)
  + Iñaki Larrañaga Murgoitio (eu)
  + Jonh Wendell (pt_BR)
  + Jordi Mallach (ca)
  + Jorge González (es)
  + Kjartan Maraas (nb)
  + Krishna Babu K (te)
  + Manoj Kumar Giri (or)
  + Milo Casagrande (it)
  + Petr Kovar (cs)
  + Rajesh Ranjan (hi)
  + Rajesh Ranjan (mai)
  + Runa Bhattacharjee (bn_IN)
  + Sandeep Shedmake (mr)
  + Suso Baleato (gl)
  + Takeshi AIHANA (ja)
  + Theppitak Karoonboonyanan (th)
  + Tomasz Dominikowski (pl)
  + Wouter Bolsterlee (nl)
  + Žygimantas Beručka (lt)

===============
Version 2.25.92
===============

- General:
  + Add libunique dependency, instead of direct dbus-glib dependency (Bastien)
  + Detect pulseaudio 0.9.15 to use some new API when it's there (Bastien)
  + Fix automagic dep on pulseaudio (Mart Raudsepp)
- gnome-volume-control
  + Install the application icon in the global icon theme (Bastien)
  + Fix icon name in desktop file (Luca Ferretti)
  + Exit when Esc is pressed (Bastien)
  + Use the new GTK+ scale marks for the balance widget (Luca Ferretti)
  + Make sure the balance bar stays Left to Right, so that the Left balance is
    really on the left (Bastien)
  + Stop the microphone showing up in the applet when the capplet is running
    (Bastien)
  + Show recording applications in addition to playback applications, use the
    microphone icon for those applications (Bastien)
  + Install the applet's desktop file in the xdg autostart directory (Bastien)
  + Present the application when it's already running (with libunique)
    (Bastien)
  + When PulseAudio isn't running, or takes a long time to connect to, popup a
    dialogue telling the user what we're waiting for, and the ability to cancel
    (Bastien)
  + De-sensitivise the balance bar if the output doesn't support balacing
    (Bastien)
  + Add "is-amplified" property. In this mode, the volume can be set above 100%
    (150% tops actually) for inputs that support giving us the dB information
    (Bastien)
  + Don't filter out sinks with PA_SINK_HARDWARE, otherwise things like network
    sinks (Airport Express?) won't show up in the volume capplet (Bastien)
  + Don't filter out non-hardware sources, only ignore sink monitors (Bastien)
  + Fix the dock showing up off-screen when the applet is at the bottom of the
    screen and is popped up for the first time (Yanko Kaneti)
  + Make the balance bar instant-apply (Bastien)
  + Update sensitivity of input feedback checkbox (Matthias Clasen)
  + Code cleanup (Bastien)
- Updated translations:
  + Alaksandar Navicki (be@latin)
  + Jordi Mallach (ca)
  + Ask Hjorth Larsen (da)
  + Christian Kirbach (de)
  + David Lodge (en_GB)
  + Jorge González (es)
  + Ivar Smolin (et)
  + Iñaki Larrañaga Murgoitio (eu)
  + Ilkka Tuohela (fi)
  + Ignacio Casal Quinteiro (gl)
  + Sweta Kothari (gu)
  + Gabor Kelemen (hu)
  + Milo Casagrande (it)
  + Takeshi AIHANA (ja)
  + Shankar Prasad (kn)
  + Changwoo Ryu (ko)
  + (LINGUAS)
  + Raivis Dejus (lv)
  + Jovan Naumovski (mk)
  + Sandeep Shedmake (mr)
  + Kjartan Maraas (nb)
  + Wouter Bolsterlee (nl)
  + Tomasz Dominikowski (pl)
  + Djavan Fagundes (pt_BR)
  + Duarte Loreto (pt)
  + Adi Roiban (ro)
  + Daniel Nylander (sv)
  + Theppitak Karoonboonyanan (th)
  + Clytie Siddall (vi)
  + Chao-Hsiung Liao (zh_HK)
  + Chao-Hsiung Liao (zh_TW)

===============
Version 2.25.5
===============
- Add desktop files and icons for gnome-volume-control
- Add a new sound theme
- Fix some of the resizing on startup in the volume control
- Simplify the sound theme selection
- Fix a few positioning problems in the volume applet
- Add a mute toggle item in the volume applet
- Make the volume slider instantaneous
- Fix "no applications" message when there are applications
- Fix the volume applet not showing up in some cases
- Add a close button to the sound capplet
- Hide sound events from the applications tab
- Fix scrolling with the mouse wheel going in the wrong direction

===============
Version 2.25.1
===============

- Add new volume control applet and dialog (William Jon McCann)
- Bug #552748 - General cleanups (Kjartan Maraas)
- Bug #552420 - Make speex voice encoder mono (Marc-André Lureau)
- Bug #543306 - Use .ogg extension (Marc-André Lureau)
- Bug #498617 - Use LC profile by default for AAC (m4a)
- Bug #557043 - Add MP2 profile
- Bug #564060 - Use 32kHz for Speex
- Bug #553383 - fix "can't delete profile with '#' in its name"
- Bug #563573 - clean up GLib and GTK+ includes. (Luis Menina)

5 files changed, 133 insertions, 74 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index dd652e50bad..fec4f9d26e6 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/10/16 17:36:38 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2009/03/16 22:09:28 jmcneill Exp $
 
-DISTNAME=		gnome-media-2.24.0.1
+DISTNAME=		gnome-media-2.26.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -11,7 +11,7 @@ COMMENT=		Set of audio/multimedia applications for GNOME2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		gst-plugins0.10-esound>=0.10.0:../../audio/gst-plugins0.10-esound
+DEPENDS+=		gst-plugins0.10-pulse>=0.10.0:../../audio/gst-plugins0.10-pulse
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
@@ -20,7 +20,6 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config xgettext
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ENV+=		XGETTEXT=${TOOLS_PATH.xgettext:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,16 +39,24 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
-GCONF_SCHEMAS+=	gnome-volume-control.schemas
 
-BUILDLINK_API_DEPENDS.esound+=			esound>=0.2.23
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/*/doc/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.3
 BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.3
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libgnome+=		libgnome>=2.13.7
 BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 
-.include "../../audio/esound/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -63,12 +70,12 @@ BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
+.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome-media/PLIST b/multimedia/gnome-media/PLIST
index 8ba687b0fb8..c306ceccdbd 100644
--- a/multimedia/gnome-media/PLIST
+++ b/multimedia/gnome-media/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2008/10/16 17:36:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/03/16 22:09:28 jmcneill 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
@@ -16,11 +17,30 @@ 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/pixmaps/chain-broken.png
-share/gnome-media/pixmaps/chain.png
+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/sounds/gnome-sounds-default.xml
 share/gnome-sound-recorder/ui/ui.xml
+share/gnome/autostart/gnome-volume-control-applet.desktop
 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
@@ -28,6 +48,8 @@ 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/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
 share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
@@ -42,25 +64,6 @@ 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-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/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
-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/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
@@ -68,6 +71,8 @@ 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/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
 share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
@@ -80,20 +85,26 @@ 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/gstreamer-properties/icons/gstreamer-properties.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/16x16/apps/gnome-volume-control.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.svg
 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
@@ -136,6 +147,7 @@ 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
 share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mg/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
@@ -177,6 +189,7 @@ 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-en_GB.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
@@ -184,39 +197,47 @@ 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-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
-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/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-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-ru.omf
 share/omf/gstreamer-properties/gstreamer-properties-sv.omf
+share/omf/gstreamer-properties/gstreamer-properties-th.omf
+share/sounds/gnome/default/alerts/bark.ogg
+share/sounds/gnome/default/alerts/drip.ogg
+share/sounds/gnome/default/alerts/glass.ogg
+share/sounds/gnome/default/alerts/sonar.ogg
+@dirrm share/sounds/gnome/default/alerts
+@dirrm share/sounds/gnome/default
+@dirrm share/sounds/gnome
+@comment in xdg-dirs: @dirrm share/sounds
 @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 hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
 @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/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gstreamer-properties/icons
 @dirrm share/gstreamer-properties/glade
 @dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/th/figures
+@dirrm share/gnome/help/gstreamer-properties/th
 @dirrm share/gnome/help/gstreamer-properties/sv/figures
 @dirrm share/gnome/help/gstreamer-properties/sv
 @dirrm share/gnome/help/gstreamer-properties/ru/figures
@@ -229,6 +250,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/en_GB/figures
+@dirrm share/gnome/help/gstreamer-properties/en_GB
 @dirrm share/gnome/help/gstreamer-properties/de/figures
 @dirrm share/gnome/help/gstreamer-properties/de
 @dirrm share/gnome/help/gstreamer-properties/ca/figures
@@ -236,25 +259,6 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/gnome-volume-control/sv/figures
-@dirrm share/gnome/help/gnome-volume-control/sv
-@dirrm share/gnome/help/gnome-volume-control/ru/figures
-@dirrm share/gnome/help/gnome-volume-control/ru
-@dirrm share/gnome/help/gnome-volume-control/oc/figures
-@dirrm share/gnome/help/gnome-volume-control/oc
-@dirrm share/gnome/help/gnome-volume-control/it/figures
-@dirrm share/gnome/help/gnome-volume-control/it
-@dirrm share/gnome/help/gnome-volume-control/fr/figures
-@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
-@dirrm share/gnome/help/gnome-volume-control/C
-@dirrm share/gnome/help/gnome-volume-control
 @dirrm share/gnome/help/gnome-sound-recorder/uk/figures
 @dirrm share/gnome/help/gnome-sound-recorder/uk
 @dirrm share/gnome/help/gnome-sound-recorder/sv/figures
@@ -269,6 +273,8 @@ 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/en_GB/figures
+@dirrm share/gnome/help/gnome-sound-recorder/en_GB
 @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
@@ -276,11 +282,25 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @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
+@dirrm share/gnome-media/sounds
+@dirrm share/gnome-media/icons/hicolor/scalable/status
+@dirrm share/gnome-media/icons/hicolor/scalable
+@dirrm share/gnome-media/icons/hicolor/32x32/status
+@dirrm share/gnome-media/icons/hicolor/32x32
+@dirrm share/gnome-media/icons/hicolor/24x24/status
+@dirrm share/gnome-media/icons/hicolor/24x24
+@dirrm share/gnome-media/icons/hicolor/22x22/status
+@dirrm share/gnome-media/icons/hicolor/22x22
+@dirrm share/gnome-media/icons/hicolor/16x16/status
+@dirrm share/gnome-media/icons/hicolor/16x16
+@dirrm share/gnome-media/icons/hicolor
+@dirrm share/gnome-media/icons
 @dirrm share/gnome-media/glade
 @dirrm share/gnome-media
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libglade: @dirrm lib/libglade/2.0
diff --git a/multimedia/gnome-media/distinfo b/multimedia/gnome-media/distinfo
index 27d5c3226b0..2f47e931ea1 100644
--- a/multimedia/gnome-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/10/16 17:36:38 drochner Exp $
+$NetBSD: distinfo,v 1.8 2009/03/16 22:09:28 jmcneill Exp $
 
-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 (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 (patch-aa) = 022c909690b5521a93e1ce0eab025eb4c1598181
 SHA1 (patch-ab) = 5b48beaf188f916cc9052b3c1ac2978258f73e0d
+SHA1 (patch-ac) = f5ab6343f8b80a655ea2641dcbf61296f3643b98
diff --git a/multimedia/gnome-media/files/msgfmtstrip b/multimedia/gnome-media/files/msgfmtstrip
new file mode 100644
index 00000000000..2309639b8cc
--- /dev/null
+++ b/multimedia/gnome-media/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/16 22:09:28 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}
diff --git a/multimedia/gnome-media/patches/patch-ac b/multimedia/gnome-media/patches/patch-ac
new file mode 100644
index 00000000000..e300add9128
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2009/03/16 22:09:28 jmcneill Exp $
+
+--- gnome-volume-control/data/Makefile.in.orig	2009-03-16 17:49:40.000000000 -0400
++++ gnome-volume-control/data/Makefile.in
+@@ -295,7 +295,7 @@ SUBDIRS = \
+ 	icons			\
+ 	$(NULL)
+ 
+-autostartdir = $(sysconfdir)/xdg/autostart
++autostartdir = $(PREFIX)/share/gnome/autostart
+ autostart_in_files = gnome-volume-control-applet.desktop.in
+ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+ appsdir = $(datadir)/applications