4 files changed, 11 insertions, 30 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index a6905e02a207..303ea7a5d354 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.8
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,9 +20,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui vte
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-terminal.schemas
+
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 53e2076ddaee..97c12e3c7f68 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.6.1.tar.bz2) = 43e04260410e66e767a4b247d0af8b46
-SIZE (gnome2/gnome-terminal-2.6.1.tar.bz2) = 1999378
+MD5 (gnome2/gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672
+SIZE (gnome2/gnome-terminal-2.8.0.tar.bz2) = 2195403
diff --git a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c b/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c
deleted file mode 100644
index 57c197bee543..000000000000
--- a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/eggcellrendererkeys.c.orig	Thu Jul 29 23:34:48 2004
-+++ src/eggcellrendererkeys.c	Thu Jul 29 23:35:36 2004
-@@ -584,7 +584,7 @@
- void
- egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                         guint                keyval,
--                                        GdkModifierType      mask)
-+                                        EggVirtualModifierType mask)
- {
-   char *text;
-   gboolean changed;
-@@ -626,7 +626,7 @@
- void
- egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                         guint               *keyval,
--                                        GdkModifierType     *mask)
-+                                        EggVirtualModifierType *mask)
- {
-   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
- 
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 12dd4ed33afc..2ef85466b931 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-terminal
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-terminal.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
@@ -90,6 +87,7 @@ 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/bs/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
@@ -100,6 +98,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/eu/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
@@ -120,6 +119,7 @@ share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nb/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/nn/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo