Update mlterm to 3.0.1.

Based on PR#43822 by YAMASHIRO, Jun.
Additional clean up by me.

pkgsrc changes:
* set LICENSE=modified-bsd (with uim option, gnu-lgpl-v2 additionally).
* add m17nlib option.

ver 3.0.1
* Improvements for performance of changing 256 colors by
  "\x1b]4;N;rgb:RR/GG/BB\x07" sequence. (Thanks to Konosuke Watanabe san)
* Support "ESC[9Nm" and "ESC[10Nm" sequences.
* Add --button3/button3_behavior option. (If "menu1" is specified, pressing
  button3 shows conf_menu_path_1 program (mlterm-menu) like gnome-terminal.)
* Add "Copy" & "Paste" menus to mlterm-menu.
* Improvements for compatibility with xterm about RGB of system colors.
* Add 'col_size_of_width_a' to configuration protocol. (doc/en/PROTOCOL)
* Merge SF patches:
  #2988801, #2987646 (Thanks to Ahmed El-Mahmoudy)
* Other bug fixes:
  #2818015(partly),#2818018 (Thanks to Thomas Wolff)

ver 3.0.0
* Support 256 colors. (Thanks to Shinichiro Hamaji san)
* Character convertion tables are separated from libmkf library.
* Support win32(Windows 2000-XP) native GUI.
  ('--with-gui=win32' in mingw, msys and cygwin)
* Support font and color configuration protocol.
  (doc/en/PROTOCOL.font,PROTOCOL.color)
* Change 'aafont' format as follows. (Elements in parentheses are optional.)
  [Family]-[Encoding](:[Percentage])
  => [Family]( [Weight] [Slant] [Size]-[Encoding]:[Percentage])
* Add 'DEFAULT' key which specifies fonts used by default
  for font configuration files.
* Add --maxptys option.
* Add 'mlclient', 'mlclientx', 'static_backscroll_mode' and 'type_engine' to
  configuration protocol. (doc/en/PROTOCOL)
* Add 'mlclientx' command.
* Merge SF patches -
  #1574764 (Thanks to Christian Biere)
  #        (Thanks to Frederic Heulin)
  #2879800 (Thanks to Kouichi Kusanagi san)
* Other bug fixes:
  #1999220 (Thanks to Christian Biere)

ver 2.9.4
* Arabic translation of mlconfig [Khaled Hosny]
* Selected region can be expanded by right-clicking [minami]
  (Thanks to ssakane)
* New config key string "title" to allow change pty title [minami]
* Set DISPLAY correctly for ptys opened by -P option [nokada] (SF Bug #1534313)
* Fixed compile errors with gcc 4.3 [mfabian]
* Fixed a potentiol off-by-one bug [mfabian] (Thanks to Dominique Leuenberger)
* Fixed compile errors on biarch systems [Kenshi Muto] (Debian Bug #396532)
* Plugged file-desctiptor leaks [Christian Biere] (SF Patch #1576044)
* Made "restore cursor" work properly with alternate screens [minami]
  (SF Bug#1472143)
* Fixed broken handling of Atom [Kusanagi Kouichi]
* Other bug fixes:
 - Debian BUG #329194 [David Kolovratnik]
 - SF Bug #1568596 [nokada]
 - SF Patch #1574241 [Christian Biere]

17 files changed, 31 insertions, 603 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 0123209d480..1220b67e0ea 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.56 2010/09/14 11:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/09/22 09:33:41 obache Exp $
 
-DISTNAME=	mlterm-2.9.3
-PKGREVISION=	4
+DISTNAME=	mlterm-3.0.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
 MAINTAINER=	uebayasi@NetBSD.org,hira@NetBSD.org
 HOMEPAGE=	http://mlterm.sourceforge.net/
 COMMENT=	Multilingual terminal emulator
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
@@ -27,12 +27,12 @@ EGDIR=			${PREFIX}/share/examples/mlterm
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
-
 CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
 .include "options.mk"
 
@@ -40,11 +40,7 @@ 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 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
+			*/*/*/Makefile.in man/mlterm.1
 SUBST_SED.link=		-e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS}|g'
 SUBST_SED.link+=	-e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS}|g'
 SUBST_SED.link+=	-e 's|/usr/local/|${PREFIX}/|g'
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index c9f06c4352a..9ec85844b4e 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,17 +1,23 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:25:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/09/22 09:33:41 obache Exp $
 bin/mlcc
 bin/mlclient
+bin/mlclientx
 bin/mlterm
 lib/libkik.la
 lib/libmkf.la
+lib/mkf/libmkf_8bits.la
+lib/mkf/libmkf_jajp.la
+lib/mkf/libmkf_kokr.la
+lib/mkf/libmkf_zh.la
 lib/mlterm/libathena.la
 lib/mlterm/libim-kbd.la
-${PLIST.uim}lib/mlterm/libim-uim.la
 lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 lib/mlterm/libsample.la
 lib/mlterm/libsample2.la
+${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
+${PLIST.uim}lib/mlterm/libim-uim.la
 libexec/mlconfig
 libexec/mlterm-menu
 man/man1/mlclient.1
@@ -28,6 +34,7 @@ share/examples/mlterm/tfont
 share/examples/mlterm/vaafont
 share/examples/mlterm/vfont
 share/examples/mlterm/xim
+share/locale/ar/LC_MESSAGES/mlconfig.mo
 share/locale/de/LC_MESSAGES/mlconfig.mo
 share/locale/ja/LC_MESSAGES/mlconfig.mo
 share/locale/vi/LC_MESSAGES/mlconfig.mo
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 55d273b4418..a8929cf1cea 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,19 +1,6 @@
-$NetBSD: distinfo,v 1.19 2008/10/25 16:29:55 uebayasi Exp $
+$NetBSD: distinfo,v 1.20 2010/09/22 09:33:41 obache Exp $
 
-SHA1 (mlterm-2.9.3.tar.gz) = 65ba5a7bd83accf7f621f84b84debb35c8f215ef
-RMD160 (mlterm-2.9.3.tar.gz) = 27f4381a8b8b68b07e53bbeb422581beb7527b48
-Size (mlterm-2.9.3.tar.gz) = 1984977 bytes
-SHA1 (patch-ad) = 4f6ef642002baa13bc4b7578cda0e45888fed27f
+SHA1 (mlterm-3.0.1.tar.gz) = fd2be79969fc094da81776ea9b5a12f08a2499d4
+RMD160 (mlterm-3.0.1.tar.gz) = 987b82f48c8a4c8e1419a7563f77c4beb37b1f34
+Size (mlterm-3.0.1.tar.gz) = 2645619 bytes
 SHA1 (patch-ae) = fde46b06d0dfb2c296c91a69e9e1f8ff11d68766
-SHA1 (patch-af) = b9947c2a817093b71e3e91312bac173d5106c306
-SHA1 (patch-ag) = 7f2ff30719dd9baecda31627b45f9516225ec602
-SHA1 (patch-ah) = 93b0ad1445faec91d29f3a01b69d9ac0f4ddfe90
-SHA1 (patch-ai) = c7dc11cdf4851e2e4018a5ec3111dd9f9ceffa63
-SHA1 (patch-aj) = ff103698ff544fa22fa660268dccb51b8b9e8bda
-SHA1 (patch-ak) = 3b06cfc41ed12be11ea81d097f0592bb6b977e29
-SHA1 (patch-al) = 6b87b81e403a3fac9794c666c1e0260a3d5b5bd4
-SHA1 (patch-am) = 83684bfa15e5596abddef92cf994bb92b9f21990
-SHA1 (patch-an) = 156b8ebf5c7fdf68c39df7076849a05a90eb7e5a
-SHA1 (patch-ao) = 680ac866197202e09c25d93b20a7e3b700f38370
-SHA1 (patch-ap) = 3cfe668a591623d45043621813a68d8958cb81c7
-SHA1 (patch-aq) = 6594315724a0ab34fb5af26c4bc59a6673c99340
diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk
index 1786a6ded5a..05426b43feb 100644
--- a/x11/mlterm/options.mk
+++ b/x11/mlterm/options.mk
@@ -1,16 +1,24 @@
-# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2010/09/22 09:33:41 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS=	uim xft2
+PKG_SUPPORTED_OPTIONS=	m17nlib uim xft2
 PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		uim
+PLIST_VARS+=		m17nlib uim
+
+.if !empty(PKG_OPTIONS:Mm17nlib)
+.include "../../devel/m17n-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-m17nlib
+PLIST.m17nlib=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Muim)
 .include "../../inputmethod/uim/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-uim
 PLIST.uim=		yes
+LICENSE+=		AND gnu-lgpl-v2
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft2)
diff --git a/x11/mlterm/patches/patch-ad b/x11/mlterm/patches/patch-ad
deleted file mode 100644
index de6b3ef7229..00000000000
--- a/x11/mlterm/patches/patch-ad
+++ /dev/null
@@ -1,151 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/12/19 07:53:57 wiz Exp $
-
---- kiklib/src/kik_pty_streams.c.orig	2005-11-21 15:24:03.000000000 +0100
-+++ kiklib/src/kik_pty_streams.c	2006-12-16 00:04:11.000000000 +0100
-@@ -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"
-@@ -75,6 +79,7 @@
- 		kik_msg_printf( "Unable to open a master pseudo-terminal device.\n") ;
- 		return  -1;
- 	}
-+	kik_file_set_cloexec( *master) ;
- 	/*
- 	 * The behaviour of the grantpt() function is unspecified
- 	 * if the application has installed a signal handler to catch SIGCHLD signals.
-@@ -104,13 +109,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.
- 	 */
-@@ -209,79 +231,16 @@
- 		}
- 	}
- 
--	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
- 	}
-+	
-+	kik_file_set_cloexec( *slave) ;
- 
- 	return  pid ;
- }
diff --git a/x11/mlterm/patches/patch-af b/x11/mlterm/patches/patch-af
deleted file mode 100644
index 1aea196dad6..00000000000
--- a/x11/mlterm/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/06/11 15:00:04 hira Exp $
-
---- etc/Makefile.in.orig	2004-09-12 14:59:43.000000000 +0900
-+++ etc/Makefile.in	2005-06-11 01:24:16.000000000 +0900
-@@ -1,7 +1,8 @@
- top_builddir = ..
- top_srcdir = @top_srcdir@
- prefix = @prefix@
--sysconfdir = @sysconfdir@
-+datadir = @datadir@
-+sysconfdir = $(datadir)/examples
- 
- DESTDIR=
- SYSCONFDIR=$(DESTDIR)$(sysconfdir)/mlterm
diff --git a/x11/mlterm/patches/patch-ag b/x11/mlterm/patches/patch-ag
deleted file mode 100644
index 5f6e399d7e0..00000000000
--- a/x11/mlterm/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/06/11 15:00:04 hira Exp $
-
---- contrib/tool/mlterm-menu/Makefile.in.orig	2005-06-11 01:31:46.000000000 +0900
-+++ contrib/tool/mlterm-menu/Makefile.in	2005-06-11 01:36:34.000000000 +0900
-@@ -15,6 +15,7 @@
- DESTDIR =
- LIBEXECDIR = $(DESTDIR)$(libexecdir)
- SYSCONFDIR = $(DESTDIR)$(sysconfdir)
-+mlconfdir = $(DESTDIR)$(datadir)/examples/mlterm
- 
- LKIK = @KIK_LIBS@
- 
-@@ -45,15 +46,15 @@
- .c.o:
- 	$(CC) $(DEFS) $(CFLAGS) -c $<
- 
--install: $(LIBEXECDIR) $(SYSCONFDIR)/mlterm
-+install: $(LIBEXECDIR) $(mlconfdir)
- 	$(LIBTOOL_INSTALL) -m 755 mlterm-menu $(LIBEXECDIR)
--	$(INSTALL) -m 644 ${top_srcdir}/contrib/tool/mlterm-menu/menu $(SYSCONFDIR)/mlterm
-+	$(INSTALL) -m 644 ${top_srcdir}/contrib/tool/mlterm-menu/menu $(mlconfdir)
- 
- $(LIBEXECDIR):
- 	mkdir -p $(LIBEXECDIR)
- 
--$(SYSCONFDIR)/mlterm:
--	mkdir -p $(SYSCONFDIR)/mlterm
-+$(mlconfdir):
-+	mkdir -p $(mlconfdir)
- 
- clean:
- 	rm -rf $(OBJS) mlterm-menu mlterm-menu.exe *.core .libs
diff --git a/x11/mlterm/patches/patch-ah b/x11/mlterm/patches/patch-ah
deleted file mode 100644
index fc9cbbb92f2..00000000000
--- a/x11/mlterm/patches/patch-ah
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-safer DIGIT_STR_LEN().
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/kiklib/src/kik_util.h?r1=1.4&r2=1.5&view=patch
-
---- kiklib/src/kik_util.h.orig	2002/02/02 09:20:27	1.4
-+++ kiklib/src/kik_util.h	2006/10/13 16:13:42	1.5
-@@ -10,19 +10,20 @@
- 
- #define  K_MIN(n1,n2)  ((n1) > (n2) ? (n2) : (n1))
- 
--/*
-- * char  : 0 - 256 (3)
-- * int16 : 0 - 65536 (5)
-- * int32 : 0 - 4294967296 (10)
-- * int64 : 0 - 18446744073709551616 (20)
-+/* TYPE: MIN(signed) -- MAX(unsigned) (number of bytes needed)
-+ * char  : -128 -- 256 (4)
-+ * int16 : -32768 -- 65536 (6)
-+ * int32 : -2147483648 -- 4294967296 (11)
-+ * int64 : -9223372036854775808 -- 18446744073709551616 (20)
-  * 
-- * 40 is evenly selected in other cases just to be sure.
-+ * Since log10(2^8) = 2.4..., (sizeof(n)*3) is large enough
-+ * for all n >= 2.
-  */
- #define  DIGIT_STR_LEN(n)  \
--	((sizeof(n) == 1) ? 3 : \
--	(sizeof(n) == 2) ? 5 : \
--	(sizeof(n) == 4) ? 10 : \
--	(sizeof(n) == 8) ? 20 : 40)
-+	((sizeof(n) == 1) ? 4 : \
-+	(sizeof(n) == 2) ? 6 : \
-+	(sizeof(n) == 4) ? 11 : \
-+	(sizeof(n) == 8) ? 20 : (sizeof(n)*3))
- 
- 
- #endif
diff --git a/x11/mlterm/patches/patch-ai b/x11/mlterm/patches/patch-ai
deleted file mode 100644
index 2a7da450536..00000000000
--- a/x11/mlterm/patches/patch-ai
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/kiklib/src/kik_file.c?r1=1.5&r2=1.6&view=patch
-
---- kiklib/src/kik_file.c.orig	2003-01-12 12:34:31.000000000 +0000
-+++ kiklib/src/kik_file.c
-@@ -3,4 +3,5 @@
-  */
- 
-+#include  <fcntl.h>		/* fcntl() */
- #include  "kik_file.h"
- 
-@@ -201,2 +202,42 @@ kik_file_unlock(
- 
- #endif
-+
-+int
-+kik_file_set_cloexec(
-+	int fd
-+	)
-+{
-+	int  old_flags ;
-+	
-+	old_flags = fcntl( fd, F_GETFD) ;
-+	if( old_flags == -1)
-+	{
-+		return  0 ;
-+	}
-+	
-+	if( !(old_flags & FD_CLOEXEC)
-+	 && (fcntl( fd, F_SETFD, old_flags|FD_CLOEXEC) == -1) )
-+	{
-+		return  0 ;
-+	}
-+	return  1 ;
-+}
-+
-+kik_file_unset_cloexec(
-+	int fd
-+	)
-+{
-+  	int  old_flags ;
-+
-+	old_flags = fcntl( fd, F_GETFD) ;
-+        if( old_flags == -1)
-+        {
-+		return  0 ;
-+	}
-+	if( (old_flags & FD_CLOEXEC)
-+	 && (fcntl( fd, F_SETFD, old_flags & (~FD_CLOEXEC)) == -1) )
-+        {
-+		return  0 ;
-+	}
-+	return  1 ;
-+}
diff --git a/x11/mlterm/patches/patch-aj b/x11/mlterm/patches/patch-aj
deleted file mode 100644
index e2cbf465311..00000000000
--- a/x11/mlterm/patches/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/kiklib/src/kik_file.h?r1=1.5&r2=1.6&view=patch
-
---- kiklib/src/kik_file.h.orig	2003/01/12 12:34:31	1.5
-+++ kiklib/src/kik_file.h	2006/10/19 14:41:51	1.6
-@@ -33,5 +33,8 @@
- 
- int  kik_file_unlock( int  fd) ;
- 
-+int  kik_file_set_cloexec( int  fd) ;
-+
-+int  kik_file_unset_cloexec( int  fd) ;
- 
- #endif
diff --git a/x11/mlterm/patches/patch-ak b/x11/mlterm/patches/patch-ak
deleted file mode 100644
index 328465857c1..00000000000
--- a/x11/mlterm/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/kiklib/src/kik_pty_bsd.c?r1=1.9&r2=1.10&view=patch
-
---- kiklib/src/kik_pty_bsd.c.orig	2003/03/08 03:19:29	1.9
-+++ kiklib/src/kik_pty_bsd.c	2006/10/19 14:41:51	1.10
-@@ -118,6 +118,7 @@
- 			}
- 			else
- 			{
-+				kik_file_set_cloexec( *master) ;
- 				/*
- 				 * we succeeded to open pty master.
- 				 * opening pty slave in succession. 
-@@ -136,6 +137,7 @@
- 					}
- 					else
- 					{
-+						kik_file_set_cloexec( *slave) ;
- 						return  1 ;
- 					}
- 				}
-@@ -195,7 +197,6 @@
- 	/*
- 	 * parent process
- 	 */
--
- 	/*
- 	 * delaying.
- 	 */
-@@ -301,5 +302,7 @@
- 	#endif
- 	}
- 	
-+	kik_file_set_cloexec( *slave) ;	
-+	
- 	return  pid ;
- }
diff --git a/x11/mlterm/patches/patch-al b/x11/mlterm/patches/patch-al
deleted file mode 100644
index b583120a618..00000000000
--- a/x11/mlterm/patches/patch-al
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/xwindow/x_xim.c?r1=1.9&r2=1.11&view=patch
-
---- xwindow/x_xim.c.orig	2005/02/10 15:15:08	1.9
-+++ xwindow/x_xim.c	2006/10/23 13:09:36	1.11
-@@ -5,6 +5,8 @@
- 
- #include  "x_xim.h"
- 
- #include  <stdio.h>		/* sprintf */
- #include  <string.h>		/* strcmp/memset */
-+#include  <unistd.h>	 	/* dup/close */
-+#include  <kiklib/kik_file.h>	/* kik_set_file_cloexec */
- #include  <kiklib/kik_debug.h>
-@@ -121,6 +123,7 @@
- 	char *  xmod ;
- 	char *  cur_locale ;
- 	int  result ;
-+	int  next_fd ; /* to deal with brain-dead XIM implemantations */
- 
- 	/* 4 is the length of "@im=" */
- 	if( ( xmod = alloca( 4 + strlen( xim->name) + 1)) == NULL)
-@@ -154,6 +157,12 @@
- 
- 	result = 0 ;
- 
-+	next_fd = dup( 0) ;
-+	if( next_fd != -1)
-+	{
-+		/* remember the lowest unused fd */
-+		close( next_fd) ;
-+	}	
- 	if( XSetLocaleModifiers(xmod) && ( xim->im = XOpenIM( display , NULL , NULL , NULL)))
- 	{
- 		if( ( xim->encoding = ml_get_char_encoding( kik_get_codeset())) == ML_UNKNOWN_ENCODING ||
-@@ -172,7 +181,12 @@
- 			result = 1 ;
- 		}
- 	}
--	
-+	if( next_fd > 0)
-+	{
-+		/* if XOpenIM() internally opens a fd,
-+		 * we should close it on exec() */
-+		kik_file_set_cloexec( next_fd) ;
-+	}
- 	if( cur_locale)
- 	{
- 		/* restoring */
diff --git a/x11/mlterm/patches/patch-am b/x11/mlterm/patches/patch-am
deleted file mode 100644
index 83cb23bff69..00000000000
--- a/x11/mlterm/patches/patch-am
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/mlterm/ml_config_menu.c?r1=1.6&r2=1.7&view=patch
-
---- mlterm/ml_config_menu.c.orig	2003/09/16 03:18:31	1.6
-+++ mlterm/ml_config_menu.c	2006/10/19 14:41:51	1.7
-@@ -33,6 +33,7 @@
- 	if( config_menu->pid == pid)
- 	{
- 		config_menu->pid = 0 ;
-+		close( config_menu->fd) ;
- 		config_menu->fd = -1 ;
- 	}
- }
-@@ -83,6 +84,12 @@
- 		return  0 ;
- 	}
- 
-+	if( !kik_file_unset_cloexec( pty_fd))
-+	{
-+		/* configulators require an inherited pty. */
-+		return  0 ;
-+	}
-+
- 	if( pipe( fds) == -1)
- 	{
- 		return  0 ;
-@@ -131,8 +138,14 @@
- 
- 		close( fds[1]) ;
- 
--		if( dup2( fds[0] , STDIN_FILENO) == -1 || dup2( pty_fd , STDOUT_FILENO) == -1 ||
--			execv( cmd_path , args) == -1)
-+		/* for configulators,
-+		 * STDIN => to read replys from mlterm
-+		 * STDOUT => to write the "master" side of pty
-+		 * STDERR => is retained to be the mlterm's STDERR
-+		 */
-+		if( dup2( fds[0] , STDIN_FILENO) == -1
-+		 || dup2( pty_fd , STDOUT_FILENO) == -1
-+	       	 || execv( cmd_path , args) == -1)
- 		{
- 			/* failed */
- 
-@@ -148,6 +161,9 @@
- 
- 	config_menu->fd = fds[1] ;
- 	config_menu->pid = pid ;
-+	
-+	kik_file_set_cloexec( pty_fd) ;
-+	kik_file_set_cloexec( config_menu->fd) ;
- 
- 	return  1 ;
- }
diff --git a/x11/mlterm/patches/patch-an b/x11/mlterm/patches/patch-an
deleted file mode 100644
index d74dc627b2f..00000000000
--- a/x11/mlterm/patches/patch-an
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/xwindow/x_display.c?r1=1.4&r2=1.5&view=patch
-
---- xwindow/x_display.c.orig	2003/12/09 11:56:13	1.4
-+++ xwindow/x_display.c	2006/10/19 14:41:51	1.5
-@@ -7,6 +7,7 @@
- #include  <kiklib/kik_debug.h>
- #include  <kiklib/kik_mem.h>
- #include  <kiklib/kik_str.h>	/* strdup */
-+#include  <kiklib/kik_file.h>	/* kik_file_set_cloexec */
- 
- #include  "x_xim.h"
- #include  "x_picture.h"
-@@ -39,6 +40,9 @@
- 		goto  error1 ;
- 	}
- 
-+	/* set close-on-exec flag on the socket connected to X. */
-+	kik_file_set_cloexec( XConnectionNumber( disp->display));
-+
- 	if( ( disp->name = strdup( name)) == NULL)
- 	{
- 		goto  error2 ;
diff --git a/x11/mlterm/patches/patch-ao b/x11/mlterm/patches/patch-ao
deleted file mode 100644
index 4cc77582bfd..00000000000
--- a/x11/mlterm/patches/patch-ao
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/12/19 07:53:57 wiz Exp $
-
-plugged fd leaks.
-
-http://mlterm.cvs.sourceforge.net/mlterm/mlterm/xwindow/x_term_manager.c?r1=1.93&r2=1.95&view=patch
-
---- xwindow/x_term_manager.c.orig	2006/09/30 16:09:44	1.93
-+++ xwindow/x_term_manager.c	2006/11/20 11:22:34	1.95
-@@ -872,7 +872,8 @@
- 	{
- 		return  -1 ;
- 	}
--
-+	kik_file_set_cloexec( sock_fd);
-+	
- 	while( bind( sock_fd , (struct sockaddr *) &servaddr , sizeof( servaddr)) < 0)
- 	{
- 		if( errno == EADDRINUSE)
-@@ -993,7 +994,7 @@
- 	 * If this flag off, this fd remained open until the child process forked in
- 	 * open_screen_intern()(ml_term_open_pty()) close it.
- 	 */
--	fcntl( fd , F_SETFD , 1) ;
-+	kik_file_set_cloexec( fd) ;
- 
- 	if( ( fp = fdopen( fd , "r+")) == NULL)
- 	{
-@@ -1855,6 +1856,7 @@
- 		{
- 			additional_fds[i].fd = fd ;
- 			additional_fds[i].handler = handler ;
-+			kik_file_set_cloexec( fd);
- 
- 			return  0 ;
- 		}
diff --git a/x11/mlterm/patches/patch-ap b/x11/mlterm/patches/patch-ap
deleted file mode 100644
index e3d6839df40..00000000000
--- a/x11/mlterm/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/12/28 11:10:08 hira Exp $
-
---- contrib/scrollbar/extra/Makefile.in.orig	2006-12-28 15:23:38.000000000 +0900
-+++ contrib/scrollbar/extra/Makefile.in	2006-12-28 15:39:29.000000000 +0900
-@@ -29,26 +29,22 @@
- 
- all: athena motif mozmodern next
- athena: $(ATHENA_OBJ)
--	$(LIBTOOL_LINK) -o libathena.la $(ATHENA_OBJ:.o=.lo) \
--	-rpath $(libdir)/mlterm \
-+	$(LIBTOOL_LINK) -o libathena.la $(ATHENA_OBJ:.o=.lo) -rpath $(LIBDIR) \
- 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
- 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
- 
- motif: $(MOTIF_OBJ)
--	$(LIBTOOL_LINK) -o libmotif.la $(MOTIF_OBJ:.o=.lo) \
--	-rpath $(libdir)/mlterm \
-+	$(LIBTOOL_LINK) -o libmotif.la $(MOTIF_OBJ:.o=.lo) -rpath $(LIBDIR) \
- 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
- 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
- 
- mozmodern: $(MOZMODERN_OBJ)
--	$(LIBTOOL_LINK) -o libmozmodern.la $(MOZMODERN_OBJ:.o=.lo) \
--	-rpath $(libdir)/mlterm \
-+	$(LIBTOOL_LINK) -o libmozmodern.la $(MOZMODERN_OBJ:.o=.lo) -rpath $(LIBDIR) \
- 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
- 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
- 
- next: $(NEXT_OBJ)
--	$(LIBTOOL_LINK) -o libnext.la $(NEXT_OBJ:.o=.lo) \
--	-rpath $(libdir)/mlterm \
-+	$(LIBTOOL_LINK) -o libnext.la $(NEXT_OBJ:.o=.lo) -rpath $(LIBDIR) \
- 	-module -avoid-version @NO_UNDEFINED_FLAG@ \
- 	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
- 
diff --git a/x11/mlterm/patches/patch-aq b/x11/mlterm/patches/patch-aq
deleted file mode 100644
index 6968a04dcbc..00000000000
--- a/x11/mlterm/patches/patch-aq
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2008/10/25 16:29:55 uebayasi Exp $
-
---- inputmethod/uim/im_uim.c.orig	2006-04-05 19:47:22.000000000 +0900
-+++ inputmethod/uim/im_uim.c	2008-10-26 01:09:33.000000000 +0900
-@@ -49,6 +49,11 @@
- #define  IM_UIM_DEBUG  1
- #endif
- 
-+/* PKGSRC: BUFSIZ undeclared when PKG_OPTIONS.mlterm=uim */
-+#ifndef BUFSIZ
-+#define	BUFSIZ	1024
-+#endif
-+
- 
- /*
-  * When uim encoding is the same as terminal, parser_uim and conv are NULL,