Update to 2.5.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2022 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 18 insertions, 18 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 8603543c7..a07abae93 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.5
@@ -25,8 +25,9 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
-		gail gstreamerplugins
+#USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
+#		gail gstreamerplugins
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 5ab3ad527..9f7e51876 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.5.4.tar.bz2) = f8fd10cc38ff0815229de05b75e31e8c
-SIZE (gnome2/gnome-media-2.5.4.tar.bz2) = 2928655
+MD5 (gnome2/gnome-media-2.5.5.tar.bz2) = 2932569a45bc6746ec9b17cac27dc25c
+SIZE (gnome2/gnome-media-2.5.5.tar.bz2) = 2931924
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 455a876c6..dcf708e10 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -5,20 +5,20 @@ 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/%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
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml
@@ -233,6 +233,7 @@ 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/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/grecord/de/figures/grecord-prefs-path.png
@@ -579,11 +580,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @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
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 8603543c7..a07abae93 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.5
@@ -25,8 +25,9 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
-		gail gstreamerplugins
+#USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier gnomedesktop \
+#		gail gstreamerplugins
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index 5ab3ad527..9f7e51876 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.5.4.tar.bz2) = f8fd10cc38ff0815229de05b75e31e8c
-SIZE (gnome2/gnome-media-2.5.4.tar.bz2) = 2928655
+MD5 (gnome2/gnome-media-2.5.5.tar.bz2) = 2932569a45bc6746ec9b17cac27dc25c
+SIZE (gnome2/gnome-media-2.5.5.tar.bz2) = 2931924
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 455a876c6..dcf708e10 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -5,20 +5,20 @@ 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/%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
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossless/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/cdlossy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/audio/profiles/voice/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/gstreamer/audio/profiles/%gconf.xml
@@ -233,6 +233,7 @@ 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/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/grecord/de/figures/grecord-prefs-path.png
@@ -579,11 +580,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @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
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true