Update mlterm to 3.1.2. (patch-ae has been integrated into upstream)

Changes from 3.0.6 noted in doc/en/ReleaseNote:

ver 3.1.2
* Support extended mouse tracking mode.
  (CSI ? 1006 h and CSI ? 1006 l / CSI ? 1015 h and CSI ? 1015 l)
* Support sixel graphics sequence partially. (DCS .. q .. ST)
  (configure with --enable-sixel option.)
* Support FocusIn/FocusOut event tracking. (CSI ? 1004 h and CSI ? 1004 l)
* Support inputmethod/kbd in win32.
* Add "add_picture", "remove_picture" and "close_pty" commands to
  configuration protocol.
* Add "hide_underline" option.
* Merge SF patches:
  #3524577 (Thanks to Ahmed El-Mahmoudy)
  #3524578 (Install mlterm tools to $(libexecdir)/mlterm instead of $(libexecdir))
  (Thanks to Ahmed El-Mahmoudy)
  patch-ae in NetBSD pkgsrc x11/mlterm.
* Bug fixes:
  Fix a bug which disabled "bd_color" and "ul_color" options in reverse characters.
  (Thanks to Andi Cristian Serbanescu)
  Fix an ibus bug which causes segmentation fault if ibus daemon is not found.
  Fix a bug which could cause failure of opening a new window over ssh connection.
  Fix a bug which causes infinite loop if large OSC sequence is received.
  (Thanks to Koie Hidetaka san)
  Fix a bug which disabled mlconfig and mlterm-menu etc to start if multiple screens opened.

ver 3.1.1
* Fix a bug which caused segfault in 64bit Linux.
* Enable to change 0-15 colors by OSC 4 sequence.
* Enable to specify --sep, --button3, --clip, --restart and --logmsg options
  for mlclient.

ver 3.1.0
* Support extended mouse tracking mode. (CSI ? 1005 h and CSI ? 1005 l)
* Support "use_variable_column_width" and "letter_space" options in win32.
* Support multiple numeric parameters of SM, RM, DECSET and DESRST sequence.
  (Thanks to Iwamoto Kouichi san)
* Support BiDi mirroring. (Thanks to Khaled Hosny)
* Add "blink_cursor" option.
* Add "inner_border" option.
* Add "bd_color"(rxvt style) and "ul_color" options. (equivalent to colorBD and colorUL
  options of xterm and rxvt.)
* Add "cipher_list" for ssh connection.
* Add java version. (experimental)
* Add VT52 emulation. (configure with --enable-vt52 option.)
* Remove IIIMF plugin.
* Bug fixes:
  SF Bug #2878878 (Thanks to Kusanagi Kouichi san)
  SF Bug #3481552 (Thanks to Kobayashi Hiroaki san)
  SF Bug #3487163 (Thanks to raghavkrishna)
  SF Bug #3509743 (Thanks to Thomas Wolff)
  SF Bug #3509744 (Thanks to Thomas Wolff)
  SF Bug #3512067 (Thanks to phcoder)
  Fix a bug which didn't clear margin area after visual bell.
  Fix a bug which disabled scrolling in vertical mode in win32.
  Fix a bug which disabled wheel mouse in win32.
  Fix a bug of reverse-video algorithm of highlighted cursor or selected text.
  (Thanks to Andi Cristian Serbanescu)

ver 3.0.11
* Support CSI 8 t and CSI 4 t sequence partially.
* Change the file to output messages by --logmsg option
  from ~/.mlterm/msg[pid].log to ~/.mlterm/msg.log.
* If ~/.config/mlterm exists, use it as a user config directory instead of ~/.mlterm.
* Support VtePty partially.
* Support mod_meta_mode option in win32.
* Support combination of Control+key in win32.
* Bug fixes:
  Fix a bug which erased border of candidate or status screen of uim or kbd.
  SF Bug #3464878 (Thanks to Daniel Lublin)

ver 3.0.10
* Fix a problem which could cause error in loading a picture file.
* Merge SF patches:
  #3459267 (Thanks to Kusanagi Kouichi san)

ver 3.0.9
* Add auto-restart feature. ("auto_restart" option)
* Support OSC 52 sequence which is allowed by "allow_osc52=true" in ~/.mlterm/main
  or SWITCH_OSC52 shortcut key.
* -V option is no longer necessary (and not automatically turned on) to show
  indic characters.
* Improve performance of cairo module and libvte.
* Improve processing key events of ibus.
* Support iBUS 1.4.
* Add experimental support for GTK+-3.0. (configure --with-gtk=2.0|3.0)
* Reverse behavior of "alpha" option.
* Add "alpha" box to mlconfig.
* Bug fixes:
  Fix strange behavior in selecting indic characters.
  Fix a libvte's problem which gets gnome-terminal not to be resized even if font size is changed.
  Fix a problem which disabled hinting of font metrics in cairo.
  Fix a problem which could cause segv in selecting region.
  Revive "Brightness", "Contrast" and "Gamma" boxes of mlconfig.

ver 3.0.8
* Change default value of "use_ind" option from true to false.
* Merge SF Patches:
  #3412453 (Thanks to Ahmed El-Mahmoudy)
* Bug fixes:
  Fix wrong origin setting by CSI ? 6 l. (Thanks to Konosuke Watanabe san)
  Fix a problem which causes segmentation fault if both -J and -bi options are specified.

ver 3.0.7
* Support bracketed paste mode. (CSI ? 2004 h , CSI ? 2004 l)
* Support Button-event and Any-event mouse tracking.
  (CSI ? 1002 h , CSI ? 1002 l , CSI ? 1003 h , CSI ? 1003 l)
* Support scp using libssh2.
  (Add "SSH SCP" front-end to mlconfig and "mlscp.sh" command line tool.)
* Support DEC Special characters in win32. ("Tera Special" font is necessary.)
* Support application escape mode. (CSI ? 7727 h , CSI ? 7727 l)
* Support OSC 10, OSC 11 and OSC 12.
* Add "logging_msg" option whose default value is true.
* Support dynamic loading of BiDi and Indic modules.
* Support dynamic loading of xft and cairo modules.
* Integrate OSC 5384 - 5391 to OSC 5379 - 5383 and drop OSC 5382.
* Change format of "select_pty", "search_prev", "search_next"  "snapshot" in
  OSC 5379 sequence as follows.
  select_pty=<pty dev name> => select_pty <pty dev name>
  search_prev=<pattern> => search_prev <pattern>
  search_next=<pattern> => search_next <pattern>
  snapshot=<encoding name>:<file name> => snapshot <file name> <encoding name>
* Support mlconfig in connecting a ssh server by libssh2.
* Improve the way of determining width of cairo fonts.
* 'make uninstall' is available.
* Other bug fixes:
  Fix a problem which causes leak of graphic context resource in libvte.
  Fix a problem which can minimize window in some themes in win32. (Thanks to Iwamoto Kouichi san)
  Fix wrong position in receiving WM_MOUSEWHEEL event in win32. (Thanks to Iwamoto Kouichi san)
  Fix illegal mouse reports if mouse goes outside the window. (Thanks to Iwamoto Kouichi san)
  Fix double free in bidi rendering. (Thanks to NODA, Kai san)
  Remove "-lvte" in linking libvte.so.

5 files changed, 15 insertions, 30 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 90c3b66a941..176d7bffc65 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2012/03/03 00:14:19 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2012/05/20 06:07:31 tsutsui Exp $
 
-DISTNAME=	mlterm-3.0.6
-PKGREVISION=	3
+DISTNAME=	mlterm-3.1.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 7e88d79d9b1..1ec081dd96b 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.23 2011/05/11 14:50:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.24 2012/05/20 06:07:31 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
 bin/mlterm
 lib/libkik.la
 lib/libmkf.la
+lib/libmlterm_core.la
 lib/mkf/libmkf_8bits.la
 lib/mkf/libmkf_jajp.la
 lib/mkf/libmkf_kokr.la
@@ -13,14 +14,15 @@ lib/mlterm/libathena.la
 lib/mlterm/libim-kbd.la
 ${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
 ${PLIST.uim}lib/mlterm/libim-uim.la
+${PLIST.xft2}lib/mlterm/libtype_xft.la
 lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 lib/mlterm/libsample.la
 lib/mlterm/libsample2.la
-libexec/mlconfig
-libexec/mlimgloader
-libexec/mlterm-menu
+libexec/mlterm/mlconfig
+libexec/mlterm/mlimgloader
+libexec/mlterm/mlterm-menu
 man/man1/mlclient.1
 man/man1/mlterm.1
 share/examples/mlterm/aafont
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index d4d11a57a0f..56972228c4a 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.23 2011/07/27 12:29:09 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2012/05/20 06:07:31 tsutsui Exp $
 
-SHA1 (mlterm-3.0.6.tar.gz) = 867858fa3e6ea6d0c7aecff90d3332881a7db3e8
-RMD160 (mlterm-3.0.6.tar.gz) = 1815061f4e985e1f945d6b7fb1e254349f811cbd
-Size (mlterm-3.0.6.tar.gz) = 3375241 bytes
-SHA1 (patch-ae) = e951a8917470484850cbd755420d7daf84e3ecec
+SHA1 (mlterm-3.1.2.tar.gz) = 9053475c5096a8edc74c537d675ade83066c2d90
+RMD160 (mlterm-3.1.2.tar.gz) = 74465aef938ef04b203cda5fc10688c0abfd6f40
+Size (mlterm-3.1.2.tar.gz) = 4349401 bytes
diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk
index 05426b43feb..6091566ca9e 100644
--- a/x11/mlterm/options.mk
+++ b/x11/mlterm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/09/22 09:33:41 obache Exp $
+# $NetBSD: options.mk,v 1.5 2012/05/20 06:07:31 tsutsui Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mlterm
 PKG_SUPPORTED_OPTIONS=	m17nlib uim xft2
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		m17nlib uim
+PLIST_VARS+=		m17nlib uim xft2
 
 .if !empty(PKG_OPTIONS:Mm17nlib)
 .include "../../devel/m17n-lib/buildlink3.mk"
@@ -23,4 +23,5 @@ LICENSE+=		AND gnu-lgpl-v2
 
 .if !empty(PKG_OPTIONS:Mxft2)
 CONFIGURE_ARGS+=	--with-type-engines=xft
+PLIST.xft2=		yes
 .endif
diff --git a/x11/mlterm/patches/patch-ae b/x11/mlterm/patches/patch-ae
deleted file mode 100644
index 1128e2ee272..00000000000
--- a/x11/mlterm/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/04/10 07:25:37 ryoon Exp $
-
---- kiklib/src/kik_pty_bsd.c.orig	2011-01-01 18:04:15.000000000 +0000
-+++ kiklib/src/kik_pty_bsd.c
-@@ -110,9 +110,9 @@ open_pty(
- 			{
- 				if( errno == ENOENT)
- 				{
--					/* out of ptys */
-+					/* try next pty*/
- 					
--					return  0 ;
-+					continue;
- 				}
- 			}
- 			else