Update to 2.24.1.1:

2.24.1.1
========
 * Revert the partial fix for bug #548600 due to regression it causes

2.24.1
======
 * Bugfixes, see http://bugzilla.gnome.org/buglist.cgi?product=gnome-terminal&status_whiteboard_type=substring&status_whiteboard=fixed-2-24&bug_status=RESOLVED&resolution=FIXED&chfieldfrom=2008-09-22&chfieldto=2008-10-20+23:59:00&chfield=bug_status
 * Translation update

2.23.4.2
========

* Fix crash at startup on non-UTF8 locale (RH#450808, RH#450979)
* Fix Ctrl-C (#538809)

2.23.4.1
========

* Fix the S/Key challenge dialogue (RH #451641)

2.23.4
======

* Bug fixes (#528683, #418192, #537112, #537888, #536899, #537215, #536639)
* Translation updates

2.23.3.1
========

- Fix the factory (bug #536463)

2.23.3
======

* Code cleanup
* Bug fixes

5 files changed, 30 insertions, 112 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 2a7acaa7f9c..303396f9a99 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/09/05 21:08:32 bjs Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/25 01:16:52 wiz Exp $
 #
 
-DISTNAME=		gnome-terminal-2.22.3
+DISTNAME=		gnome-terminal-2.24.1.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -20,22 +20,26 @@ USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		YES
 
+CONFIGURE_ENV+=		ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX.gtk2}/bin/gtk-builder-convert"
+
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
+PYTHON_FOR_BUILD_ONLY=	YES
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libzvt/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-terminal/PLIST b/x11/gnome-terminal/PLIST
index bb4bfb594fd..61ea2dffd1f 100644
--- a/x11/gnome-terminal/PLIST
+++ b/x11/gnome-terminal/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/26 00:36:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/25 01:16:52 wiz Exp $
 bin/gnome-terminal
 lib/bonobo/servers/gnome-terminal.server
 share/applications/gnome-terminal.desktop
 share/gconf/schemas/gnome-terminal.schemas
-share/gnome-terminal/glade/gnome-terminal.glade2
+share/gnome-terminal/encodings-dialog.ui
+share/gnome-terminal/keybinding-editor.ui
+share/gnome-terminal/profile-manager.ui
+share/gnome-terminal/profile-new-dialog.ui
+share/gnome-terminal/profile-preferences.ui
+share/gnome-terminal/skey-challenge.ui
+share/gnome-terminal/terminal.xml
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
@@ -15,6 +21,9 @@ share/gnome/help/gnome-terminal/bg/legal.xml
 share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
+share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/cs/gnome-terminal.xml
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/de/gnome-terminal.xml
@@ -99,10 +108,12 @@ 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/ka/LC_MESSAGES/gnome-terminal.mo
+share/locale/kn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/ku/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mai/LC_MESSAGES/gnome-terminal.mo
 share/locale/mg/LC_MESSAGES/gnome-terminal.mo
 share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ml/LC_MESSAGES/gnome-terminal.mo
@@ -117,6 +128,7 @@ share/locale/oc/LC_MESSAGES/gnome-terminal.mo
 share/locale/or/LC_MESSAGES/gnome-terminal.mo
 share/locale/pa/LC_MESSAGES/gnome-terminal.mo
 share/locale/pl/LC_MESSAGES/gnome-terminal.mo
+share/locale/ps/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
 share/locale/ro/LC_MESSAGES/gnome-terminal.mo
@@ -127,7 +139,7 @@ share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 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/sr@latin/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
 share/locale/ta/LC_MESSAGES/gnome-terminal.mo
 share/locale/te/LC_MESSAGES/gnome-terminal.mo
@@ -143,6 +155,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 share/omf/gnome-terminal/gnome-terminal-C.omf
 share/omf/gnome-terminal/gnome-terminal-bg.omf
 share/omf/gnome-terminal/gnome-terminal-ca.omf
+share/omf/gnome-terminal/gnome-terminal-cs.omf
 share/omf/gnome-terminal/gnome-terminal-de.omf
 share/omf/gnome-terminal/gnome-terminal-es.omf
 share/omf/gnome-terminal/gnome-terminal-fr.omf
@@ -157,7 +170,6 @@ share/omf/gnome-terminal/gnome-terminal-sv.omf
 share/omf/gnome-terminal/gnome-terminal-uk.omf
 share/omf/gnome-terminal/gnome-terminal-zh_CN.omf
 share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-share/pixmaps/gnome-terminal.png
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-terminal
 @comment in scrollkeeper: @dirrm share/omf
@@ -189,6 +201,8 @@ share/pixmaps/gnome-terminal.png
 @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/cs/figures
+@dirrm share/gnome/help/gnome-terminal/cs
 @dirrm share/gnome/help/gnome-terminal/ca/figures
 @dirrm share/gnome/help/gnome-terminal/ca
 @dirrm share/gnome/help/gnome-terminal/bg/figures
@@ -197,7 +211,6 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal/C
 @dirrm share/gnome/help/gnome-terminal
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/gnome-terminal/glade
 @dirrm share/gnome-terminal
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 83b53e6e903..ce0ac79e9db 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/09/05 21:08:32 bjs Exp $
+$NetBSD: distinfo,v 1.8 2008/10/25 01:16:52 wiz Exp $
 
-SHA1 (gnome-terminal-2.22.3.tar.bz2) = 8aaf556134884d3f7430e7966ff2c87df5843e3e
-RMD160 (gnome-terminal-2.22.3.tar.bz2) = f90e99dbff067425b7bb7f373565485f7e60f04c
-Size (gnome-terminal-2.22.3.tar.bz2) = 1803177 bytes
+SHA1 (gnome-terminal-2.24.1.1.tar.bz2) = 37b7a0a00991a8c15c02002c386bd146182d1a65
+RMD160 (gnome-terminal-2.24.1.1.tar.bz2) = 0ff0d397e1432eaa92ca1d403a709f03311dc43c
+Size (gnome-terminal-2.24.1.1.tar.bz2) = 1863383 bytes
 SHA1 (patch-aa) = 852623004e3aa680be4c090bb58fd23ac0055aa1
-SHA1 (patch-ab) = 6f5aaee3a31c6ec4b6dfe632e275bcdca075e4ab
 SHA1 (patch-ac) = 0f7f7f64abd8f614e44c068ac398afe92c5506aa
-SHA1 (patch-ad) = 2a44f790e3c839ffe1e7ae31972a4bb1de701484
diff --git a/x11/gnome-terminal/patches/patch-ab b/x11/gnome-terminal/patches/patch-ab
deleted file mode 100644
index ff2aeabef73..00000000000
--- a/x11/gnome-terminal/patches/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/09/05 21:08:32 bjs Exp $
-
---- src/terminal-screen.c.orig	2008-03-20 06:16:25.000000000 -0400
-+++ src/terminal-screen.c
-@@ -232,6 +232,10 @@ terminal_screen_size_allocate (GtkWidget
-       GtkAllocation *allocation)
- {
-   GtkWidget *child;
-+  GtkAllocation old_allocation;
-+
-+  old_allocation.width = widget->allocation.width;
-+  old_allocation.height = widget->allocation.height;
- 
-   widget->allocation = *allocation;
- 
-@@ -239,6 +243,13 @@ terminal_screen_size_allocate (GtkWidget
-   g_assert (child != NULL);
- 
-   gtk_widget_size_allocate (child, allocation);
-+
-+  if (old_allocation.width != allocation->width ||
-+      old_allocation.height != allocation->height)
-+    {
-+      GtkWidget *term = TERMINAL_SCREEN (widget)->priv->term;
-+      gtk_widget_queue_resize_no_redraw (term);
-+    }
- }
- 
- static void
-@@ -316,22 +327,22 @@ terminal_screen_init (TerminalScreen *sc
- #define URLPATH   "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
--			     "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS);
-+			     "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-+			     "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
--			     "(:[0-9]+)?(" URLPATH ")?\\>/?",
-+			     "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-+			     "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?",
- 			     FLAVOR_DEFAULT_TO_HTTP);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
--			     "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
-+			     "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
-+			     "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
- 			     FLAVOR_EMAIL);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
--			     "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-+			     "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
-+			     "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
- 
-   terminal_screen_setup_dnd (screen);
- 
-@@ -622,7 +633,6 @@ terminal_screen_reread_profile (Terminal
-        */
-       terminal_screen_update_scrollbar (screen);
-       terminal_window_update_icon (screen->priv->window);
--      terminal_window_update_geometry (screen->priv->window);
-     }
-   
-   if (GTK_WIDGET_REALIZED (screen->priv->term))
-@@ -898,7 +908,6 @@ terminal_screen_update_on_realize (GtkWi
-   
-   terminal_widget_set_allow_bold (term,
-                                   terminal_profile_get_allow_bold (profile));
--  terminal_window_set_size (screen->priv->window, screen, TRUE);
- }
- 
- static void
-@@ -1008,6 +1017,7 @@ terminal_screen_get_override_command (Te
- GtkWidget*
- terminal_screen_get_widget (TerminalScreen *screen)
- {
-+  if (screen == NULL) return NULL;
-   return screen->priv->term;
- }
- 
diff --git a/x11/gnome-terminal/patches/patch-ad b/x11/gnome-terminal/patches/patch-ad
deleted file mode 100644
index e2923b4f7c1..00000000000
--- a/x11/gnome-terminal/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/04/02 20:40:55 drochner Exp $
-
---- src/Makefile.in.orig	2008-04-02 22:30:11.000000000 +0200
-+++ src/Makefile.in
-@@ -272,7 +272,7 @@ INCLUDES = @TERM_CFLAGS@ \
- 	-DTERM_PREFIX=\"$(prefix)\" \
- 	-DTERM_SYSCONFDIR=\"$(sysconfdir)\" \
- 	-DTERM_PKGDATADIR=\"$(pkgdatadir)\" \
--	-DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED	\
-+	-DGDK_DISABLE_DEPRECATED \
- 	-DSN_API_NOT_YET_FROZEN
- 
- EGGFILES = \