Update multi-gnome-terminal to 1.6.1, based on patch provided in PR pkg/19665

by Adrian Portelli.

There have been lots of changes since 1.3.4 to mention here, but most of
them are bugfixes.

5 files changed, 94 insertions, 107 deletions

diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 48d9766bec4..091d251a4e4 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/23 22:42:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/10 12:41:12 jmmv Exp $
 
-DISTNAME=	multi-gnome-terminal-1.3.4
-PKGREVISION=	1
+DISTNAME=	multi-gnome-terminal-1.6.1
 CATEGORIES=	gnome x11
-MASTER_SITES=	http://multignometerm.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
 MAINTAINER=	damon@netbsd.org
 HOMEPAGE=	http://multignometerm.sourceforge.net/
@@ -17,8 +16,11 @@ GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ENV+=		ac_cv_prog_JADE=no
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+
 .include "../../devel/libglade/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
 .include "../../textproc/scrollkeeper/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/multi-gnome-terminal/PLIST b/x11/multi-gnome-terminal/PLIST
index 2715d4db3b7..f4cbfc12f28 100644
--- a/x11/multi-gnome-terminal/PLIST
+++ b/x11/multi-gnome-terminal/PLIST
@@ -1,22 +1,45 @@
-@comment $NetBSD: PLIST,v 1.4 2002/09/23 22:51:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/10 12:41:12 jmmv Exp $
+bin/mgt-helper
 bin/multi-gnome-terminal
 etc/CORBA/servers/multi-gnome-terminal.gnorba
+man/man1/mgt-helper.1
 man/man1/multi-gnome-terminal.1
-share/gnome-terminal/glade/edit_cmd.glade
-share/gnome-terminal/glade/multi-gnome-terminal.glade
+sbin/mgt-pty-helper
 share/gnome/apps/System/multi-gnome-terminal.desktop
+share/gnome/help/multi-gnome-terminal/C/ChangeLog
+share/gnome/help/multi-gnome-terminal/C/NEWS
+share/gnome/help/multi-gnome-terminal/C/appendix.html
+share/gnome/help/multi-gnome-terminal/C/appendixb.html
+share/gnome/help/multi-gnome-terminal/C/appendixc.html
+share/gnome/help/multi-gnome-terminal/C/appendixd.html
 share/gnome/help/multi-gnome-terminal/C/authors.html
 share/gnome/help/multi-gnome-terminal/C/classes.html
-share/gnome/help/multi-gnome-terminal/C/config.html
-share/gnome/help/multi-gnome-terminal/C/docbook.css
+share/gnome/help/multi-gnome-terminal/C/description.html
+share/gnome/help/multi-gnome-terminal/C/edit-commands.html
 share/gnome/help/multi-gnome-terminal/C/environment.html
-share/gnome/help/multi-gnome-terminal/C/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/C/figures/gt_stable_show_all.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/gt_stable_show_editcmd.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/gt_stable_show_keyb.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/gt_stable_show_menu.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_editcmds160.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_nogui_152.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_intro150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_keyb151.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_mail150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_menu_only150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_menubar150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_show_all150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_pix_view150.jpg
+share/gnome/help/multi-gnome-terminal/C/figures/mgt_tpreferences-160.jpg
+share/gnome/help/multi-gnome-terminal/C/helpers.html
 share/gnome/help/multi-gnome-terminal/C/index.html
+share/gnome/help/multi-gnome-terminal/C/keybindings.html
 share/gnome/help/multi-gnome-terminal/C/license.html
-share/gnome/help/multi-gnome-terminal/C/ln9.html
-share/gnome/help/multi-gnome-terminal/C/menus.html
+share/gnome/help/multi-gnome-terminal/C/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/C/options.html
 share/gnome/help/multi-gnome-terminal/C/pointerusage.html
+share/gnome/help/multi-gnome-terminal/C/preferences.html
 share/gnome/help/multi-gnome-terminal/C/stylesheet-images/caution.gif
 share/gnome/help/multi-gnome-terminal/C/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/C/stylesheet-images/important.gif
@@ -30,50 +53,29 @@ share/gnome/help/multi-gnome-terminal/C/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/C/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/C/stylesheet-images/warning.gif
 share/gnome/help/multi-gnome-terminal/C/topic.dat
+share/gnome/help/multi-gnome-terminal/C/ui.html
 share/gnome/help/multi-gnome-terminal/C/usage.html
-share/gnome/help/multi-gnome-terminal/da/authors.html
-share/gnome/help/multi-gnome-terminal/da/classes.html
-share/gnome/help/multi-gnome-terminal/da/config.html
-share/gnome/help/multi-gnome-terminal/da/docbook.css
-share/gnome/help/multi-gnome-terminal/da/emulation.html
-share/gnome/help/multi-gnome-terminal/da/environment.html
-share/gnome/help/multi-gnome-terminal/da/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/da/ChangeLog
+share/gnome/help/multi-gnome-terminal/da/NEWS
 share/gnome/help/multi-gnome-terminal/da/index.html
-share/gnome/help/multi-gnome-terminal/da/ln9.html
-share/gnome/help/multi-gnome-terminal/da/menus.html
-share/gnome/help/multi-gnome-terminal/da/options.html
-share/gnome/help/multi-gnome-terminal/da/pointerusage.html
+share/gnome/help/multi-gnome-terminal/da/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/caution.gif
-share/gnome/help/multi-gnome-terminal/da/stylesheet-images/caution.png
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/important.gif
-share/gnome/help/multi-gnome-terminal/da/stylesheet-images/important.png
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/next.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/note.gif
-share/gnome/help/multi-gnome-terminal/da/stylesheet-images/note.png
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/prev.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/tip.gif
-share/gnome/help/multi-gnome-terminal/da/stylesheet-images/tip.png
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/toc-blank.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/toc-minus.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/da/stylesheet-images/warning.gif
-share/gnome/help/multi-gnome-terminal/da/stylesheet-images/warning.png
-share/gnome/help/multi-gnome-terminal/da/terminal.html
-share/gnome/help/multi-gnome-terminal/da/termtech.html
 share/gnome/help/multi-gnome-terminal/da/topic.dat
-share/gnome/help/multi-gnome-terminal/de/authors.html
-share/gnome/help/multi-gnome-terminal/de/classes.html
-share/gnome/help/multi-gnome-terminal/de/config.html
-share/gnome/help/multi-gnome-terminal/de/docbook.css
-share/gnome/help/multi-gnome-terminal/de/environment.html
-share/gnome/help/multi-gnome-terminal/de/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/de/ChangeLog
+share/gnome/help/multi-gnome-terminal/de/NEWS
 share/gnome/help/multi-gnome-terminal/de/index.html
-share/gnome/help/multi-gnome-terminal/de/ln11.html
-share/gnome/help/multi-gnome-terminal/de/menus.html
-share/gnome/help/multi-gnome-terminal/de/options.html
-share/gnome/help/multi-gnome-terminal/de/pointerusage.html
+share/gnome/help/multi-gnome-terminal/de/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/de/stylesheet-images/caution.gif
 share/gnome/help/multi-gnome-terminal/de/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/de/stylesheet-images/important.gif
@@ -87,18 +89,10 @@ share/gnome/help/multi-gnome-terminal/de/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/de/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/de/stylesheet-images/warning.gif
 share/gnome/help/multi-gnome-terminal/de/topic.dat
-share/gnome/help/multi-gnome-terminal/de/usage.html
-share/gnome/help/multi-gnome-terminal/es/authors.html
-share/gnome/help/multi-gnome-terminal/es/classes.html
-share/gnome/help/multi-gnome-terminal/es/config.html
-share/gnome/help/multi-gnome-terminal/es/docbook.css
-share/gnome/help/multi-gnome-terminal/es/environment.html
-share/gnome/help/multi-gnome-terminal/es/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/es/ChangeLog
+share/gnome/help/multi-gnome-terminal/es/NEWS
 share/gnome/help/multi-gnome-terminal/es/index.html
-share/gnome/help/multi-gnome-terminal/es/ln17.html
-share/gnome/help/multi-gnome-terminal/es/menus.html
-share/gnome/help/multi-gnome-terminal/es/options.html
-share/gnome/help/multi-gnome-terminal/es/pointerusage.html
+share/gnome/help/multi-gnome-terminal/es/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/es/stylesheet-images/caution.gif
 share/gnome/help/multi-gnome-terminal/es/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/es/stylesheet-images/important.gif
@@ -112,74 +106,59 @@ share/gnome/help/multi-gnome-terminal/es/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/es/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/es/stylesheet-images/warning.gif
 share/gnome/help/multi-gnome-terminal/es/topic.dat
-share/gnome/help/multi-gnome-terminal/es/usage.html
-share/gnome/help/multi-gnome-terminal/it/authors.html
-share/gnome/help/multi-gnome-terminal/it/classes.html
-share/gnome/help/multi-gnome-terminal/it/config.html
-share/gnome/help/multi-gnome-terminal/it/docbook.css
-share/gnome/help/multi-gnome-terminal/it/emulation.html
-share/gnome/help/multi-gnome-terminal/it/environment.html
-share/gnome/help/multi-gnome-terminal/it/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/it/ChangeLog
+share/gnome/help/multi-gnome-terminal/it/NEWS
 share/gnome/help/multi-gnome-terminal/it/index.html
-share/gnome/help/multi-gnome-terminal/it/ln12.html
-share/gnome/help/multi-gnome-terminal/it/menus.html
-share/gnome/help/multi-gnome-terminal/it/options.html
-share/gnome/help/multi-gnome-terminal/it/pointerusage.html
+share/gnome/help/multi-gnome-terminal/it/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/caution.gif
-share/gnome/help/multi-gnome-terminal/it/stylesheet-images/caution.png
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/important.gif
-share/gnome/help/multi-gnome-terminal/it/stylesheet-images/important.png
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/next.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/note.gif
-share/gnome/help/multi-gnome-terminal/it/stylesheet-images/note.png
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/prev.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/tip.gif
-share/gnome/help/multi-gnome-terminal/it/stylesheet-images/tip.png
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/toc-blank.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/toc-minus.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/it/stylesheet-images/warning.gif
-share/gnome/help/multi-gnome-terminal/it/stylesheet-images/warning.png
-share/gnome/help/multi-gnome-terminal/it/terminal.html
 share/gnome/help/multi-gnome-terminal/it/topic.dat
-share/gnome/help/multi-gnome-terminal/no/authors.html
-share/gnome/help/multi-gnome-terminal/no/classes.html
-share/gnome/help/multi-gnome-terminal/no/config.html
-share/gnome/help/multi-gnome-terminal/no/docbook.css
-share/gnome/help/multi-gnome-terminal/no/emulation.html
-share/gnome/help/multi-gnome-terminal/no/environment.html
-share/gnome/help/multi-gnome-terminal/no/gnome-terminal.sgml
+share/gnome/help/multi-gnome-terminal/no/ChangeLog
+share/gnome/help/multi-gnome-terminal/no/NEWS
 share/gnome/help/multi-gnome-terminal/no/index.html
-share/gnome/help/multi-gnome-terminal/no/ln9.html
-share/gnome/help/multi-gnome-terminal/no/menus.html
-share/gnome/help/multi-gnome-terminal/no/options.html
-share/gnome/help/multi-gnome-terminal/no/pointerusage.html
+share/gnome/help/multi-gnome-terminal/no/multi-gnome-terminal.sgml
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/caution.gif
-share/gnome/help/multi-gnome-terminal/no/stylesheet-images/caution.png
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/home.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/important.gif
-share/gnome/help/multi-gnome-terminal/no/stylesheet-images/important.png
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/next.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/note.gif
-share/gnome/help/multi-gnome-terminal/no/stylesheet-images/note.png
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/prev.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/tip.gif
-share/gnome/help/multi-gnome-terminal/no/stylesheet-images/tip.png
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/toc-blank.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/toc-minus.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/toc-plus.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/up.gif
 share/gnome/help/multi-gnome-terminal/no/stylesheet-images/warning.gif
-share/gnome/help/multi-gnome-terminal/no/stylesheet-images/warning.png
-share/gnome/help/multi-gnome-terminal/no/terminal.html
-share/gnome/help/multi-gnome-terminal/no/termtech.html
 share/gnome/help/multi-gnome-terminal/no/topic.dat
 share/idl/MultiTerminal.idl
-share/omf/mgt/gnome-terminal-C.omf
-share/omf/mgt/gnome-terminal-de.omf
-share/omf/mgt/gnome-terminal-es.omf
+share/mgt/glade/edit_cmd.glade
+share/mgt/glade/multi-gnome-terminal.glade
+share/mgt/glade/search.glade
+share/mgt/glade/win_keys.glade
+share/mgt/glade/win_prefs.glade
+share/omf/mgt/multi-gnome-terminal-C.omf
+share/pixmaps/mgt/MGT_bb_back.png
+share/pixmaps/mgt/MGT_bb_forward.png
+share/pixmaps/mgt/MGT_bb_newshell.png
+share/pixmaps/mgt/MGT_bb_remove.png
+share/pixmaps/mgt/MGT_bb_title.png
+share/pixmaps/mgt/MGT_tb_back.png
+share/pixmaps/mgt/MGT_tb_forward.png
+share/pixmaps/mgt/MGT_tb_newmc.png
+share/pixmaps/mgt/MGT_tb_newroot.png
+share/pixmaps/mgt/MGT_tb_newshell.png
+share/pixmaps/mgt/MGT_tb_remove.png
+share/pixmaps/mgt/MGT_tb_title.png
 share/pixmaps/mgt/arrow_left2.png
 share/pixmaps/mgt/arrow_right2.png
 share/pixmaps/mgt/gnome-notepad.png
