3 files changed, 81 insertions, 64 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 74e21e8ff561..1f247fe929b3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.123 2008/09/24 03:17:39 mezz Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.130 2009/03/17 22:20:16 kwm Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.24.0.1
+PORTVERSION=	2.26.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,6 +15,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
+LIB_DEPENDS=	pulse.0:${PORTSDIR}/audio/pulseaudio \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -23,15 +27,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop nautiluscdburner
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
 USE_GSTREAMER=	cdparanoia esound gconf good
 CONFIGURE_ARGS=	--enable-ipv6
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
-		gnome-sound-recorder.schemas \
-		gnome-volume-control.schemas
+		gnome-sound-recorder.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 14cdbe58006a..d98b2233165f 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.24.0.1.tar.bz2) = d0a9b0784872cecd09038aceea22e16f
-SHA256 (gnome2/gnome-media-2.24.0.1.tar.bz2) = bfa79a9bea5ba6f73a6b0a232917bc7eefbed69819e42d0b09372b0c7ed3e853
-SIZE (gnome2/gnome-media-2.24.0.1.tar.bz2) = 2344888
+MD5 (gnome2/gnome-media-2.26.0.tar.bz2) = 3d519bc7d812aed8f6e4288b6d3cdf26
+SHA256 (gnome2/gnome-media-2.26.0.tar.bz2) = 39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
+SIZE (gnome2/gnome-media-2.26.0.tar.bz2) = 2662523
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 9f18eb4a6317..8905eac3fc05 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,7 +1,9 @@
 bin/gnome-audio-profiles-properties
 bin/gnome-sound-recorder
 bin/gnome-volume-control
+bin/gnome-volume-control-applet
 bin/gstreamer-properties
+etc/xdg/autostart/gnome-volume-control-applet.desktop
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
 include/gnome-media/profiles/audio-profile.h
@@ -19,8 +21,27 @@ share/applications/gnome-sound-recorder.desktop
 share/applications/gnome-volume-control.desktop
 share/applications/gstreamer-properties.desktop
 %%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%DATADIR%%/pixmaps/chain-broken.png
-%%DATADIR%%/pixmaps/chain.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%DATADIR%%/sounds/gnome-sounds-default.xml
 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
@@ -29,6 +50,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
@@ -43,25 +66,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
@@ -69,6 +73,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
@@ -81,20 +87,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
@@ -137,6 +149,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
@@ -178,6 +191,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
@@ -185,30 +199,31 @@ 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
 @dirrm share/omf/gstreamer-properties
-@dirrm share/omf/gnome-volume-control
 @dirrm share/omf/gnome-sound-recorder
 @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
@@ -221,6 +236,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
@@ -228,25 +245,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
@@ -261,6 +259,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
@@ -270,7 +270,19 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrm share/gnome/help/gnome-sound-recorder
 @dirrm share/gnome-sound-recorder/ui
 @dirrm share/gnome-sound-recorder
-@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
@@ -294,6 +306,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES