Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

4 files changed, 22 insertions, 3 deletions

diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 50ebbb412cd4..83d36a633660 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	nautilus-media
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.3.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo
index ed505822a40a..142de3adc207 100644
--- a/multimedia/nautilus-media/distinfo
+++ b/multimedia/nautilus-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-media-0.2.2.tar.bz2) = 7143d3624d808453ee2cba1328517532
+MD5 (gnome2/nautilus-media-0.3.3.1.tar.bz2) = 10e16c2db8bb62e96ef79b0f25af8f68
diff --git a/multimedia/nautilus-media/files/patch-media-info_media-info.c b/multimedia/nautilus-media/files/patch-media-info_media-info.c
new file mode 100644
index 000000000000..e97ea45a788f
--- /dev/null
+++ b/multimedia/nautilus-media/files/patch-media-info_media-info.c
@@ -0,0 +1,15 @@
+--- media-info/media-info.c.orig	Tue Aug 12 15:08:26 2003
++++ media-info/media-info.c	Tue Aug 12 15:08:53 2003
+@@ -258,10 +258,11 @@
+ gboolean
+ gst_media_info_read_idler (GstMediaInfo *info, GstMediaInfoStream **streamp)
+ {
++  GstMediaInfoPriv *priv;
+   /* if it's NULL then we're sure something went wrong higher up) */
+   if (info == NULL) return FALSE;
+ 
+-  GstMediaInfoPriv *priv = info->priv;
++  priv = info->priv;
+ 
+   g_assert (streamp != NULL);
+   switch (priv->state)
diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist
index c7e7b7f2a33e..3edf1be94a77 100644
--- a/multimedia/nautilus-media/pkg-plist
+++ b/multimedia/nautilus-media/pkg-plist
@@ -25,6 +25,7 @@ share/locale/bg/LC_MESSAGES/nautilus-media.mo
 share/locale/bn/LC_MESSAGES/nautilus-media.mo
 share/locale/ca/LC_MESSAGES/nautilus-media.mo
 share/locale/cs/LC_MESSAGES/nautilus-media.mo
+share/locale/cy/LC_MESSAGES/nautilus-media.mo
 share/locale/de/LC_MESSAGES/nautilus-media.mo
 share/locale/da/LC_MESSAGES/nautilus-media.mo
 share/locale/el/LC_MESSAGES/nautilus-media.mo
@@ -35,12 +36,15 @@ share/locale/fi/LC_MESSAGES/nautilus-media.mo
 share/locale/fr/LC_MESSAGES/nautilus-media.mo
 share/locale/ga/LC_MESSAGES/nautilus-media.mo
 share/locale/he/LC_MESSAGES/nautilus-media.mo
+share/locale/hi/LC_MESSAGES/nautilus-media.mo
 share/locale/hu/LC_MESSAGES/nautilus-media.mo
 share/locale/id/LC_MESSAGES/nautilus-media.mo
 share/locale/is/LC_MESSAGES/nautilus-media.mo
 share/locale/it/LC_MESSAGES/nautilus-media.mo
 share/locale/ja/LC_MESSAGES/nautilus-media.mo
 share/locale/ko/LC_MESSAGES/nautilus-media.mo
+share/locale/li/LC_MESSAGES/nautilus-media.mo
+share/locale/lt/LC_MESSAGES/nautilus-media.mo
 share/locale/lv/LC_MESSAGES/nautilus-media.mo
 share/locale/mk/LC_MESSAGES/nautilus-media.mo
 share/locale/ml/LC_MESSAGES/nautilus-media.mo