@@ -187,6 +166,8 @@ share/pixmaps/mgt/multignometerm.png
 share/pixmaps/mgt/panel-folder.png
 @dirrm share/pixmaps/mgt
 @dirrm share/omf/mgt
+@dirrm share/mgt/glade
+@dirrm share/mgt
 @dirrm share/gnome/help/multi-gnome-terminal/no/stylesheet-images
 @exec ${MKDIR} %D/share/gnome/help/multi-gnome-terminal/no/figures
 @dirrm share/gnome/help/multi-gnome-terminal/no/figures
@@ -208,7 +189,7 @@ share/pixmaps/mgt/panel-folder.png
 @dirrm share/gnome/help/multi-gnome-terminal/da/figures
 @dirrm share/gnome/help/multi-gnome-terminal/da
 @dirrm share/gnome/help/multi-gnome-terminal/C/stylesheet-images
-@exec ${MKDIR} %D/share/gnome/help/multi-gnome-terminal/C/figures
 @dirrm share/gnome/help/multi-gnome-terminal/C/figures
 @dirrm share/gnome/help/multi-gnome-terminal/C
 @dirrm share/gnome/help/multi-gnome-terminal
+@unexec ${RMDIR} %D/etc/CORBA/servers 2> /dev/null || ${TRUE}
diff --git a/x11/multi-gnome-terminal/distinfo b/x11/multi-gnome-terminal/distinfo
index a0492e76fa7..eaa49e18ef8 100644
--- a/x11/multi-gnome-terminal/distinfo
+++ b/x11/multi-gnome-terminal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/09/27 09:54:33 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/01/10 12:41:12 jmmv Exp $
 
-SHA1 (multi-gnome-terminal-1.3.4.tar.gz) = 6188a0569e525ca86ee5205c28f91d4a6723990b
-Size (multi-gnome-terminal-1.3.4.tar.gz) = 580070 bytes
-SHA1 (patch-ab) = f7cc373b6dff161f5fdd59c5c9a912d04ef7cde9
+SHA1 (multi-gnome-terminal-1.6.1.tar.gz) = 411a5c0ef03601cccb22561a4f9cc6ed7fcbce74
+Size (multi-gnome-terminal-1.6.1.tar.gz) = 1867040 bytes
+SHA1 (patch-aa) = 8cce6513db77dcec543bcc1014e1db0161185550
diff --git a/x11/multi-gnome-terminal/patches/patch-aa b/x11/multi-gnome-terminal/patches/patch-aa
new file mode 100644
index 00000000000..15f91b4a770
--- /dev/null
+++ b/x11/multi-gnome-terminal/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2003/01/10 12:41:12 jmmv Exp $
+
+--- gnome-terminal/subshell-includes.h.orig	Thu May  2 02:23:54 2002
++++ gnome-terminal/subshell-includes.h
+@@ -3,8 +3,10 @@
+ 
+ #include <stdio.h>      
+ #include <fcntl.h>	/* for close-on-exec stuff	      */
++#if defined(irix) || defined (__irix__) || defined(sgi) || defined (__sgi__)
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 1
++#endif
+ #endif
+ #define __EXTENSIONS__ 1	/* needed for winsize struct
+ 				   on Solaris (?) */
diff --git a/x11/multi-gnome-terminal/patches/patch-ab b/x11/multi-gnome-terminal/patches/patch-ab
deleted file mode 100644
index b8cb694ff7d..00000000000
--- a/x11/multi-gnome-terminal/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/11/11 22:02:51 damon Exp $
-
---- gnome-terminal/multi-gnome-terminal.desktop.orig	Sat Nov 10 20:12:15 2001
-+++ gnome-terminal/multi-gnome-terminal.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=GNOME terminal
-+Name=multi GNOME terminal
- Name[sl]=Terminal GNOME
- Name[ca]=Terminal GNOME
- Name[cs]=Terminál Gnome