8 files changed, 332 insertions, 34 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 4e2a669a9..3447dabec 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTVERSION=	2.5.3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.5
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 2d03add1c..5dbf19d0a 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/gnome-media-2.5.2.tar.bz2) = 8869acb4501be09966484156442f749e
+MD5 (gnome2/gnome-media-2.5.3.tar.bz2) = cb9dc255f2d1cb7056d24e0d5d257f2c
+SIZE (gnome2/gnome-media-2.5.3.tar.bz2) = 2936614
diff --git a/audio/gnome-media/files/patch-gst-mixer_gnome-volume-control.desktop.in b/audio/gnome-media/files/patch-gst-mixer_gnome-volume-control.desktop.in
deleted file mode 100644
index 535314e7d..000000000
--- a/audio/gnome-media/files/patch-gst-mixer_gnome-volume-control.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-mixer/gnome-volume-control.desktop.in.orig	Sat Feb 21 15:33:42 2004
-+++ gst-mixer/gnome-volume-control.desktop.in	Sat Feb 21 15:33:56 2004
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Volume Control
- _Comment=Adjust the volume level
--Exec=gst-mixer
-+Exec=gnome-volume-control
- Icon=gnome-mixer.png
- StartupNotify=true
- Info=Gnome Mixer
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 70f741fb5..455a876c6 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,13 +1,18 @@
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
+bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
 bin/vumeter
 etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml
@@ -23,10 +28,13 @@ etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml
 etc/gconf/schemas/CDDB-Slave2.schemas
 etc/gconf/schemas/gnome-audio-profiles.schemas
 etc/gconf/schemas/gnome-cd.schemas
+etc/gconf/schemas/gnome-sound-recorder.schemas
 include/cddb-slave2/cddb-slave-client.h
-include/gnome-media/audio-profile-edit.h
-include/gnome-media/audio-profiles-edit.h
-include/gnome-media/gnome-media-profiles.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/libcddb-slave2.a
 lib/libcddb-slave2.so
 lib/libcddb-slave2.so.0
@@ -39,6 +47,7 @@ libdata/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
 share/gnome/applications/gnome-cd.desktop
+share/gnome/applications/gnome-sound-recorder.desktop
 share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/gstreamer-properties.desktop
 share/gnome/applications/reclevel.desktop
@@ -49,6 +58,7 @@ share/gnome/gnome-media/pixmaps/mixer.png
 share/gnome/gnome-media/pixmaps/phone.png
 share/gnome/gnome-media/pixmaps/tone.png
 share/gnome/gnome-media/pixmaps/video.png
+share/gnome/gnome-sound-recorder/ui/gsr.xml
 share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
 share/gnome/gstreamer-properties/icons/gstreamer-properties.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
@@ -218,10 +228,94 @@ share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
 share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_TW/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-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/grecord/de/figures/grecord-prefs-path.png
+share/gnome/help/grecord/de/figures/grecord-prefs-play.png
+share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/de/figures/grecord.png
+share/gnome/help/grecord/de/figures/grecord_window.png
+share/gnome/help/grecord/de/grecord.xml
+share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/es/figures/grecord-prefs-path.png
+share/gnome/help/grecord/es/figures/grecord-prefs-play.png
+share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/es/figures/grecord.png
+share/gnome/help/grecord/es/figures/grecord_window.png
+share/gnome/help/grecord/es/grecord.xml
+share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/fr/figures/grecord.png
+share/gnome/help/grecord/fr/figures/grecord_window.png
+share/gnome/help/grecord/fr/grecord.xml
+share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/it/figures/grecord-prefs-path.png
+share/gnome/help/grecord/it/figures/grecord-prefs-play.png
+share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/it/figures/grecord.png
+share/gnome/help/grecord/it/figures/grecord_window.png
+share/gnome/help/grecord/it/grecord.xml
+share/gnome/help/grecord/it/legal.xml
+share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ja/figures/grecord.png
+share/gnome/help/grecord/ja/figures/grecord_window.png
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/legal.xml
+share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ko/figures/grecord.png
+share/gnome/help/grecord/ko/figures/grecord_window.png
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/sv/figures/grecord.png
+share/gnome/help/grecord/sv/figures/grecord_window.png
+share/gnome/help/grecord/sv/grecord.xml
+share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_CN/figures/grecord.png
+share/gnome/help/grecord/zh_CN/figures/grecord_window.png
+share/gnome/help/grecord/zh_CN/grecord.xml
+share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_TW/figures/grecord.png
+share/gnome/help/grecord/zh_TW/figures/grecord_window.png
+share/gnome/help/grecord/zh_TW/grecord.xml
+share/gnome/help/grecord/zh_TW/legal.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
@@ -248,6 +342,26 @@ share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-volume-control-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gstreamer-properties-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-cd.png
@@ -318,6 +432,10 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
 share/gnome/pixmaps/gnome-cd/track.png
