41 files changed, 296 insertions, 64 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 2f51f8cb4a3b..a8f43b9ce4bd 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -262,8 +262,10 @@
     SUBDIR += gstreamer-plugins-shout2
     SUBDIR += gstreamer-plugins-sidplay
     SUBDIR += gstreamer-plugins-sndfile
+    SUBDIR += gstreamer-plugins-soundtouch
     SUBDIR += gstreamer-plugins-spc
     SUBDIR += gstreamer-plugins-speex
+    SUBDIR += gstreamer-plugins-taglib
     SUBDIR += gstreamer-plugins-vorbis
     SUBDIR += gstreamer-plugins-wavpack
     SUBDIR += gtick
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 1d96d30c33aa..1073d141d006 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -3,15 +3,13 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-audio/Makefile,v 1.6 2007/06/29 22:55:02 mezz Exp $
+#   $MCom: ports/audio/gnome-audio/Makefile,v 1.8 2008/03/21 12:32:12 ahze Exp $
 #
 
 PORTNAME=	gnome-audio
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTVERSION=	2.22.0
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-audio/2.0
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound files for use with GNOME 2
@@ -20,7 +18,10 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier
-WRKSRC=		${WRKDIR}/${DISTNAME}/sounds
 MAKE_ENV=	prefix=${PREFIX}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
+		${WRKSRC}/sounds/Makefile
+
 .include <bsd.port.mk>
diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo
index 13f93a33f0ac..4e1ba3f05d22 100644
--- a/audio/gnome-audio/distinfo
+++ b/audio/gnome-audio/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-audio-2.0.0.tar.bz2) = cd14b84af59fb2ec673527d32f4e379f
-SHA256 (gnome-audio-2.0.0.tar.bz2) = b1587b720056f44c2c472f1157fa73b10a7ffe0fd2f68cf105b39b93bcf280f8
-SIZE (gnome-audio-2.0.0.tar.bz2) = 1401319
+MD5 (gnome-audio-2.22.0.tar.bz2) = e80c94dc42e2ccb2e50e74a382eed666
+SHA256 (gnome-audio-2.22.0.tar.bz2) = f51ba55e66c1b17cf7b32e3b47433e2375b3ef51a8559a804800b4dc9369d993
+SIZE (gnome-audio-2.22.0.tar.bz2) = 1000959
diff --git a/audio/gnome-audio/files/patch-Makefile b/audio/gnome-audio/files/patch-Makefile
deleted file mode 100644
index 962c506807b6..000000000000
--- a/audio/gnome-audio/files/patch-Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
---- Makefile.orig	Thu Feb 15 14:40:33 2001
-+++ Makefile	Mon Feb 26 19:24:22 2001
-@@ -1,3 +1 @@
--prefix=$(shell gnome-config --prefix)
--
- LN_S=ln -sf
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index b1f9e4228684..83340de93218 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.112 2007/09/19 12:22:57 ahze Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.114 2008/03/11 02:39:19 mezz Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -18,6 +17,7 @@ COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 750f2904ad5e..6f477f10616b 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.20.1.tar.bz2) = 75036a6990725c4323812afd4cd734f5
-SHA256 (gnome2/gnome-media-2.20.1.tar.bz2) = 273b9eb4bc5a0cd7f1589f4eb242b995b05d64db20c05ec379d07af3b90d9c29
-SIZE (gnome2/gnome-media-2.20.1.tar.bz2) = 1927211
+MD5 (gnome2/gnome-media-2.22.0.tar.bz2) = e3fabb87abd2731d7f345d724b40333a
+SHA256 (gnome2/gnome-media-2.22.0.tar.bz2) = 9bafcc1d766ea3b0c30d79c33eb77ad8ceaad8631337f66f7797524e90281b4a
+SIZE (gnome2/gnome-media-2.22.0.tar.bz2) = 2237463
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 9429ae72b7ae..1174977da17d 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -61,6 +61,19 @@ 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-cd/ca/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ca/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ca/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ca/figures/eject_button.png
+share/gnome/help/gnome-cd/ca/figures/forward_button.png
+share/gnome/help/gnome-cd/ca/figures/next_button.png
+share/gnome/help/gnome-cd/ca/figures/pause_button.png
+share/gnome/help/gnome-cd/ca/figures/play_button.png
+share/gnome/help/gnome-cd/ca/figures/preferences_button.png
+share/gnome/help/gnome-cd/ca/figures/previous_button.png
+share/gnome/help/gnome-cd/ca/figures/rewind_button.png
+share/gnome/help/gnome-cd/ca/figures/stop_button.png
+share/gnome/help/gnome-cd/ca/gnome-cd.xml
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
@@ -87,6 +100,45 @@ share/gnome/help/gnome-cd/fr/figures/previous_button.png
 share/gnome/help/gnome-cd/fr/figures/rewind_button.png
 share/gnome/help/gnome-cd/fr/figures/stop_button.png
 share/gnome/help/gnome-cd/fr/gnome-cd.xml
+share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/it/figures/eject_button.png
+share/gnome/help/gnome-cd/it/figures/forward_button.png
+share/gnome/help/gnome-cd/it/figures/next_button.png
+share/gnome/help/gnome-cd/it/figures/pause_button.png
+share/gnome/help/gnome-cd/it/figures/play_button.png
+share/gnome/help/gnome-cd/it/figures/preferences_button.png
+share/gnome/help/gnome-cd/it/figures/previous_button.png
+share/gnome/help/gnome-cd/it/figures/rewind_button.png
+share/gnome/help/gnome-cd/it/figures/stop_button.png
+share/gnome/help/gnome-cd/it/gnome-cd.xml
+share/gnome/help/gnome-cd/oc/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/oc/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/oc/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/oc/figures/eject_button.png
+share/gnome/help/gnome-cd/oc/figures/forward_button.png
+share/gnome/help/gnome-cd/oc/figures/next_button.png
+share/gnome/help/gnome-cd/oc/figures/pause_button.png
+share/gnome/help/gnome-cd/oc/figures/play_button.png
+share/gnome/help/gnome-cd/oc/figures/preferences_button.png
+share/gnome/help/gnome-cd/oc/figures/previous_button.png
+share/gnome/help/gnome-cd/oc/figures/rewind_button.png
+share/gnome/help/gnome-cd/oc/figures/stop_button.png
+share/gnome/help/gnome-cd/oc/gnome-cd.xml
+share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ru/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ru/figures/eject_button.png
+share/gnome/help/gnome-cd/ru/figures/forward_button.png
+share/gnome/help/gnome-cd/ru/figures/next_button.png
+share/gnome/help/gnome-cd/ru/figures/pause_button.png
+share/gnome/help/gnome-cd/ru/figures/play_button.png
+share/gnome/help/gnome-cd/ru/figures/preferences_button.png
+share/gnome/help/gnome-cd/ru/figures/previous_button.png
+share/gnome/help/gnome-cd/ru/figures/rewind_button.png
+share/gnome/help/gnome-cd/ru/figures/stop_button.png
+share/gnome/help/gnome-cd/ru/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@@ -103,12 +155,18 @@ share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/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
 share/gnome/help/gnome-sound-recorder/fr/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/it/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/it/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/oc/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/oc/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/ru/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/ru/gnome-sound-recorder.xml
 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
@@ -116,23 +174,35 @@ 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/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
+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/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
 share/gnome/help/gstreamer-properties/fr/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml
 share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
 share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/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/gstreamer-properties/glade/gstreamer-properties.glade
@@ -145,8 +215,10 @@ share/icons/hicolor/48x48/apps/gstreamer-properties.png
 share/idl/GNOME_Media_CDDBSlave2.idl
 share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
@@ -219,6 +291,39 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+share/omf/gnome-cd/gnome-cd-C.omf
+share/omf/gnome-cd/gnome-cd-ca.omf
+share/omf/gnome-cd/gnome-cd-es.omf
+share/omf/gnome-cd/gnome-cd-fr.omf
+share/omf/gnome-cd/gnome-cd-it.omf
+share/omf/gnome-cd/gnome-cd-oc.omf
+share/omf/gnome-cd/gnome-cd-ru.omf
+share/omf/gnome-cd/gnome-cd-sv.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
+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-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-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/pixmaps/gnome-cd/disc.png
 share/pixmaps/gnome-cd/once.png
 share/pixmaps/gnome-cd/repeat.png
@@ -272,25 +377,41 @@ share/pixmaps/gnome-cd/track.png
 @dirrm share/gstreamer-properties/icons
 @dirrm share/gstreamer-properties/glade
 @dirrm share/gstreamer-properties
+@dirrm share/omf/gstreamer-properties
+@dirrm share/omf/gnome-volume-control
+@dirrm share/omf/gnome-sound-recorder
+@dirrm share/omf/gnome-cd
 @dirrm share/gnome/help/gstreamer-properties/sv/figures
 @dirrm share/gnome/help/gstreamer-properties/sv
+@dirrm share/gnome/help/gstreamer-properties/ru/figures
+@dirrm share/gnome/help/gstreamer-properties/ru
 @dirrm share/gnome/help/gstreamer-properties/oc/figures
 @dirrm share/gnome/help/gstreamer-properties/oc
+@dirrm share/gnome/help/gstreamer-properties/it/figures
+@dirrm share/gnome/help/gstreamer-properties/it
 @dirrm share/gnome/help/gstreamer-properties/fr/figures
 @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/ca/figures
+@dirrm share/gnome/help/gstreamer-properties/ca
 @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/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
@@ -298,21 +419,35 @@ share/pixmaps/gnome-cd/track.png
 @dirrm share/gnome/help/gnome-sound-recorder/uk
 @dirrm share/gnome/help/gnome-sound-recorder/sv/figures
 @dirrm share/gnome/help/gnome-sound-recorder/sv
+@dirrm share/gnome/help/gnome-sound-recorder/ru/figures
+@dirrm share/gnome/help/gnome-sound-recorder/ru
 @dirrm share/gnome/help/gnome-sound-recorder/oc/figures
 @dirrm share/gnome/help/gnome-sound-recorder/oc
+@dirrm share/gnome/help/gnome-sound-recorder/it/figures
+@dirrm share/gnome/help/gnome-sound-recorder/it
 @dirrm share/gnome/help/gnome-sound-recorder/fr/figures
 @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/ca/figures
+@dirrm share/gnome/help/gnome-sound-recorder/ca
 @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/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/ru/figures
+@dirrm share/gnome/help/gnome-cd/ru
+@dirrm share/gnome/help/gnome-cd/oc/figures
+@dirrm share/gnome/help/gnome-cd/oc
+@dirrm share/gnome/help/gnome-cd/it/figures
+@dirrm share/gnome/help/gnome-cd/it
 @dirrm share/gnome/help/gnome-cd/fr/figures
 @dirrm share/gnome/help/gnome-cd/fr
 @dirrm share/gnome/help/gnome-cd/es/figures
 @dirrm share/gnome/help/gnome-cd/es
+@dirrm share/gnome/help/gnome-cd/ca/figures
+@dirrm share/gnome/help/gnome-cd/ca
 @dirrm share/gnome/help/gnome-cd/C/figures
 @dirrm share/gnome/help/gnome-cd/C
 @dirrm share/gnome/help/gnome-cd
@@ -321,6 +456,7 @@ share/pixmaps/gnome-cd/track.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm include/gnome-media/profiles
 @dirrm include/gnome-media
 @dirrm include/cddb-slave2
@@ -344,4 +480,7 @@ share/pixmaps/gnome-cd/track.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/audio/gstreamer-plugins-a52dec/Makefile b/audio/gstreamer-plugins-a52dec/Makefile
index 0c4922c415f8..1b68b3378e50 100644
--- a/audio/gstreamer-plugins-a52dec/Makefile
+++ b/audio/gstreamer-plugins-a52dec/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-a52dec/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-cdaudio/Makefile b/audio/gstreamer-plugins-cdaudio/Makefile
index fbdbf17ff196..15b8be9556db 100644
--- a/audio/gstreamer-plugins-cdaudio/Makefile
+++ b/audio/gstreamer-plugins-cdaudio/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-cdaudio/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer frontend to libcdaudio
diff --git a/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile
index 6a9290a61c2f..2a495af2bbfa 100644
--- a/audio/gstreamer-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/gstreamer-plugins-esound/Makefile b/audio/gstreamer-plugins-esound/Makefile
index 88a8cfd50057..92bfd6639b64 100644
--- a/audio/gstreamer-plugins-esound/Makefile
+++ b/audio/gstreamer-plugins-esound/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-esound/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-faac/Makefile b/audio/gstreamer-plugins-faac/Makefile
index 8452fc3e556a..90eea962aa46 100644
--- a/audio/gstreamer-plugins-faac/Makefile
+++ b/audio/gstreamer-plugins-faac/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-faac/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-faad/Makefile b/audio/gstreamer-plugins-faad/Makefile
index 315bcfdc5579..67b243579d4b 100644
--- a/audio/gstreamer-plugins-faad/Makefile
+++ b/audio/gstreamer-plugins-faad/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-faad/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $
 #
 
-PORTREVISION=	4
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
diff --git a/audio/gstreamer-plugins-flac/Makefile b/audio/gstreamer-plugins-flac/Makefile
index d7dc6a1393e6..df14bc479bfa 100644
--- a/audio/gstreamer-plugins-flac/Makefile
+++ b/audio/gstreamer-plugins-flac/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-flac/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-gsm/Makefile b/audio/gstreamer-plugins-gsm/Makefile
index bb3d5de30b48..d03439942825 100644
--- a/audio/gstreamer-plugins-gsm/Makefile
+++ b/audio/gstreamer-plugins-gsm/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-gsm/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-ivorbis/Makefile b/audio/gstreamer-plugins-ivorbis/Makefile
index fe8c8aec4060..331436273481 100644
--- a/audio/gstreamer-plugins-ivorbis/Makefile
+++ b/audio/gstreamer-plugins-ivorbis/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-ivorbis/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer integer only Ogg Vorbis decoder plugin
diff --git a/audio/gstreamer-plugins-jack/Makefile b/audio/gstreamer-plugins-jack/Makefile
index 21b4a4fb62ee..84f2b52bdc54 100644
--- a/audio/gstreamer-plugins-jack/Makefile
+++ b/audio/gstreamer-plugins-jack/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-jack/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer low-latency audio server plugin
diff --git a/audio/gstreamer-plugins-ladspa/Makefile b/audio/gstreamer-plugins-ladspa/Makefile
index cd4350596635..374a3f2a5aa4 100644
--- a/audio/gstreamer-plugins-ladspa/Makefile
+++ b/audio/gstreamer-plugins-ladspa/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-ladspa/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-lame/Makefile b/audio/gstreamer-plugins-lame/Makefile
index 8b4d47c0c171..d07cea049ea0 100644
--- a/audio/gstreamer-plugins-lame/Makefile
+++ b/audio/gstreamer-plugins-lame/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-lame/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-mad/Makefile b/audio/gstreamer-plugins-mad/Makefile
index aa7e2848be00..3158e385c3d5 100644
--- a/audio/gstreamer-plugins-mad/Makefile
+++ b/audio/gstreamer-plugins-mad/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-mad/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 decoder plugin
diff --git a/audio/gstreamer-plugins-musepack/Makefile b/audio/gstreamer-plugins-musepack/Makefile
index a004376de8e2..5692fefaa178 100644
--- a/audio/gstreamer-plugins-musepack/Makefile
+++ b/audio/gstreamer-plugins-musepack/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-musepack/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $
 #
 
-PORTREVISION=	5
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer musepack mpc encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-musicbrainz/Makefile b/audio/gstreamer-plugins-musicbrainz/Makefile
index 4fd0836b8f31..95830ec0d2e7 100644
--- a/audio/gstreamer-plugins-musicbrainz/Makefile
+++ b/audio/gstreamer-plugins-musicbrainz/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-musicbrainz/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CD index/audio metadata plugin
diff --git a/audio/gstreamer-plugins-nas/Makefile b/audio/gstreamer-plugins-nas/Makefile
index 997daaec8e58..3d2e1a9b14b0 100644
--- a/audio/gstreamer-plugins-nas/Makefile
+++ b/audio/gstreamer-plugins-nas/Makefile
@@ -3,10 +3,11 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-nas/Makefile,v 1.5 2008/03/19 14:05:31 ahze Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	0
+PORTREVISION=	2
 
 COMMENT=	GStreamer NAS (Network Audio System) plugin
 
