Update mlterm to 2.9.2.

Patch submitted by FUKAUMI Naoki (PR pkg/29061).

 - fix for new ptm(4) handling (submitted in PR)
 - even if pty doesn't exist, try to open next pty (submitted by
   minskim@).
 - add myself to MAINTAINER

Changes from 2.9.1 are:
* [SECURITY] Fixed possible integer overflow.
* Improvement for mouse tracking feature. [minami]
* New "--iconpath" option and "icon_path" key for per-window icon setting.
  [minami]
* New "--kill" option for mlclient. [minami]
* Revived termcap file. [seiichi]
* Xterm-like color scheme for cursor and selection. [minami]
* SCIM input method plugin (Experimental) [seiichi]
* Updated documentations. (#1110868) [mfabian, minami, seiichi]
* IIIMF X aux object handling. [seiichi]
* Implemented some xterm private esc sequences (1047/1048/1049). [minami]
* Fixed a shortcut key bug [minami] (Thanks to Yusuke Sakai)
* Bug fixes for input method plugins [Kenichi Handa, Etsushi Kato]
* Other bug fixes including #1081111 and #1048321 [mfabian, minami, seiichi]

Changes from 2.9.0 are:
* Fixed a segfault caused by broken hash table. (#1061470) [seiichi]
* Fixed a segfault when mlclient has bool option. (#1069725) [minami, seiichi]
* Workaround for a segfault of uim-prime. [seiichi]
* Some improvements for m17n-lib support. [seiichi]
* Updated w3mmlconfig. [seiichi]
* A couple of fixes in configure scripts. [minami, seiichi]
* Minor improvement to allow signal handling to be old POSIX compliant. [minami]
* Horizontal candidate window for input methods. [seiichi]
* Non-interactive mode of mlcc. [minami]
* man-page of mlcc. [minami]
* A lot of cleanups for mlconfig to get rid of compiler warnings. [minami]
* Fixes for missing locale files in mlterm.spec. (#1072304) [seiichi]

Changes from 2.8.0p1 are:
* Improvement of borderless mode using _MOTIF_WM_HINTS [minami]
* Fixed a selection bug with KDE klipper. [minami]
* GTK+2 migration in mlconfig/mlterm-menu [minami]
* New option "--type" to select the rendering engine for drawing fonts [karaki]
* Fixed a bug when moving cursor to out of the screen. [minami]
* Fixed a bug in mod_meta_mode = 8bit. [minami]
* Fixed a bug that crashed mlterm by changing font size [minami]
* Fixed a bug in stream pty on 64bit arch. (Debian BTS #226654) [minami]
* Fixed a bug of "mlclient -e" [MURANO Naoki <nao@fu...>]
* mlconfig lists scrollbars in user"s configuration directory and system
  directory. [kubota]
* New external tool "mlterm-zoom" [kzys]
* Update man [kubota, mfabian, minami, seiichi]
* Fixed a bug that crashed mlterm when invalid value was specified with
  --fsrange option [mfabian]
* Fixed a bug that crashed mlterm when resizing a window over and over.
  [seiichi]
* Verbose message for devpts problem of Linux (Debian BTS #257765) [seiichi]
* Fixed a bug with DEC special character in using xft. [minami]
* Fixed a bug in selecting ISCII text. [karaki]
* Support uim. (Experimental) [seiichi]
* Support IIIMF. (Experimental) [seiichi]
* Support input method of m17n-lib. (Experimental) [seiichi]
* Support INCR type transfer of ICCM selection protocol. (Debian BTS #248087)
  [minami]
* Fixed incorrect mapping for KOI8-U <-> UCS4. (Debian BTS #267631)
  [Eugeniy Meshcheryakov <eugen@un...>]
* A lot of improvements for terminfo [minami]
* Fixes for strange behavior of VT emulation [minami, seiichi]
* Fixed a bug that XIM could not be used with multiple displays. [seiichi]
* Fixed a bug that the preedit area of XIM became invisible in the maximized
  window. [seiichi]
* Cleanups and refactorings for ml_* APIs [karaki]

6 files changed, 181 insertions, 44 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 836b80d6341..61ecc323886 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,15 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: Makefile,v 1.29 2005/03/06 17:50:49 hira Exp $
 
-DISTNAME=	mlterm-2.8.0
-PKGNAME=	${DISTNAME}pl1
-PKGREVISION=	4
+DISTNAME=	mlterm-2.9.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
-PATCHFILES=	${DISTNAME}pl1.tar.gz
-PATCH_SITES=	${MASTER_SITES}
-
-MAINTAINER=	uebayasi@NetBSD.org
+MAINTAINER=	uebayasi@NetBSD.org,hira@NetBSD.org
 HOMEPAGE=	http://mlterm.sourceforge.net/
 COMMENT=	Multilingual terminal emulator
 
@@ -19,32 +14,32 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
 USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-imagelib=imlib
-CONFIGURE_ARGS+=	--enable-anti-alias
+CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
+CONFIGURE_ARGS+=	--with-type-engines=xft
 CONFIGURE_ARGS+=	--without-libiconv-prefix
+CONFIGURE_ARGS+=	--without-libintl-prefix
 
 SUBST_CLASSES+=		link
 SUBST_MESSAGE.link=	"Fixing hardcoded paths and link options."
 SUBST_STAGE.link=	post-patch
-SUBST_FILES.link=	Makefile.in */Makefile.in \
-			*/*/Makefile.in */*/*/Makefile.in \
-			xwindow/x_screen.c xwindow/x_sb_view_factory.c \
-			mlterm/ml_config_menu.c man/mlterm.1
-SUBST_SED.link=		-e 's|-module|-R${X11BASE}/lib -module|g' \
-			-e 's|\(-[R]\)/usr/local/lib||g' \
+SUBST_FILES.link=	Makefile.in */Makefile.in */*/Makefile.in \
+			*/*/*/Makefile.in man/mlterm.1 \
+			mlterm/ml_config_menu.c script/config.rpath \
+			tool/mlconfig/mc_im.c tool/mlconfig/mc_sb_view.c \
+			tool/mlmenu/main.c xwindow/x_im.c \
+			xwindow/x_sb_view_factory.c xwindow/x_screen.c
+SUBST_SED.link=		-e 's|(LIBTOOL_LINK).*(LIBS)|& -R${X11BASE}/lib|g' \
+			-e 's|(LIBTOOL_LINK).*(LIBDIR)|& -R${X11BASE}/lib|g' \
 			-e 's|/usr/local/|${PREFIX}/|g' \
 			-e 's|/usr/X11R6/|${X11BASE}/|g'
 
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index a914feb4eb6..6b42e3a2797 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:10:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/03/06 17:50:49 hira Exp $
 bin/mlcc
 bin/mlclient
 bin/mlterm
@@ -17,6 +17,7 @@ etc/mlterm/xim
 lib/libkik.la
 lib/libmkf.la
 lib/mlterm/libathena.la
+lib/mlterm/libim-kbd.la
 lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 81c6c2dec67..ed4409fcfee 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2005/03/06 17:50:49 hira Exp $
 
-SHA1 (mlterm-2.8.0.tar.gz) = d32ef91e35ccf31f61332250076ad3e4a555d83f
-RMD160 (mlterm-2.8.0.tar.gz) = f8448aa1a8d1a74bf3d6ee5638a00386783bcb54
-Size (mlterm-2.8.0.tar.gz) = 1819417 bytes
-SHA1 (mlterm-2.8.0pl1.tar.gz) = 889b5f0747e895276589414cf26d3ef1df7c31c0
-RMD160 (mlterm-2.8.0pl1.tar.gz) = 8e7d960ab6c181a08761c9925c9f2594994892be
-Size (mlterm-2.8.0pl1.tar.gz) = 700 bytes
-SHA1 (patch-aa) = 48f828de66ecf166e8dc9e14a902730d90690925
+SHA1 (mlterm-2.9.2.tar.gz) = d71f07bb38553a7cae927f15b8d0a20a165eebe7
+RMD160 (mlterm-2.9.1.tar.gz) = c83693c353f266333dc85588d8c1366925cca79c
+Size (mlterm-2.9.1.tar.gz) = 1980109 bytes
+SHA1 (patch-ad) = eaaded295f050591e6a30286163f832aae93fa3a
+SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766
diff --git a/x11/mlterm/patches/patch-aa b/x11/mlterm/patches/patch-aa
deleted file mode 100644
index 1dbefa3543c..00000000000
--- a/x11/mlterm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/02/29 17:41:16 minskim Exp $
-
---- tool/mlconfig/po/Makevars.orig	2003-10-05 08:10:06.000000000 -0500
-+++ tool/mlconfig/po/Makevars
-@@ -4,7 +4,7 @@
- DOMAIN = $(PACKAGE)
- 
- # These two variables depend on the location of this directory.
--subdir =
-+subdir = tool/mlconfig/po
- top_builddir = ../../..
- 
- # These options get passed to xgettext.
diff --git a/x11/mlterm/patches/patch-ad b/x11/mlterm/patches/patch-ad
new file mode 100644
index 00000000000..8e2e27edc1e
--- /dev/null
+++ b/x11/mlterm/patches/patch-ad
@@ -0,0 +1,140 @@
+$NetBSD: patch-ad,v 1.1 2005/03/06 17:50:49 hira Exp $
+
+--- kiklib/src/kik_pty_streams.c.orig	2004-10-23 06:59:39.000000000 +0900
++++ kiklib/src/kik_pty_streams.c	2005-03-05 23:07:02.000000000 +0900
+@@ -9,6 +9,7 @@
+ /* When _XOPEN_SOURCE is defined,
+  * u_int/u_long/... may not be defined without _BSD_SOURCE */
+ #define  _BSD_SOURCE 1
++#define  _NETBSD_SOURCE 1
+ 
+ /* for solaris */
+ #define __EXTENSIONS__
+@@ -34,6 +35,9 @@
+ #ifdef  HAVE_SYS_STROPTS_H
+ #include  <sys/stropts.h>
+ #endif
++#ifdef __NetBSD__
++#include  <util.h>
++#endif
+ 
+ #include  "kik_str.h"		/* strdup */
+ #include  "kik_debug.h"
+@@ -99,13 +103,30 @@
+ 		return  -1;
+ 	}
+ 
+-	fcntl(*master, F_SETFL, O_NDELAY);
+-
+ 	if( ( *slave = open( ttydev, O_RDWR | O_NOCTTY, 0)) < 0)
+ 	{
+ 		return -1;
+ 	}
+ 
++	if ((*slave_name = strdup(ttydev)) == NULL) {
++		close(*master);
++		close(*slave);
++		return -1;
++	}
++
++	pid = fork();
++	if (pid == -1) {
++		free(*slave_name);
++		return -1;
++	}
++	else if(pid == 0) {
++		close(*master);
++		login_tty(*slave);
++		return 0;
++	}
++
++	fcntl(*master, F_SETFL, O_NDELAY);
++
+ 	/*
+ 	 * cygwin doesn't have isastream.
+ 	 */
+@@ -204,78 +225,13 @@
+ 		}
+ 	}
+ 
+-	if( ( *slave_name = strdup( ttydev)) == NULL)
+-	{
+-		close( *master) ;
+-		close( *slave) ;
+-
+-		return  -1 ;
+-	}
+-
+-	pid = fork() ;
+-
+-	if( pid == -1)
+-	{
+-		/* fork failed */
+-
+-		free( *slave_name) ;
+-
+-		return  -1 ;
+-	}
+-	else if( pid == 0)
+-	{
+-		/* child */
+-
+-		close(*master) ;
+-#ifdef HAVE_SETSID
+-		setsid() ;
+-#else /*HAVE_SETSID*/
+-#ifdef TIOCNOTTY
+-		fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+-		if (fd >= 0)
+-		{
+-			ioctl(fd, TIOCNOTTY, NULL);
+-			close(fd);
+-		}
+-#endif /*TIOCNOTTY*/
+-#endif /*HAVE_SETSID*/
+-		fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+-		if (fd >= 0)
+-		{
+-			close(fd);
+-		}
+-		fd = open(ttydev, O_RDWR);
+-		if (fd >= 0)
+-		{
+-			close(fd);
+-		}
+-		fd = open("/dev/tty", O_WRONLY);
+-		if (fd < 0)
+-		{
+-			return -1;
+-		}
+-		close(fd);
+-
+-		dup2( *slave , 0) ;
+-		dup2( *slave , 1) ;
+-		dup2( *slave , 2) ;
+-
+-		if( *slave > STDERR_FILENO)
+-		{
+-			close(*slave) ;
+-		}
+-
+-		cfsetispeed( &tio , B9600) ;
+-		cfsetospeed( &tio , B9600) ;
++	cfsetispeed(&tio, B9600);
++	cfsetospeed(&tio, B9600);
+ 
+-		if( tcsetattr(STDIN_FILENO, TCSANOW , &tio) < 0)
+-		{
+-		#ifdef  DEBUG
+-			kik_warn_printf( KIK_DEBUG_TAG " tcsetattr() failed.\n") ;
+-		#endif
+-		}
+-
+-		return  0 ;
++	if(tcsetattr(STDIN_FILENO, TCSANOW , &tio) < 0) {
++	#ifdef  DEBUG
++		kik_warn_printf( KIK_DEBUG_TAG " tcsetattr() failed.\n") ;
++	#endif
+ 	}
+ 
+ 	return  pid ;
diff --git a/x11/mlterm/patches/patch-ae b/x11/mlterm/patches/patch-ae
new file mode 100644
index 00000000000..3d687397435
--- /dev/null
+++ b/x11/mlterm/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2005/03/06 17:50:49 hira Exp $
+
+--- kiklib/src/kik_pty_bsd.c.orig	2005-03-05 22:05:13.000000000 +0900
++++ kiklib/src/kik_pty_bsd.c	2005-03-05 22:05:25.000000000 +0900
+@@ -111,9 +111,9 @@
+ 			{
+ 				if( errno == ENOENT)
+ 				{
+-					/* out of ptys */
++					/* try next pty*/
+ 					
+-					return  0 ;
++					continue;
+ 				}
+ 			}
+ 			else