+share/gnome/pixmaps/gnome-grecord.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/gnome/pixmaps/gnome-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -345,6 +463,7 @@ share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
@@ -371,12 +490,14 @@ share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sr@Latn/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/th/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
 @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes/media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@@ -386,9 +507,31 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @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/grecord/zh_TW/figures
+@dirrm share/gnome/help/grecord/zh_TW
+@dirrm share/gnome/help/grecord/zh_CN/figures
+@dirrm share/gnome/help/grecord/zh_CN
+@dirrm share/gnome/help/grecord/sv/figures
+@dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/grecord/ko/figures
+@dirrm share/gnome/help/grecord/ko
+@dirrm share/gnome/help/grecord/ja/figures
+@dirrm share/gnome/help/grecord/ja
+@dirrm share/gnome/help/grecord/it/figures
+@dirrm share/gnome/help/grecord/it
+@dirrm share/gnome/help/grecord/fr/figures
+@dirrm share/gnome/help/grecord/fr
+@dirrm share/gnome/help/grecord/es/figures
+@dirrm share/gnome/help/grecord/es
+@dirrm share/gnome/help/grecord/de/figures
+@dirrm share/gnome/help/grecord/de
+@dirrm share/gnome/help/grecord
 @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/C/figures
+@dirrm share/gnome/help/gnome-sound-recorder/C
+@dirrm share/gnome/help/gnome-sound-recorder
 @dirrm share/gnome/help/gnome-cd/zh_TW/figures
 @dirrm share/gnome/help/gnome-cd/zh_TW
 @dirrm share/gnome/help/gnome-cd/zh_CN/figures
@@ -413,9 +556,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/gstreamer-properties/icons
 @dirrm share/gnome/gstreamer-properties/glade
 @dirrm share/gnome/gstreamer-properties
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
 @dirrm share/gnome/gnome-media/pixmaps
 @dirrm share/gnome/gnome-media/glade
 @dirrm share/gnome/gnome-media
+@dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
 @dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice
@@ -430,8 +576,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@@ -445,4 +595,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 4e2a669a9..3447dabec 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTVERSION=	2.5.3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.5
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index 2d03add1c..5dbf19d0a 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/gnome-media-2.5.2.tar.bz2) = 8869acb4501be09966484156442f749e
+MD5 (gnome2/gnome-media-2.5.3.tar.bz2) = cb9dc255f2d1cb7056d24e0d5d257f2c
+SIZE (gnome2/gnome-media-2.5.3.tar.bz2) = 2936614
diff --git a/audio/gnomemedia2/files/patch-gst-mixer_gnome-volume-control.desktop.in b/audio/gnomemedia2/files/patch-gst-mixer_gnome-volume-control.desktop.in
deleted file mode 100644
index 535314e7d..000000000
--- a/audio/gnomemedia2/files/patch-gst-mixer_gnome-volume-control.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-mixer/gnome-volume-control.desktop.in.orig	Sat Feb 21 15:33:42 2004
-+++ gst-mixer/gnome-volume-control.desktop.in	Sat Feb 21 15:33:56 2004
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Volume Control
- _Comment=Adjust the volume level
--Exec=gst-mixer
-+Exec=gnome-volume-control
- Icon=gnome-mixer.png
- StartupNotify=true
- Info=Gnome Mixer
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 70f741fb5..455a876c6 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -1,13 +1,18 @@
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
+bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
 bin/vumeter
 etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/%gconf.xml
@@ -23,10 +28,13 @@ etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice/%gconf.xml
 etc/gconf/schemas/CDDB-Slave2.schemas
 etc/gconf/schemas/gnome-audio-profiles.schemas
 etc/gconf/schemas/gnome-cd.schemas
+etc/gconf/schemas/gnome-sound-recorder.schemas
 include/cddb-slave2/cddb-slave-client.h
-include/gnome-media/audio-profile-edit.h
-include/gnome-media/audio-profiles-edit.h
-include/gnome-media/gnome-media-profiles.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/libcddb-slave2.a
 lib/libcddb-slave2.so
 lib/libcddb-slave2.so.0
@@ -39,6 +47,7 @@ libdata/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
 share/gnome/applications/gnome-cd.desktop
+share/gnome/applications/gnome-sound-recorder.desktop
 share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/gstreamer-properties.desktop
 share/gnome/applications/reclevel.desktop
@@ -49,6 +58,7 @@ share/gnome/gnome-media/pixmaps/mixer.png
 share/gnome/gnome-media/pixmaps/phone.png
 share/gnome/gnome-media/pixmaps/tone.png
 share/gnome/gnome-media/pixmaps/video.png
+share/gnome/gnome-sound-recorder/ui/gsr.xml
 share/gnome/gstreamer-properties/glade/gstreamer-properties.glade
 share/gnome/gstreamer-properties/icons/gstreamer-properties.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
@@ -218,10 +228,94 @@ share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
 share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_TW/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-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/grecord/de/figures/grecord-prefs-path.png
+share/gnome/help/grecord/de/figures/grecord-prefs-play.png
+share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/de/figures/grecord.png
+share/gnome/help/grecord/de/figures/grecord_window.png
+share/gnome/help/grecord/de/grecord.xml
+share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/es/figures/grecord-prefs-path.png
+share/gnome/help/grecord/es/figures/grecord-prefs-play.png
+share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/es/figures/grecord.png
+share/gnome/help/grecord/es/figures/grecord_window.png
+share/gnome/help/grecord/es/grecord.xml
+share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/fr/figures/grecord.png
+share/gnome/help/grecord/fr/figures/grecord_window.png
+share/gnome/help/grecord/fr/grecord.xml
+share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/it/figures/grecord-prefs-path.png
+share/gnome/help/grecord/it/figures/grecord-prefs-play.png
+share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/it/figures/grecord.png
+share/gnome/help/grecord/it/figures/grecord_window.png
+share/gnome/help/grecord/it/grecord.xml
+share/gnome/help/grecord/it/legal.xml
+share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ja/figures/grecord.png
+share/gnome/help/grecord/ja/figures/grecord_window.png
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/legal.xml
+share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ko/figures/grecord.png
+share/gnome/help/grecord/ko/figures/grecord_window.png
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/sv/figures/grecord.png
+share/gnome/help/grecord/sv/figures/grecord_window.png
+share/gnome/help/grecord/sv/grecord.xml
+share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_CN/figures/grecord.png
+share/gnome/help/grecord/zh_CN/figures/grecord_window.png
+share/gnome/help/grecord/zh_CN/grecord.xml
+share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_TW/figures/grecord.png
+share/gnome/help/grecord/zh_TW/figures/grecord_window.png
+share/gnome/help/grecord/zh_TW/grecord.xml
+share/gnome/help/grecord/zh_TW/legal.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
@@ -248,6 +342,26 @@ share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-volume-control-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gstreamer-properties-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-cd.png
@@ -318,6 +432,10 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
 share/gnome/pixmaps/gnome-cd/track.png
+share/gnome/pixmaps/gnome-grecord.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-record.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/gnome/pixmaps/gnome-mixer.png
 share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
@@ -345,6 +463,7 @@ share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
@@ -371,12 +490,14 @@ share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sr@Latn/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/th/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
 @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes/media
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@@ -386,9 +507,31 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @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/grecord/zh_TW/figures
+@dirrm share/gnome/help/grecord/zh_TW
+@dirrm share/gnome/help/grecord/zh_CN/figures
+@dirrm share/gnome/help/grecord/zh_CN
+@dirrm share/gnome/help/grecord/sv/figures
+@dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/grecord/ko/figures
+@dirrm share/gnome/help/grecord/ko
+@dirrm share/gnome/help/grecord/ja/figures
+@dirrm share/gnome/help/grecord/ja
+@dirrm share/gnome/help/grecord/it/figures
+@dirrm share/gnome/help/grecord/it
+@dirrm share/gnome/help/grecord/fr/figures
+@dirrm share/gnome/help/grecord/fr
+@dirrm share/gnome/help/grecord/es/figures
+@dirrm share/gnome/help/grecord/es
+@dirrm share/gnome/help/grecord/de/figures
+@dirrm share/gnome/help/grecord/de
+@dirrm share/gnome/help/grecord
 @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/C/figures
+@dirrm share/gnome/help/gnome-sound-recorder/C
+@dirrm share/gnome/help/gnome-sound-recorder
 @dirrm share/gnome/help/gnome-cd/zh_TW/figures
 @dirrm share/gnome/help/gnome-cd/zh_TW
 @dirrm share/gnome/help/gnome-cd/zh_CN/figures
@@ -413,9 +556,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/gstreamer-properties/icons
 @dirrm share/gnome/gstreamer-properties/glade
 @dirrm share/gnome/gstreamer-properties
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
 @dirrm share/gnome/gnome-media/pixmaps
 @dirrm share/gnome/gnome-media/glade
 @dirrm share/gnome/gnome-media
+@dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
 @dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/voice
@@ -430,8 +576,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/global
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@@ -445,4 +595,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gstreamer-properties-C.omf 2>/dev/null || /usr/bin/true