diff --git a/audio/gstreamer-plugins-ogg/Makefile b/audio/gstreamer-plugins-ogg/Makefile
index f909cc02dbef..fb108afb3522 100644
--- a/audio/gstreamer-plugins-ogg/Makefile
+++ b/audio/gstreamer-plugins-ogg/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-ogg/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Ogg bitstream plugin
diff --git a/audio/gstreamer-plugins-shout2/Makefile b/audio/gstreamer-plugins-shout2/Makefile
index 92632368e973..765ba346c217 100644
--- a/audio/gstreamer-plugins-shout2/Makefile
+++ b/audio/gstreamer-plugins-shout2/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-shout2/Makefile,v 1.3 2008/03/19 14:05:31 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
diff --git a/audio/gstreamer-plugins-sidplay/Makefile b/audio/gstreamer-plugins-sidplay/Makefile
index ec34788bc80d..5a1a71d64a3f 100644
--- a/audio/gstreamer-plugins-sidplay/Makefile
+++ b/audio/gstreamer-plugins-sidplay/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-sidplay/Makefile,v 1.5 2008/03/19 14:05:31 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/audio/gstreamer-plugins-soundtouch/Makefile b/audio/gstreamer-plugins-soundtouch/Makefile
new file mode 100644
index 000000000000..15b42cf7bc61
--- /dev/null
+++ b/audio/gstreamer-plugins-soundtouch/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-soundtouch
+# Date created:			15 Feb 2008
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-soundtouch/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $
+#
+
+CATEGORIES=	audio
+PORTREVISION=	2
+
+COMMENT=	GStreamer soundtouch plugin
+
+GST_PLUGIN=	soundtouch
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-spc/Makefile b/audio/gstreamer-plugins-spc/Makefile
index 5c211d80c5bf..4ed6b3bc3f28 100644
--- a/audio/gstreamer-plugins-spc/Makefile
+++ b/audio/gstreamer-plugins-spc/Makefile
@@ -3,9 +3,9 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#   $MCom: ports/audio/gstreamer-plugins-spc/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer OpenSPC frontend
diff --git a/audio/gstreamer-plugins-speex/Makefile b/audio/gstreamer-plugins-speex/Makefile
index d74c50f7c327..01cc84c35161 100644
--- a/audio/gstreamer-plugins-speex/Makefile
+++ b/audio/gstreamer-plugins-speex/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-speex/Makefile,v 1.5 2008/03/19 14:05:32 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer speex voice plugin
diff --git a/audio/gstreamer-plugins-taglib/Makefile b/audio/gstreamer-plugins-taglib/Makefile
new file mode 100644
index 000000000000..a3efef652806
--- /dev/null
+++ b/audio/gstreamer-plugins-taglib/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-taglib
+# Date created:			14 Feb 2008
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-taglib/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $
+#
+
+PORTREVISION=	2
+CATEGORIES=	audio
+
+COMMENT=	Gstreamer taglib plugin
+
+GST_PLUGIN=	taglib
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-vorbis/Makefile b/audio/gstreamer-plugins-vorbis/Makefile
index ebbce71d62b9..95bace901cf4 100644
--- a/audio/gstreamer-plugins-vorbis/Makefile
+++ b/audio/gstreamer-plugins-vorbis/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-vorbis/Makefile,v 1.6 2008/03/21 04:01:33 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
diff --git a/audio/gstreamer-plugins-wavpack/Makefile b/audio/gstreamer-plugins-wavpack/Makefile
index 9d1d89403f5c..afd0c1fd7579 100644
--- a/audio/gstreamer-plugins-wavpack/Makefile
+++ b/audio/gstreamer-plugins-wavpack/Makefile
@@ -3,9 +3,10 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/gstreamer-plugins-wavpack/Makefile,v 1.3 2008/03/19 14:05:33 ahze Exp $
 #
 
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	audio
 
 GST_PLUGIN=	wavpack
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index 9e3a57b824d8..57b51bc75415 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.frob.nl/projects/scribble/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mpd last.fm client
 
-LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup:${PORTSDIR}/devel/libsoup22
 
 GNU_CONFIGURE=	yes
 
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index ecb9bce9b49b..2c9a9e288032 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/pulseaudio/Makefile,v 1.7 2007/09/10 05:10:38 mezz Exp $
+#   $MCom: ports/audio/pulseaudio/Makefile,v 1.10 2008/03/20 16:07:21 mezz Exp $
 #
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -15,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound server for UNIX
 
 LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		oil-0.3.1:${PORTSDIR}/devel/liboil
+		oil-0.3.0:${PORTSDIR}/devel/liboil
 
 CONFLICTS=	polypaudio-[1-9]*
 
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 9ea5d41006b1..fa038463387a 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.81 2007/07/30 19:41:19 mezz Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.88 2008/01/29 01:37:44 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -19,10 +19,10 @@ COMMENT=	Audio player for GNOME
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.7:${PORTSDIR}/multimedia/totem \
+		totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-		soup-2.2.8:${PORTSDIR}/devel/libsoup \
+		soup-2.2.8:${PORTSDIR}/devel/libsoup22 \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 8d19a9859d25..333cc64b0358 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -433,10 +433,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/applications
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9ea5d41006b1..fa038463387a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.81 2007/07/30 19:41:19 mezz Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.88 2008/01/29 01:37:44 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -19,10 +19,10 @@ COMMENT=	Audio player for GNOME
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.7:${PORTSDIR}/multimedia/totem \
+		totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-		soup-2.2.8:${PORTSDIR}/devel/libsoup \
+		soup-2.2.8:${PORTSDIR}/devel/libsoup22 \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 8d19a9859d25..333cc64b0358 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -433,10 +433,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/applications
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 3b25d746a009..fc697d1e590b 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,14 +3,13 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.71 2007/10/15 00:27:00 marcus Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.79 2008/03/10 20:39:31 mezz Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -42,4 +41,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' \
 		${WRKSRC}/Makefile.in
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.mk>
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index cc9d09126b7b..cd51269a0247 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.20.1.tar.bz2) = cea3c67215c99acf513ee7ea4b5eba7b
-SHA256 (gnome2/sound-juicer-2.20.1.tar.bz2) = 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab
-SIZE (gnome2/sound-juicer-2.20.1.tar.bz2) = 1412335
+MD5 (gnome2/sound-juicer-2.22.0.tar.bz2) = 20f83a28915b7d7029198396258d1b4f
+SHA256 (gnome2/sound-juicer-2.22.0.tar.bz2) = cabd3c44a3354edab4f9e112b1cc90c23ef05000bd643596a826ce5d0cfc2551
+SIZE (gnome2/sound-juicer-2.22.0.tar.bz2) = 1748273
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 9b4c1e883cb3..d530d0daa54a 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -40,6 +40,21 @@ share/gnome/help/sound-juicer/oc/figures/prefs.png
 share/gnome/help/sound-juicer/oc/figures/startup.png
 share/gnome/help/sound-juicer/oc/legal.xml
 share/gnome/help/sound-juicer/oc/sound-juicer.xml
+share/gnome/help/sound-juicer/pl/fdl-appendix.xml
+share/gnome/help/sound-juicer/pl/figures/prefs.png
+share/gnome/help/sound-juicer/pl/figures/startup.png
+share/gnome/help/sound-juicer/pl/legal.xml
+share/gnome/help/sound-juicer/pl/sound-juicer.xml
+share/gnome/help/sound-juicer/pt_BR/fdl-appendix.xml
+share/gnome/help/sound-juicer/pt_BR/figures/prefs.png
+share/gnome/help/sound-juicer/pt_BR/figures/startup.png
+share/gnome/help/sound-juicer/pt_BR/legal.xml
+share/gnome/help/sound-juicer/pt_BR/sound-juicer.xml
+share/gnome/help/sound-juicer/ru/fdl-appendix.xml
+share/gnome/help/sound-juicer/ru/figures/prefs.png
+share/gnome/help/sound-juicer/ru/figures/startup.png
+share/gnome/help/sound-juicer/ru/legal.xml
+share/gnome/help/sound-juicer/ru/sound-juicer.xml
 share/gnome/help/sound-juicer/sv/fdl-appendix.xml
 share/gnome/help/sound-juicer/sv/figures/prefs.png
 share/gnome/help/sound-juicer/sv/figures/startup.png
@@ -53,8 +68,11 @@ share/gnome/help/sound-juicer/uk/sound-juicer.xml
 share/icons/hicolor/16x16/apps/sound-juicer.png
 share/icons/hicolor/22x22/apps/sound-juicer.png
 share/icons/hicolor/24x24/apps/sound-juicer.png
+share/icons/hicolor/32x32/apps/sound-juicer.png
+share/icons/hicolor/48x48/apps/sound-juicer.png
 share/icons/hicolor/scalable/apps/sound-juicer.svg
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
+share/locale/as/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
 share/locale/be/LC_MESSAGES/sound-juicer.mo
 share/locale/be@latin/LC_MESSAGES/sound-juicer.mo
@@ -94,6 +112,7 @@ share/locale/lv/LC_MESSAGES/sound-juicer.mo
 share/locale/mk/LC_MESSAGES/sound-juicer.mo
 share/locale/ml/LC_MESSAGES/sound-juicer.mo
 share/locale/mn/LC_MESSAGES/sound-juicer.mo
+share/locale/mr/LC_MESSAGES/sound-juicer.mo
 share/locale/ms/LC_MESSAGES/sound-juicer.mo
 share/locale/nb/LC_MESSAGES/sound-juicer.mo
 share/locale/ne/LC_MESSAGES/sound-juicer.mo
@@ -116,6 +135,7 @@ share/locale/sr/LC_MESSAGES/sound-juicer.mo
 share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
 share/locale/sv/LC_MESSAGES/sound-juicer.mo
 share/locale/ta/LC_MESSAGES/sound-juicer.mo
+share/locale/te/LC_MESSAGES/sound-juicer.mo
 share/locale/th/LC_MESSAGES/sound-juicer.mo
 share/locale/tr/LC_MESSAGES/sound-juicer.mo
 share/locale/ug/LC_MESSAGES/sound-juicer.mo
@@ -133,10 +153,11 @@ share/omf/sound-juicer/sound-juicer-es.omf
 share/omf/sound-juicer/sound-juicer-fr.omf
 share/omf/sound-juicer/sound-juicer-nl.omf
 share/omf/sound-juicer/sound-juicer-oc.omf
+share/omf/sound-juicer/sound-juicer-pl.omf
+share/omf/sound-juicer/sound-juicer-pt_BR.omf
+share/omf/sound-juicer/sound-juicer-ru.omf
 share/omf/sound-juicer/sound-juicer-sv.omf
 share/omf/sound-juicer/sound-juicer-uk.omf
-%%DATADIR%%/sj-play.png
-%%DATADIR%%/sj-record.png
 %%DATADIR%%/sound-juicer.glade
 @dirrm %%DATADIR%%
 @dirrm share/omf/sound-juicer
@@ -144,6 +165,12 @@ share/omf/sound-juicer/sound-juicer-uk.omf
 @dirrm share/gnome/help/sound-juicer/uk
 @dirrm share/gnome/help/sound-juicer/sv/figures
 @dirrm share/gnome/help/sound-juicer/sv
+@dirrm share/gnome/help/sound-juicer/ru/figures
+@dirrm share/gnome/help/sound-juicer/ru
+@dirrm share/gnome/help/sound-juicer/pt_BR/figures
+@dirrm share/gnome/help/sound-juicer/pt_BR
+@dirrm share/gnome/help/sound-juicer/pl/figures
+@dirrm share/gnome/help/sound-juicer/pl
 @dirrm share/gnome/help/sound-juicer/oc/figures
 @dirrm share/gnome/help/sound-juicer/oc
 @dirrm share/gnome/help/sound-juicer/nl/figures
@@ -161,24 +188,32 @@ share/omf/sound-juicer/sound-juicer-uk.omf
 @dirrm share/gnome/help/sound-juicer/C/figures
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer
+@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as