audio/gnomemedia2 -> audio/gnome-media

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for audio/goobox, audio/rhythmbox, audio/sound-juicer, x11/gnome2,
x11/gnome2-lite and x11-toolkits/py-gnome-desktop chase the rename.

PR:		ports/97985
Repocopy by:	marcus

15 files changed, 9 insertions, 679 deletions

diff --git a/MOVED b/MOVED
index 6d551e41fb80..977cb21ab3d0 100644
--- a/MOVED
+++ b/MOVED
@@ -2307,3 +2307,4 @@ devel/gnomebuild|devel/gnome-build|2006-05-27|Renamed to use real vendor package
 devel/gnomecommon|devel/gnome-common|2006-05-27|Renamed to use real vendor package name
 archivers/fileroller|archivers/file-roller|2006-05-27|Renamed to use real vendor package name
 audio/gnomeaudio2|audio/gnome-audio|2006-05-27|Renamed to use real vendor package name
+audio/gnomemedia2|audio/gnome-media|2006-05-27|Renamed to use real vendor package name
diff --git a/audio/Makefile b/audio/Makefile
index ecd048bc5879..6b6fabedd40f 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -175,7 +175,7 @@
     SUBDIR += gmpccaa
     SUBDIR += gnapster
     SUBDIR += gnome-audio
-    SUBDIR += gnomemedia2
+    SUBDIR += gnome-media
     SUBDIR += gnomoradio
     SUBDIR += gnowavcut
     SUBDIR += gnuitar
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
deleted file mode 100644
index 9834f8e5f892..000000000000
--- a/audio/gnomemedia2/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	gnomemedia2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
-#
-
-PORTNAME=	gnomemedia2
-PORTVERSION=	2.14.0
-CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-media-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Multimedia applications for the GNOME 2 desktop
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-INSTALLS_OMF=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		gail nautiluscdburner
-USE_GSTREAMER=	esound gconf good
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
-		gnome-cd.schemas gnome-sound-recorder.schemas \
-		gnome-volume-control.schemas
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
-		${WRKSRC}/gnome-cd/Makefile.in
-.if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
deleted file mode 100644
index 595a5ad12fa6..000000000000
--- a/audio/gnomemedia2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-media-2.14.0.tar.bz2) = e1304b3fb5e069025bb2c1ea3f9f8b62
-SHA256 (gnome2/gnome-media-2.14.0.tar.bz2) = f43324636c0ee8b7485a9a5d2baf8e3fb5db0cc87c55afdb350774dfafc8b280
-SIZE (gnome2/gnome-media-2.14.0.tar.bz2) = 2933013
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h b/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h
deleted file mode 100644
index 1ec1fc50f5d5..000000000000
--- a/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cddb-slave2/gnet-private.h.orig	Tue Aug 31 19:58:18 2004
-+++ cddb-slave2/gnet-private.h	Tue Aug 31 20:02:23 2004
-@@ -68,7 +68,7 @@
- #include <resolv.h>
- #include <netdb.h>
- 
--#ifndef __socklen_t_defined
-+#if !defined(__socklen_t_defined) && !defined(__FreeBSD__)
- typedef guint32 socklen_t;
- #endif
- 
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
deleted file mode 100644
index f316b7f01301..000000000000
--- a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
-+++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
-@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
- 		continue;
- 
- 	      sa_in6->sin6_scope_id = ifindex;
--	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
-+	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
- 	      if (con == 0 || errno == EINPROGRESS)
- 				break;
- 
-@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
-       memcpy(&sa, &addr->sa, sizeof(sa));
-       sa_in = (struct sockaddr_in *) &sa;
-       sa_in->sin_family = AF_INET;
--      con = connect(s->sockfd, &sa, sizeof(s->sa));
-+      con = connect(s->sockfd, &sa, sizeof(sa));
-     }
- 
-   /* Connect (but non-blocking!) */
diff --git a/audio/gnomemedia2/pkg-descr b/audio/gnomemedia2/pkg-descr
deleted file mode 100644
index 7b22584992ac..000000000000
--- a/audio/gnomemedia2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Multimedia applications for the GNOME 2.0 desktop.  Includes gnome-cd, a CDDB
-aware CD player; gnome-volume-control, for controlling the sound card's mixer; 
-and VU-Meter, to slow down your desktop...
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
deleted file mode 100644
index a52495291e52..000000000000
--- a/audio/gnomemedia2/pkg-plist
+++ /dev/null
@@ -1,587 +0,0 @@
-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
-include/cddb-slave2/cddb-slave-client.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.la
-lib/libcddb-slave2.so
-lib/libcddb-slave2.so.0
-lib/libglade/2.0/libgnome-media-profiles.a
-lib/libglade/2.0/libgnome-media-profiles.la
-lib/libglade/2.0/libgnome-media-profiles.so
-lib/libgnome-media-profiles.a
-lib/libgnome-media-profiles.la
-lib/libgnome-media-profiles.so
-lib/libgnome-media-profiles.so.0
-libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
-libdata/pkgconfig/gnome-media-profiles.pc
-libexec/CDDBSlave2
-libexec/cddb-track-editor
-share/gnome/applications/cddb-slave.desktop
-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
-share/gnome/applications/vumeter.desktop
-share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
-share/gnome/gnome-media/pixmaps/3dsound.png
-share/gnome/gnome-media/pixmaps/chain-broken.png
-share/gnome/gnome-media/pixmaps/chain.png
-share/gnome/gnome-media/pixmaps/headphones.png
-share/gnome/gnome-media/pixmaps/mixer.png
-share/gnome/gnome-media/pixmaps/noplay.png
-share/gnome/gnome-media/pixmaps/norecord.png
-share/gnome/gnome-media/pixmaps/phone.png
-share/gnome/gnome-media/pixmaps/play.png
-share/gnome/gnome-media/pixmaps/record.png
-share/gnome/gnome-media/pixmaps/tone.png
-share/gnome/gnome-media/pixmaps/video.png
-share/gnome/gnome-sound-recorder/ui/ui.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
-share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/C/figures/eject_button.png
-share/gnome/help/gnome-cd/C/figures/forward_button.png
-share/gnome/help/gnome-cd/C/figures/next_button.png
-share/gnome/help/gnome-cd/C/figures/pause_button.png
-share/gnome/help/gnome-cd/C/figures/play_button.png
-share/gnome/help/gnome-cd/C/figures/preferences_button.png
-share/gnome/help/gnome-cd/C/figures/previous_button.png
-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/de/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/de/figures/eject_button.png
-share/gnome/help/gnome-cd/de/figures/forward_button.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/de/figures/gnome-cd.png
-share/gnome/help/gnome-cd/de/figures/next_button.png
-share/gnome/help/gnome-cd/de/figures/pause_button.png
-share/gnome/help/gnome-cd/de/figures/play_button.png
-share/gnome/help/gnome-cd/de/figures/preferences_button.png
-share/gnome/help/gnome-cd/de/figures/previous_button.png
-share/gnome/help/gnome-cd/de/figures/rewind_button.png
-share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.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
-share/gnome/help/gnome-cd/es/figures/eject_button.png
-share/gnome/help/gnome-cd/es/figures/forward_button.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/es/figures/gnome-cd.png
-share/gnome/help/gnome-cd/es/figures/next_button.png
-share/gnome/help/gnome-cd/es/figures/pause_button.png
-share/gnome/help/gnome-cd/es/figures/play_button.png
-share/gnome/help/gnome-cd/es/figures/preferences_button.png
-share/gnome/help/gnome-cd/es/figures/previous_button.png
-share/gnome/help/gnome-cd/es/figures/rewind_button.png
-share/gnome/help/gnome-cd/es/figures/stop_button.png
-share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
-share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/fr/figures/eject_button.png
-share/gnome/help/gnome-cd/fr/figures/forward_button.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/fr/figures/gnome-cd.png
-share/gnome/help/gnome-cd/fr/figures/next_button.png
-share/gnome/help/gnome-cd/fr/figures/pause_button.png
-share/gnome/help/gnome-cd/fr/figures/play_button.png
-share/gnome/help/gnome-cd/fr/figures/preferences_button.png
-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/fr/legal.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/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/it/figures/gnome-cd.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/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/nl/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/nl/figures/eject_button.png
-share/gnome/help/gnome-cd/nl/figures/forward_button.png
-share/gnome/help/gnome-cd/nl/figures/next_button.png
-share/gnome/help/gnome-cd/nl/figures/pause_button.png
-share/gnome/help/gnome-cd/nl/figures/play_button.png
-share/gnome/help/gnome-cd/nl/figures/preferences_button.png
-share/gnome/help/gnome-cd/nl/figures/previous_button.png
-share/gnome/help/gnome-cd/nl/figures/rewind_button.png
-share/gnome/help/gnome-cd/nl/figures/stop_button.png
-share/gnome/help/gnome-cd/nl/gnome-cd.xml
-share/gnome/help/gnome-cd/nl/legal.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
-share/gnome/help/gnome-cd/sv/figures/eject_button.png
-share/gnome/help/gnome-cd/sv/figures/forward_button.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
-share/gnome/help/gnome-cd/sv/figures/next_button.png
-share/gnome/help/gnome-cd/sv/figures/pause_button.png
-share/gnome/help/gnome-cd/sv/figures/play_button.png
-share/gnome/help/gnome-cd/sv/figures/preferences_button.png
-share/gnome/help/gnome-cd/sv/figures/previous_button.png
-share/gnome/help/gnome-cd/sv/figures/rewind_button.png
-share/gnome/help/gnome-cd/sv/figures/stop_button.png
-share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/uk/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/uk/figures/eject_button.png
-share/gnome/help/gnome-cd/uk/figures/forward_button.png
-share/gnome/help/gnome-cd/uk/figures/next_button.png
-share/gnome/help/gnome-cd/uk/figures/pause_button.png
-share/gnome/help/gnome-cd/uk/figures/play_button.png
-share/gnome/help/gnome-cd/uk/figures/preferences_button.png
-share/gnome/help/gnome-cd/uk/figures/previous_button.png
-share/gnome/help/gnome-cd/uk/figures/rewind_button.png
-share/gnome/help/gnome-cd/uk/figures/stop_button.png
-share/gnome/help/gnome-cd/uk/gnome-cd.xml
-share/gnome/help/gnome-cd/uk/legal.xml
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_CN/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_CN/figures/next_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/play_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
-share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/zh_TW/figures/eject_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/forward_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd.png
-share/gnome/help/gnome-cd/zh_TW/figures/next_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/pause_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/play_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
-share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
-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-sound-recorder/uk/figures/grecord_window.png
-share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-share/gnome/help/gnome-sound-recorder/uk/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/gnome-volume-control/uk/figures/gmix-prefs.png
-share/gnome/help/gnome-volume-control/uk/figures/gmix.png
-share/gnome/help/gnome-volume-control/uk/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/uk/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/uk/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
-share/gnome/help/gstreamer-properties/uk/figures/gstreamer_properties_window.png
-share/gnome/help/gstreamer-properties/uk/gstreamer-properties.xml
-share/gnome/help/gstreamer-properties/uk/legal.xml
-share/gnome/idl/GNOME_Media_CDDBSlave2.idl
-share/gnome/omf/gnome-media/gnome-cd-C.omf
-share/gnome/omf/gnome-media/gnome-cd-de.omf
-share/gnome/omf/gnome-media/gnome-cd-es.omf
-share/gnome/omf/gnome-media/gnome-cd-fr.omf
-share/gnome/omf/gnome-media/gnome-cd-it.omf
-share/gnome/omf/gnome-media/gnome-cd-ja.omf
-share/gnome/omf/gnome-media/gnome-cd-ko.omf
-share/gnome/omf/gnome-media/gnome-cd-nl.omf
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-share/gnome/omf/gnome-media/gnome-cd-uk.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
-share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
-share/gnome/omf/gnome-media/gnome-volume-control-C.omf
-share/gnome/omf/gnome-media/gnome-volume-control-uk.omf
-share/gnome/omf/gnome-media/grecord-C.omf
-share/gnome/omf/gnome-media/grecord-de.omf
-share/gnome/omf/gnome-media/grecord-es.omf
-share/gnome/omf/gnome-media/grecord-fr.omf
-share/gnome/omf/gnome-media/grecord-it.omf
-share/gnome/omf/gnome-media/grecord-ja.omf
-share/gnome/omf/gnome-media/grecord-ko.omf
-share/gnome/omf/gnome-media/grecord-sv.omf
-share/gnome/omf/gnome-media/grecord-uk.omf
-share/gnome/omf/gnome-media/grecord-zh_CN.omf
-share/gnome/omf/gnome-media/grecord-zh_TW.omf
-share/gnome/omf/gnome-media/gstreamer-properties-C.omf
-share/gnome/omf/gnome-media/gstreamer-properties-uk.omf
-share/gnome/pixmaps/gnome-cd.png
-share/gnome/pixmaps/gnome-cd/cd.png
-share/gnome/pixmaps/gnome-cd/disc.png
-share/gnome/pixmaps/gnome-cd/media-eject.png
-share/gnome/pixmaps/gnome-cd/once.png
-share/gnome/pixmaps/gnome-cd/repeat.png
-share/gnome/pixmaps/gnome-cd/themes/None/None.theme
-share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-next.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-play.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png
-share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/middle.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-left.png
-share/gnome/pixmaps/gnome-cd/themes/None/top-right.png
-share/gnome/pixmaps/gnome-cd/themes/None/top.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
-share/gnome/pixmaps/gnome-cd/themes/lcd/lcd.theme
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/lcd/middle-right.png
-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/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.theme
-share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
-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/bottom-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle.png
-share/gnome/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
-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-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
-share/locale/be/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/bs/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-media-2.0.mo
-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/gu/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
-share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ml/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/nb/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ne/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
-share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
-share/locale/rw/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/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/tk/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/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
-@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
-@dirrm share/gnome/pixmaps/gnome-cd/themes/None
-@dirrm share/gnome/pixmaps/gnome-cd/themes
-@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/omf/gnome-media
-@dirrm share/gnome/help/gstreamer-properties/uk/figures
-@dirrm share/gnome/help/gstreamer-properties/uk
-@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/uk/figures
-@dirrm share/gnome/help/gnome-volume-control/uk
-@dirrm share/gnome/help/gnome-volume-control/C/figures
-@dirrm share/gnome/help/gnome-volume-control/C
-@dirrm share/gnome/help/gnome-volume-control
-@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
-@dirrm share/gnome/help/gnome-sound-recorder/uk
-@dirrm share/gnome/help/gnome-sound-recorder/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
-@dirrm share/gnome/help/gnome-cd/zh_CN
-@dirrm share/gnome/help/gnome-cd/uk/figures
-@dirrm share/gnome/help/gnome-cd/uk
-@dirrm share/gnome/help/gnome-cd/sv/figures
-@dirrm share/gnome/help/gnome-cd/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
-@dirrm share/gnome/help/gnome-cd/ko/figures
-@dirrm share/gnome/help/gnome-cd/ko
-@dirrm share/gnome/help/gnome-cd/ja/figures
-@dirrm share/gnome/help/gnome-cd/ja
-@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/de/figures
-@dirrm share/gnome/help/gnome-cd/de
-@dirrm share/gnome/help/gnome-cd/C/figures
-@dirrm share/gnome/help/gnome-cd/C
-@dirrm share/gnome/help/gnome-cd
-@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
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 0aaa6c27b973..004177ee34dd 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD player and ripper for GNOME Desktop environment
 
-RUN_DEPENDS=	cddb-slave2-properties:${PORTSDIR}/audio/gnomemedia2
+RUN_DEPENDS=	cddb-slave2-properties:${PORTSDIR}/audio/gnome-media
 
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index c3c9e354374f..25e3e98aa8e8 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		dbus-1.2:${PORTSDIR}/devel/dbus \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c3c9e354374f..25e3e98aa8e8 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		dbus-1.2:${PORTSDIR}/devel/dbus \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 2dfcb331e2f2..9ecdf9c661b6 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clean, mean and lean CD ripper for GNOME2
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
 		cdio.7:${PORTSDIR}/sysutils/libcdio
 
 USE_BZIP2=	yes
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 9aeb67dc21a7..6d558c233f39 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -21,7 +21,7 @@ COMMENT=	A set of Python bindings used by modules in the GNOME Desktop
 
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
 		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 13f0b60862c8..0795b75b5c9f 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-lite
 COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
 
 RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
-		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
+		gnome-cd:${PORTSDIR}/audio/gnome-media \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
 		eog:${PORTSDIR}/graphics/eog \
 		gedit:${PORTSDIR}/editors/gedit \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 77764558a4ea..f141e1f6f53a 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	The "meta-port" for the GNOME 2 integrated X11 desktop
 
 RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
-		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
+		gnome-cd:${PORTSDIR}/audio/gnome-media \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
 		eog:${PORTSDIR}/graphics/eog \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \