Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

10 files changed, 98 insertions, 226 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 2a08bee55777..f8c711f38649 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.0.3
+PORTVERSION=	2.2.1.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.2
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gailutil.17:${PORTSDIR}/x11-toolkits/gail
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
+		gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index bd143fdc2e55..8c7d07000461 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.0.3.tar.bz2) = a39abb3c2f49d09d21c57b6ee6e5d0ff
+MD5 (gnome2/gnome-media-2.2.1.1.tar.bz2) = 64ec57dd4dce68e2f1ad12c3e46121cb
diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad
index 9dc4efce4c88..f49a888a5a99 100644
--- a/audio/gnome-media/files/patch-ad
+++ b/audio/gnome-media/files/patch-ad
@@ -1,5 +1,5 @@
---- gmix/gmix.c.orig	Tue May  7 00:43:15 2002
-+++ gmix/gmix.c	Tue May  7 00:47:38 2002
+--- gmix/gmix.c.orig	Tue Oct  8 19:40:43 2002
++++ gmix/gmix.c	Fri Oct 11 09:20:13 2002
 @@ -60,7 +60,7 @@
  #ifdef HAVE_LINUX_SOUNDCARD_H 
  #include <linux/soundcard.h>
@@ -9,21 +9,7 @@
  #endif
  #endif
  
-@@ -569,12 +569,7 @@
- 	/*
- 	 * open the mixer-device
- 	 */
--	if (num == 0) {
--		sprintf (device_name, "/dev/mixer");
--	} else {
--		sprintf (device_name, "/dev/mixer%i", num);
--	}
--
-+	sprintf(device_name, "/dev/mixer%i", num);
- 	new_device->fd = open (device_name, O_RDWR, 0);
- 	
- 	if (new_device->fd < 0) {
-@@ -689,6 +684,7 @@
+@@ -722,6 +722,7 @@
  	
  	cnt = 0;
  	devices = NULL;
@@ -31,7 +17,7 @@
  	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
  		
  	do {
-@@ -697,9 +693,8 @@
+@@ -730,9 +731,8 @@
  			devices = g_list_append (devices, new_device);
  			g_hash_table_insert (device_by_name, new_device->info.name, new_device);
  		}
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
index 69445f92cc6d..d5e0e924c1a7 100644
--- a/audio/gnome-media/files/patch-configure
+++ b/audio/gnome-media/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue May  7 01:02:03 2002
-+++ configure	Tue May  7 01:04:35 2002
-@@ -7978,6 +7978,7 @@
+--- configure.orig	Thu Jan 23 17:55:03 2003
++++ configure	Tue Feb  4 20:31:01 2003
+@@ -8336,6 +8336,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 3192730368c2..8b5ddb7c66ba 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -2,14 +2,17 @@ bin/cddb-slave2-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/apps/gnome-volume-control/%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/apps/gnome-volume-control/%gconf.xml
 etc/gconf/schemas/CDDB-Slave2.schemas
 etc/gconf/schemas/gnome-cd.schemas
@@ -28,6 +31,9 @@ share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/reclevel.desktop
 share/gnome/applications/vumeter.desktop
 share/gnome/control-center-2.0/capplets/cddb-slave.desktop
+share/gnome/gnome-media-2.0/icons/gstreamer-properties.png
+share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome/gnome-sound-recorder/ui/gsr.xml
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -45,82 +51,40 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
+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/C/figures/grecord-prefs-path.png
-share/gnome/help/grecord/C/figures/grecord-prefs-play.png
-share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/C/figures/grecord.png
-share/gnome/help/grecord/C/figures/grecord_window.png
-share/gnome/help/grecord/C/grecord.xml
-share/gnome/help/grecord/C/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.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/pixmaps/gnome-cd.png
-share/gnome/pixmaps/gnome-cd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
-share/gnome/pixmaps/gnome-cd/a-eject.png
-share/gnome/pixmaps/gnome-cd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/a-first-pressed.png
-share/gnome/pixmaps/gnome-cd/a-first.png
-share/gnome/pixmaps/gnome-cd/a-fwd-pressed.png
-share/gnome/pixmaps/gnome-cd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/a-last-pressed.png
-share/gnome/pixmaps/gnome-cd/a-last.png
-share/gnome/pixmaps/gnome-cd/a-pause-pressed.png
-share/gnome/pixmaps/gnome-cd/a-pause.png
-share/gnome/pixmaps/gnome-cd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/a-play-pressed.png
-share/gnome/pixmaps/gnome-cd/a-play.png
-share/gnome/pixmaps/gnome-cd/a-rwnd-pressed.png
-share/gnome/pixmaps/gnome-cd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/a-stop-pressed.png
-share/gnome/pixmaps/gnome-cd/a-stop.png
-share/gnome/pixmaps/gnome-cd/back.xpm
 share/gnome/pixmaps/gnome-cd/cd.png
-share/gnome/pixmaps/gnome-cd/cdrom.xpm
 share/gnome/pixmaps/gnome-cd/disc.png
-share/gnome/pixmaps/gnome-cd/eject.xpm
-share/gnome/pixmaps/gnome-cd/ffwd.xpm
-share/gnome/pixmaps/gnome-cd/goto.xpm
 share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/media-fwd.png
+share/gnome/pixmaps/gnome-cd/media-ffwd.png
 share/gnome/pixmaps/gnome-cd/media-next.png
 share/gnome/pixmaps/gnome-cd/media-pause.png
 share/gnome/pixmaps/gnome-cd/media-play.png
 share/gnome/pixmaps/gnome-cd/media-prev.png
-share/gnome/pixmaps/gnome-cd/media-rec.png
-share/gnome/pixmaps/gnome-cd/media-rew.png
+share/gnome/pixmaps/gnome-cd/media-record.png
+share/gnome/pixmaps/gnome-cd/media-rewind.png
 share/gnome/pixmaps/gnome-cd/media-stop.png
-share/gnome/pixmaps/gnome-cd/mixer.png
-share/gnome/pixmaps/gnome-cd/next.xpm
 share/gnome/pixmaps/gnome-cd/once.png
-share/gnome/pixmaps/gnome-cd/pause.xpm
-share/gnome/pixmaps/gnome-cd/play.xpm
 share/gnome/pixmaps/gnome-cd/repeat.png
-share/gnome/pixmaps/gnome-cd/rewind.xpm
-share/gnome/pixmaps/gnome-cd/stop.xpm
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-first.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-last.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-pause.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-play.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
@@ -131,22 +95,9 @@ share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-stop-menu.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-eject.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-next.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-pause.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-play.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-prev.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-rew.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-stop.png
 share/gnome/pixmaps/gnome-cd/themes/media/media.theme
 share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
@@ -154,19 +105,6 @@ share/gnome/pixmaps/gnome-cd/themes/media/middle.png
 share/gnome/pixmaps/gnome-cd/themes/media/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/media/top.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-pause.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
@@ -178,7 +116,6 @@ 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-cd/volume.xpm
 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-rec.png
@@ -186,6 +123,7 @@ 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
+share/gnome/pixmaps/gstreamer-properties.png
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
@@ -204,12 +142,15 @@ share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
 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/hu/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/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/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
@@ -221,6 +162,7 @@ share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/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
@@ -235,20 +177,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/help/grecord/C/figures
-@dirrm share/gnome/help/grecord/C
-@dirrm share/gnome/help/grecord
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
 @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/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@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-volume-control
+@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
+@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
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 2a08bee55777..f8c711f38649 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.0.3
+PORTVERSION=	2.2.1.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.2
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gailutil.17:${PORTSDIR}/x11-toolkits/gail
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gailutil.17:${PORTSDIR}/x11-toolkits/gail \
+		gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index bd143fdc2e55..8c7d07000461 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.0.3.tar.bz2) = a39abb3c2f49d09d21c57b6ee6e5d0ff
+MD5 (gnome2/gnome-media-2.2.1.1.tar.bz2) = 64ec57dd4dce68e2f1ad12c3e46121cb
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad
index 9dc4efce4c88..f49a888a5a99 100644
--- a/audio/gnomemedia2/files/patch-ad
+++ b/audio/gnomemedia2/files/patch-ad
@@ -1,5 +1,5 @@
---- gmix/gmix.c.orig	Tue May  7 00:43:15 2002
-+++ gmix/gmix.c	Tue May  7 00:47:38 2002
+--- gmix/gmix.c.orig	Tue Oct  8 19:40:43 2002
++++ gmix/gmix.c	Fri Oct 11 09:20:13 2002
 @@ -60,7 +60,7 @@
  #ifdef HAVE_LINUX_SOUNDCARD_H 
  #include <linux/soundcard.h>
@@ -9,21 +9,7 @@
  #endif
  #endif
  
-@@ -569,12 +569,7 @@
- 	/*
- 	 * open the mixer-device
- 	 */
--	if (num == 0) {
--		sprintf (device_name, "/dev/mixer");
--	} else {
--		sprintf (device_name, "/dev/mixer%i", num);
--	}
--
-+	sprintf(device_name, "/dev/mixer%i", num);
- 	new_device->fd = open (device_name, O_RDWR, 0);
- 	
- 	if (new_device->fd < 0) {
-@@ -689,6 +684,7 @@
+@@ -722,6 +722,7 @@
  	
  	cnt = 0;
  	devices = NULL;
@@ -31,7 +17,7 @@
  	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
  		
  	do {
-@@ -697,9 +693,8 @@
+@@ -730,9 +731,8 @@
  			devices = g_list_append (devices, new_device);
  			g_hash_table_insert (device_by_name, new_device->info.name, new_device);
  		}
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
index 69445f92cc6d..d5e0e924c1a7 100644
--- a/audio/gnomemedia2/files/patch-configure
+++ b/audio/gnomemedia2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue May  7 01:02:03 2002
-+++ configure	Tue May  7 01:04:35 2002
-@@ -7978,6 +7978,7 @@
+--- configure.orig	Thu Jan 23 17:55:03 2003
++++ configure	Tue Feb  4 20:31:01 2003
+@@ -8336,6 +8336,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 3192730368c2..8b5ddb7c66ba 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -2,14 +2,17 @@ bin/cddb-slave2-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/apps/gnome-volume-control/%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/apps/gnome-volume-control/%gconf.xml
 etc/gconf/schemas/CDDB-Slave2.schemas
 etc/gconf/schemas/gnome-cd.schemas
@@ -28,6 +31,9 @@ share/gnome/applications/gnome-volume-control.desktop
 share/gnome/applications/reclevel.desktop
 share/gnome/applications/vumeter.desktop
 share/gnome/control-center-2.0/capplets/cddb-slave.desktop
+share/gnome/gnome-media-2.0/icons/gstreamer-properties.png
+share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome/gnome-sound-recorder/ui/gsr.xml
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
@@ -45,82 +51,40 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
+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/C/figures/grecord-prefs-path.png
-share/gnome/help/grecord/C/figures/grecord-prefs-play.png
-share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/C/figures/grecord.png
-share/gnome/help/grecord/C/figures/grecord_window.png
-share/gnome/help/grecord/C/grecord.xml
-share/gnome/help/grecord/C/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.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/pixmaps/gnome-cd.png
-share/gnome/pixmaps/gnome-cd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
-share/gnome/pixmaps/gnome-cd/a-eject.png
-share/gnome/pixmaps/gnome-cd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/a-first-pressed.png
-share/gnome/pixmaps/gnome-cd/a-first.png
-share/gnome/pixmaps/gnome-cd/a-fwd-pressed.png
-share/gnome/pixmaps/gnome-cd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/a-last-pressed.png
-share/gnome/pixmaps/gnome-cd/a-last.png
-share/gnome/pixmaps/gnome-cd/a-pause-pressed.png
-share/gnome/pixmaps/gnome-cd/a-pause.png
-share/gnome/pixmaps/gnome-cd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/a-play-pressed.png
-share/gnome/pixmaps/gnome-cd/a-play.png
-share/gnome/pixmaps/gnome-cd/a-rwnd-pressed.png
-share/gnome/pixmaps/gnome-cd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/a-stop-pressed.png
-share/gnome/pixmaps/gnome-cd/a-stop.png
-share/gnome/pixmaps/gnome-cd/back.xpm
 share/gnome/pixmaps/gnome-cd/cd.png
-share/gnome/pixmaps/gnome-cd/cdrom.xpm
 share/gnome/pixmaps/gnome-cd/disc.png
-share/gnome/pixmaps/gnome-cd/eject.xpm
-share/gnome/pixmaps/gnome-cd/ffwd.xpm
-share/gnome/pixmaps/gnome-cd/goto.xpm
 share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/media-fwd.png
+share/gnome/pixmaps/gnome-cd/media-ffwd.png
 share/gnome/pixmaps/gnome-cd/media-next.png
 share/gnome/pixmaps/gnome-cd/media-pause.png
 share/gnome/pixmaps/gnome-cd/media-play.png
 share/gnome/pixmaps/gnome-cd/media-prev.png
-share/gnome/pixmaps/gnome-cd/media-rec.png
-share/gnome/pixmaps/gnome-cd/media-rew.png
+share/gnome/pixmaps/gnome-cd/media-record.png
+share/gnome/pixmaps/gnome-cd/media-rewind.png
 share/gnome/pixmaps/gnome-cd/media-stop.png
-share/gnome/pixmaps/gnome-cd/mixer.png
-share/gnome/pixmaps/gnome-cd/next.xpm
 share/gnome/pixmaps/gnome-cd/once.png
-share/gnome/pixmaps/gnome-cd/pause.xpm
-share/gnome/pixmaps/gnome-cd/play.xpm
 share/gnome/pixmaps/gnome-cd/repeat.png
-share/gnome/pixmaps/gnome-cd/rewind.xpm
-share/gnome/pixmaps/gnome-cd/stop.xpm
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-first.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-last.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-pause.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-play.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
@@ -131,22 +95,9 @@ share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/top.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/media/a-stop-menu.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/media/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-eject.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-next.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-pause.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-play.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-prev.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-rew.png
-share/gnome/pixmaps/gnome-cd/themes/media/media-stop.png
 share/gnome/pixmaps/gnome-cd/themes/media/media.theme
 share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
@@ -154,19 +105,6 @@ share/gnome/pixmaps/gnome-cd/themes/media/middle.png
 share/gnome/pixmaps/gnome-cd/themes/media/top-left.png
 share/gnome/pixmaps/gnome-cd/themes/media/top-right.png
 share/gnome/pixmaps/gnome-cd/themes/media/top.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-pause.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-rwnd.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
@@ -178,7 +116,6 @@ 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-cd/volume.xpm
 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-rec.png
@@ -186,6 +123,7 @@ 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
+share/gnome/pixmaps/gstreamer-properties.png
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
@@ -204,12 +142,15 @@ share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
 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/hu/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/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/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
@@ -221,6 +162,7 @@ share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/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
@@ -235,20 +177,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/help/grecord/C/figures
-@dirrm share/gnome/help/grecord/C
-@dirrm share/gnome/help/grecord
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
 @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/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@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-volume-control
+@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
+@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