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, 10 insertions, 28 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index e6c8538e5c8f..edcdf8d713dd 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.4
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,17 +20,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui vte
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(WITH_ZVT)
-CONFIGURE_ARGS=	--with-widget=zvt
-USE_GNOME+=	libzvt
-.else
-CONFIGURE_ARGS=	--with-widget=vte
-USE_GNOME+=	vte
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index a11d0bf0d30e..dafc5d297de9 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99
+MD5 (gnome2/gnome-terminal-2.4.0.1.tar.bz2) = 6d939e67c052e43686e2357e8083ad66
diff --git a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c b/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c
deleted file mode 100644
index 84c13e0aaed1..000000000000
--- a/x11/gnome-terminal/files/patch-src_terminal-widget-zvt.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/terminal-widget-zvt.c.orig	Wed Feb 12 18:06:32 2003
-+++ src/terminal-widget-zvt.c	Wed Feb 12 18:05:20 2003
-@@ -1132,8 +1132,8 @@
- terminal_widget_set_pango_font (GtkWidget                  *widget,
-                                 const PangoFontDescription *font_desc)
- {
--  g_return_if_fail (font_desc != NULL);
--  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);
-+  /*g_return_if_fail (font_desc != NULL);
-+  zvt_term_set_pango_font (ZVT_TERM (widget), font_desc);*/
- }
- 
- gboolean
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 1ab44e46820f..b101373be612 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -11,6 +11,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
 etc/gconf/schemas/gnome-terminal.schemas
 libdata/bonobo/servers/gnome-terminal.server
+share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
 share/gnome/gnome-terminal/glade/gnome-terminal.glade2
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
@@ -96,8 +97,10 @@ share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
+share/locale/bn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/cs/LC_MESSAGES/gnome-terminal.mo
+share/locale/cy/LC_MESSAGES/gnome-terminal.mo
 share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
@@ -107,9 +110,12 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo
 share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
+share/locale/ga/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
 share/locale/he/LC_MESSAGES/gnome-terminal.mo
+share/locale/hi/LC_MESSAGES/gnome-terminal.mo
 share/locale/hu/LC_MESSAGES/gnome-terminal.mo
+share/locale/id/LC_MESSAGES/gnome-terminal.mo
 share/locale/it/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/ko/LC_MESSAGES/gnome-terminal.mo
@@ -132,14 +138,12 @@ share/locale/sq/LC_MESSAGES/gnome-terminal.mo
 share/locale/sr/LC_MESSAGES/gnome-terminal.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
-share/locale/ta/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
 share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/omf/gnome-terminal
 @dirrm share/gnome/help/gnome-terminal/zh_TW/figures
 @dirrm share/gnome/help/gnome-terminal/zh_TW
 @dirrm share/gnome/help/gnome-terminal/zh_CN/figures
@@ -160,7 +164,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/es
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
-@dirrm share/gnome/help/gnome-terminal/C/figures
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings