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

3 files changed, 11 insertions, 178 deletions

diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index c2398db0bce5..0a71aa6ba360 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemimedata
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-mime-data/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-mime-data/2.4
 DISTNAME=	gnome-mime-data-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/misc/gnomemimedata/distinfo b/misc/gnomemimedata/distinfo
index 421ccdc27beb..b220e9a7b7aa 100644
--- a/misc/gnomemimedata/distinfo
+++ b/misc/gnomemimedata/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-mime-data-2.2.1.tar.bz2) = 05f5a490434c33a060ea7d140f60981f
+MD5 (gnome/gnome-mime-data-2.4.0.tar.bz2) = b8f1b383a23d734bec8bc33a03cb3690
diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist
index 0772e3d3ae97..548dce8cb04d 100644
--- a/misc/gnomemimedata/pkg-plist
+++ b/misc/gnomemimedata/pkg-plist
@@ -3,188 +3,19 @@ libdata/pkgconfig/gnome-mime-data-2.0.pc
 share/gnome/application-registry/gnome-vfs.applications
 share/gnome/mime-info/gnome-vfs.keys
 share/gnome/mime-info/gnome-vfs.mime
-share/gnome/pixmaps/document-icons/gnome-application-encapsulated_postscript.png
-share/gnome/pixmaps/document-icons/gnome-application-msword.png
-share/gnome/pixmaps/document-icons/gnome-application-pdf.png
-share/gnome/pixmaps/document-icons/gnome-application-pgp.png
-share/gnome/pixmaps/document-icons/gnome-application-pgp-encrypted.png
-share/gnome/pixmaps/document-icons/gnome-application-pgp-keys.png
-share/gnome/pixmaps/document-icons/gnome-application-postscript.png
-share/gnome/pixmaps/document-icons/gnome-application-qif.png
-share/gnome/pixmaps/document-icons/gnome-application-rtf.png
-share/gnome/pixmaps/document-icons/gnome-application-smil.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.lotus-1-2-3.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-excel.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-powerpoint.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.rn-realmedia.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.calc.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.impress.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.writer.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.calc.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.impress.png
-share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.writer.png
-share/gnome/pixmaps/document-icons/gnome-application-x-abiword.png
-share/gnome/pixmaps/document-icons/gnome-application-x-applix-spreadsheet.png
-share/gnome/pixmaps/document-icons/gnome-application-x-applix-word.png
-share/gnome/pixmaps/document-icons/gnome-application-x-arj.png
-share/gnome/pixmaps/document-icons/gnome-application-x-backup.png
-share/gnome/pixmaps/document-icons/gnome-application-x-blender.png
-share/gnome/pixmaps/document-icons/gnome-application-x-bzip.png
-share/gnome/pixmaps/document-icons/gnome-application-x-compress.png
-share/gnome/pixmaps/document-icons/gnome-application-x-dc-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-deb.png
-share/gnome/pixmaps/document-icons/gnome-application-x-dia-diagram.png
-share/gnome/pixmaps/document-icons/gnome-application-x-dvi.png
-share/gnome/pixmaps/document-icons/gnome-application-x-e-theme.png
-share/gnome/pixmaps/document-icons/gnome-application-x-flac.png
-share/gnome/pixmaps/document-icons/gnome-application-x-font-sunos-news.png
-share/gnome/pixmaps/document-icons/gnome-application-x-gameboy-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-genesis-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-gnome-app-info.png
-share/gnome/pixmaps/document-icons/gnome-application-x-gnumeric.png
-share/gnome/pixmaps/document-icons/gnome-application-x-gtktalog.png
-share/gnome/pixmaps/document-icons/gnome-application-x-gzip.png
-share/gnome/pixmaps/document-icons/gnome-application-x-jar.png
-share/gnome/pixmaps/document-icons/gnome-application-x-java-byte-code.png
-share/gnome/pixmaps/document-icons/gnome-application-x-kde-app-info.png
-share/gnome/pixmaps/document-icons/gnome-application-x-killustrator.png
-share/gnome/pixmaps/document-icons/gnome-application-x-kpresenter.png
-share/gnome/pixmaps/document-icons/gnome-application-x-kspread.png
-share/gnome/pixmaps/document-icons/gnome-application-x-kword.png
-share/gnome/pixmaps/document-icons/gnome-application-x-msx-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-n64-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-nes-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-ogg.png
-share/gnome/pixmaps/document-icons/gnome-application-x-php.png
-share/gnome/pixmaps/document-icons/gnome-application-x-python-bytecode.png
-share/gnome/pixmaps/document-icons/gnome-application-x-reject.png
-share/gnome/pixmaps/document-icons/gnome-application-x-rpm.png
-share/gnome/pixmaps/document-icons/gnome-application-x-scheme-source.png
-share/gnome/pixmaps/document-icons/gnome-application-x-sms-rom.png
-share/gnome/pixmaps/document-icons/gnome-application-x-sql.png
-share/gnome/pixmaps/document-icons/gnome-application-x-stuffit.png
-share/gnome/pixmaps/document-icons/gnome-audio-ac3.png
-share/gnome/pixmaps/document-icons/gnome-audio-basic.png
-share/gnome/pixmaps/document-icons/gnome-audio-midi.png
-share/gnome/pixmaps/document-icons/gnome-audio-mpeg.png
-share/gnome/pixmaps/document-icons/gnome-audio-ulaw.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-aiff.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-bmx.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-it.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-mod.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-pn-realaudio.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-s3m.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-stm.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-voc.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-wav.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-xi.png
-share/gnome/pixmaps/document-icons/gnome-audio-x-xm.png
-share/gnome/pixmaps/document-icons/gnome-audio.png
-share/gnome/pixmaps/document-icons/gnome-compressed.png
-share/gnome/pixmaps/document-icons/gnome-font-afm.png
-share/gnome/pixmaps/document-icons/gnome-font-bdf.png
-share/gnome/pixmaps/document-icons/gnome-font-linux-psf.png
-share/gnome/pixmaps/document-icons/gnome-font-ttf.png
-share/gnome/pixmaps/document-icons/gnome-font-x-pcf.png
-share/gnome/pixmaps/document-icons/gnome-http-url.png
-share/gnome/pixmaps/document-icons/gnome-image-bmp.png
-share/gnome/pixmaps/document-icons/gnome-image-generic.png
-share/gnome/pixmaps/document-icons/gnome-image-gif.png
-share/gnome/pixmaps/document-icons/gnome-image-ief.png
-share/gnome/pixmaps/document-icons/gnome-image-jpeg.png
-share/gnome/pixmaps/document-icons/gnome-image-pbm.png
-share/gnome/pixmaps/document-icons/gnome-image-pgm.png
-share/gnome/pixmaps/document-icons/gnome-image-png.png
-share/gnome/pixmaps/document-icons/gnome-image-pnm.png
-share/gnome/pixmaps/document-icons/gnome-image-ppm.png
-share/gnome/pixmaps/document-icons/gnome-image-psd.png
-share/gnome/pixmaps/document-icons/gnome-image-ras.png
-share/gnome/pixmaps/document-icons/gnome-image-rgb.png
-share/gnome/pixmaps/document-icons/gnome-image-svg.png
-share/gnome/pixmaps/document-icons/gnome-image-tga.png
-share/gnome/pixmaps/document-icons/gnome-image-tiff.png
-share/gnome/pixmaps/document-icons/gnome-image-x-3ds.png
-share/gnome/pixmaps/document-icons/gnome-image-x-applix-graphic.png
-share/gnome/pixmaps/document-icons/gnome-image-x-lwo.png
-share/gnome/pixmaps/document-icons/gnome-image-x-lws.png
-share/gnome/pixmaps/document-icons/gnome-image-x-xfig.png
-share/gnome/pixmaps/document-icons/gnome-image-xbm.png
-share/gnome/pixmaps/document-icons/gnome-image-xcf.png
-share/gnome/pixmaps/document-icons/gnome-image-xpm.png
-share/gnome/pixmaps/document-icons/gnome-image-xwd.png
-share/gnome/pixmaps/document-icons/gnome-library.png
-share/gnome/pixmaps/document-icons/gnome-objectfile.png
-share/gnome/pixmaps/document-icons/gnome-package.png
-share/gnome/pixmaps/document-icons/gnome-tex.png
-share/gnome/pixmaps/document-icons/gnome-text-abiword.png
-share/gnome/pixmaps/document-icons/gnome-text-css.png
-share/gnome/pixmaps/document-icons/gnome-text-html.png
-share/gnome/pixmaps/document-icons/gnome-text-x-authors.png
-share/gnome/pixmaps/document-icons/gnome-text-x-c.png
-share/gnome/pixmaps/document-icons/gnome-text-x-c++.png
-share/gnome/pixmaps/document-icons/gnome-text-x-c-header.png
-share/gnome/pixmaps/document-icons/gnome-text-x-copying.png
-share/gnome/pixmaps/document-icons/gnome-text-x-credits.png
-share/gnome/pixmaps/document-icons/gnome-text-x-csh.png
-share/gnome/pixmaps/document-icons/gnome-text-x-haskell.png
-share/gnome/pixmaps/document-icons/gnome-text-x-install.png
-share/gnome/pixmaps/document-icons/gnome-text-x-java.png
-share/gnome/pixmaps/document-icons/gnome-text-x-literate-haskell.png
-share/gnome/pixmaps/document-icons/gnome-text-x-lyx.png
-share/gnome/pixmaps/document-icons/gnome-text-x-makefile.png
-share/gnome/pixmaps/document-icons/gnome-text-x-patch.png
-share/gnome/pixmaps/document-icons/gnome-text-x-perl.png
-share/gnome/pixmaps/document-icons/gnome-text-x-python.png
-share/gnome/pixmaps/document-icons/gnome-text-x-readme.png
-share/gnome/pixmaps/document-icons/gnome-text-x-sh.png
-share/gnome/pixmaps/document-icons/gnome-text-x-sql.png
-share/gnome/pixmaps/document-icons/gnome-text-x-zsh.png
-share/gnome/pixmaps/document-icons/gnome-text-xml.png
-share/gnome/pixmaps/document-icons/gnome-textfile.png
-share/gnome/pixmaps/document-icons/gnome-video-mpeg.png
-share/gnome/pixmaps/document-icons/gnome-video-quicktime.png
-share/gnome/pixmaps/document-icons/gnome-video-x-ms-asf.png
-share/gnome/pixmaps/document-icons/gnome-video-x-ms-wmv.png
-share/gnome/pixmaps/document-icons/gnome-video-x-msvideo.png
-share/gnome/pixmaps/document-icons/gnome-x-font-afm.png
-share/gnome/pixmaps/document-icons/gnome-x-troff-man.png
-share/gnome/pixmaps/document-icons/i-blockdev.png
-share/gnome/pixmaps/document-icons/i-cdrom-audio.png
-share/gnome/pixmaps/document-icons/i-cdrom.png
-share/gnome/pixmaps/document-icons/i-chardev.png
-share/gnome/pixmaps/document-icons/i-core.png
-share/gnome/pixmaps/document-icons/i-dvd.png
-share/gnome/pixmaps/document-icons/i-executable.png
-share/gnome/pixmaps/document-icons/i-fifo.png
-share/gnome/pixmaps/document-icons/i-floppy.png
-share/gnome/pixmaps/document-icons/i-ftp.png
-share/gnome/pixmaps/document-icons/i-harddisk.png
-share/gnome/pixmaps/document-icons/i-manual.png
-share/gnome/pixmaps/document-icons/i-music-12.png
-share/gnome/pixmaps/document-icons/i-music-24.png
-share/gnome/pixmaps/document-icons/i-music-36.png
-share/gnome/pixmaps/document-icons/i-music.png
-share/gnome/pixmaps/document-icons/i-network.png
-share/gnome/pixmaps/document-icons/i-nfs.png
-share/gnome/pixmaps/document-icons/i-printer.png
-share/gnome/pixmaps/document-icons/i-regular-72.png
-share/gnome/pixmaps/document-icons/i-regular-96.png
-share/gnome/pixmaps/document-icons/i-regular.png
-share/gnome/pixmaps/document-icons/i-regular.xml
-share/gnome/pixmaps/document-icons/i-smb.png
-share/gnome/pixmaps/document-icons/i-sock.png
-share/gnome/pixmaps/document-icons/i-spreadsheet.png
-share/gnome/pixmaps/document-icons/i-web.png
-share/gnome/pixmaps/document-icons/i-zipdisk.png
 share/locale/am/LC_MESSAGES/gnome-mime-data.mo
+share/locale/ar/LC_MESSAGES/gnome-mime-data.mo
 share/locale/az/LC_MESSAGES/gnome-mime-data.mo
 share/locale/be/LC_MESSAGES/gnome-mime-data.mo
 share/locale/bg/LC_MESSAGES/gnome-mime-data.mo
 share/locale/bn/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ca/LC_MESSAGES/gnome-mime-data.mo
+share/locale/cs/LC_MESSAGES/gnome-mime-data.mo
+share/locale/cy/LC_MESSAGES/gnome-mime-data.mo
 share/locale/da/LC_MESSAGES/gnome-mime-data.mo
 share/locale/de/LC_MESSAGES/gnome-mime-data.mo
 share/locale/el/LC_MESSAGES/gnome-mime-data.mo
+share/locale/eo/LC_MESSAGES/gnome-mime-data.mo
 share/locale/es/LC_MESSAGES/gnome-mime-data.mo
 share/locale/et/LC_MESSAGES/gnome-mime-data.mo
 share/locale/eu/LC_MESSAGES/gnome-mime-data.mo
@@ -197,15 +28,18 @@ share/locale/he/LC_MESSAGES/gnome-mime-data.mo
 share/locale/hi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/hu/LC_MESSAGES/gnome-mime-data.mo
 share/locale/id/LC_MESSAGES/gnome-mime-data.mo
+share/locale/is/LC_MESSAGES/gnome-mime-data.mo
 share/locale/it/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ja/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ko/LC_MESSAGES/gnome-mime-data.mo
+share/locale/li/LC_MESSAGES/gnome-mime-data.mo
 share/locale/lt/LC_MESSAGES/gnome-mime-data.mo
 share/locale/lv/LC_MESSAGES/gnome-mime-data.mo
 share/locale/mk/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ml/LC_MESSAGES/gnome-mime-data.mo
 share/locale/mn/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ms/LC_MESSAGES/gnome-mime-data.mo
+share/locale/ne/LC_MESSAGES/gnome-mime-data.mo
 share/locale/nl/LC_MESSAGES/gnome-mime-data.mo
 share/locale/nn/LC_MESSAGES/gnome-mime-data.mo
 share/locale/no/LC_MESSAGES/gnome-mime-data.mo
@@ -216,6 +50,7 @@ share/locale/ro/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ru/LC_MESSAGES/gnome-mime-data.mo
 share/locale/sk/LC_MESSAGES/gnome-mime-data.mo
 share/locale/sl/LC_MESSAGES/gnome-mime-data.mo
+share/locale/sq/LC_MESSAGES/gnome-mime-data.mo
 share/locale/sr/LC_MESSAGES/gnome-mime-data.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-mime-data.mo
 share/locale/sv/LC_MESSAGES/gnome-mime-data.mo
@@ -226,4 +61,3 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
 share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@dirrm share/gnome/pixmaps/document-icons