Update mlterm to 3.6.1. (leaf package update)

pkgsrc changes:
 - explicitly specify configure options which are changed to default
 - make scim configurable via option.mk (disabled by default)

Changes noted in doc/en/ReleaseNote:

ver 3.6.1
* Support DECDHL and DECDWL.
* Support button event mouse tracking (CSI?1002) and any event mouse tracking (CSI?1003)
  in MacOSX/Cocoa and Android.
* Support blinking cursor in MacOSX/Cocoa.
* Add 'autohide' value to 'scrollbar_mode' option.
* Disable conversion from Unicode to ISCII if use_ctl = false.
* Drop mlterm.ti and mlterm.tc which haven't been maintained recently.
* Build 'extra' and 'pixmap_engine' scrollbars by default.
* Enable following configure options by default.
  --enable-ind, --enable-ssh2, --enable-utmp, --enable-uim, --enable-m17nlib,
  --enable-scim, --enable-ibus, --enable-fcitx, --enable-canna, --enable-wnn
* Support ssh2 connection on framebuffer.
* Set XID of text screen instead of top window as the value of WINDOWID environmental variable.
* Bug fixes:
  Fix a bug which disabled CSI?3h and CSI?3l. (Enbugged at 3.6.0)

4 files changed, 53 insertions, 12 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 687178c21e7..7ccf3eef23a 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.123 2015/11/18 14:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.124 2015/12/19 11:43:24 tsutsui Exp $
 
-DISTNAME=	mlterm-3.6.0
-PKGREVISION=	1
+DISTNAME=	mlterm-3.6.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
@@ -28,6 +27,8 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+# XXX not yet
+CONFIGURE_ARGS+=	--disable-utmp
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 9d11a2a6f24..9c70a89007c 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2015/10/30 15:29:20 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.34 2015/12/19 11:43:24 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -11,6 +11,7 @@ lib/mkf/libmkf_8bits.la
 lib/mkf/libmkf_jajp.la
 lib/mkf/libmkf_kokr.la
 lib/mkf/libmkf_zh.la
+lib/mlterm/libathena.la
 ${PLIST.bidi}lib/mlterm/libctl_bidi.la
 ${PLIST.ind}lib/mlterm/libctl_iscii.la
 ${PLIST.canna}lib/mlterm/libim-canna.la
@@ -21,6 +22,7 @@ lib/mlterm/libim-kbd.la
 ${PLIST.fb}lib/mlterm/libim-kbd-fb.la
 ${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
 ${PLIST.fb}${PLIST.m17nlib}lib/mlterm/libim-m17nlib-fb.la
+${PLIST.scim}lib/mlterm/libim-scim.la
 ${PLIST.uim}lib/mlterm/libim-uim.la
 ${PLIST.fb}${PLIST.uim}lib/mlterm/libim-uim-fb.la
 ${PLIST.wnn}lib/mlterm/libim-wnn.la
@@ -40,6 +42,11 @@ ${PLIST.ind}lib/mlterm/libind_tamil.la
 ${PLIST.ind}lib/mlterm/libind_telugu.la
 ${PLIST.cairo}lib/mlterm/libtype_cairo.la
 ${PLIST.xft2}lib/mlterm/libtype_xft.la
+lib/mlterm/libmotif.la
+lib/mlterm/libmozmodern.la
+lib/mlterm/libnext.la
+lib/mlterm/libpixmap_engine.la
+lib/mlterm/libsample.la
 libexec/mlterm/mlconfig
 libexec/mlterm/mlimgloader
 libexec/mlterm/mlterm-menu
@@ -84,3 +91,15 @@ share/locale/vi/LC_MESSAGES/mlconfig.mo
 share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 ${PLIST.fb}share/mlterm/kbd/kbd.six
 ${PLIST.fb}share/mlterm/kbd/pressed_kbd.six
+share/mlterm/scrollbars/sample3/bg_body.png
+share/mlterm/scrollbars/sample3/bg_bottom.png
+share/mlterm/scrollbars/sample3/bg_top.png
+share/mlterm/scrollbars/sample3/button_down.png
+share/mlterm/scrollbars/sample3/button_down_pressed.png
+share/mlterm/scrollbars/sample3/button_up.png
+share/mlterm/scrollbars/sample3/button_up_pressed.png
+share/mlterm/scrollbars/sample3/rc
+share/mlterm/scrollbars/sample3/slider_body.png
+share/mlterm/scrollbars/sample3/slider_bottom.png
+share/mlterm/scrollbars/sample3/slider_knob.png
+share/mlterm/scrollbars/sample3/slider_top.png
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 03a0c856d70..810b951b39f 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.61 2015/11/04 03:28:49 agc Exp $
+$NetBSD: distinfo,v 1.62 2015/12/19 11:43:24 tsutsui Exp $
 
-SHA1 (mlterm-3.6.0.tar.gz) = a71fd2643e19e96bba9b452620c6ae80bdcce4df
-RMD160 (mlterm-3.6.0.tar.gz) = d3c39a04863d887bb56ce3d5f9404bcf754ff1ad
-SHA512 (mlterm-3.6.0.tar.gz) = c7b57340069613d7b19c1b3175f4b2686021b5e336c762bd04045065d290f413c38b84a5b29fa26cf5c4744d0f021d5b7699c3ea48310f596963dfe51668f495
-Size (mlterm-3.6.0.tar.gz) = 3751065 bytes
+SHA1 (mlterm-3.6.1.tar.gz) = 53ae7f9e41696102adc0b797b9cd28a875ae4e79
+RMD160 (mlterm-3.6.1.tar.gz) = 2463e30ce46429134bd2a967c2cb8a02b9b9c897
+Size (mlterm-3.6.1.tar.gz) = 3756686 bytes
 SHA1 (patch-configure) = 686754205102c2ffeb2456b4fad77f72b1a992a6
 SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk
index aa2f7ba5fc6..faab8ba6670 100644
--- a/x11/mlterm/options.mk
+++ b/x11/mlterm/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2015/06/13 21:25:45 tsutsui Exp $
+# $NetBSD: options.mk,v 1.10 2015/12/19 11:43:24 tsutsui Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS=	cairo canna fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb uim wnn4 xft2
+PKG_SUPPORTED_OPTIONS=	cairo canna fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb scim uim wnn4 xft2
 PKG_SUGGESTED_OPTIONS=	cairo fribidi gdk_pixbuf2 xft2
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	mlterm-fb
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS+=	mlterm-fb
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		bidi cairo canna fb ibus ind m17nlib uim wnn xft2
+PLIST_VARS+=		bidi cairo canna fb ibus ind m17nlib scim uim wnn xft2
 
 .if !empty(PKG_OPTIONS:Mmlterm-fb)
 CONFIGURE_ARGS+=	--with-gui=xlib,fb
@@ -28,6 +28,8 @@ PLIST.cairo=		yes
 .include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-canna
 PLIST.canna=		yes
+.else
+CONFIGURE_ARGS+=	--disable-canna
 .endif
 
 .if !empty(PKG_OPTIONS:Mfribidi)
@@ -47,18 +49,34 @@ CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 .include "../../inputmethod/ibus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-ibus
 PLIST.ibus=		yes
+.else
+CONFIGURE_ARGS+=	--disable-ibus
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibind)
 CONFIGURE_ARGS+=	--enable-ind
 PLIST.ind=		yes
 LICENSE+=		AND gnu-lgpl-v2
+.else
+CONFIGURE_ARGS+=	--disable-ind
 .endif
 
 .if !empty(PKG_OPTIONS:Mm17nlib)
 .include "../../devel/m17n-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-m17nlib
 PLIST.m17nlib=		yes
+.else
+CONFIGURE_ARGS+=	--disable-m17nlib
+.endif
+
+.if !empty(PKG_OPTIONS:Mscim)
+.include "../../inputmethod/scim/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-scim
+PLIST.scim=		yes
+LICENSE+=		AND gnu-lgpl-v2
+USE_LANGUAGES=		c c++
+.else
+CONFIGURE_ARGS+=	--disable-scim
 .endif
 
 .if !empty(PKG_OPTIONS:Muim)
@@ -66,12 +84,16 @@ PLIST.m17nlib=		yes
 CONFIGURE_ARGS+=	--enable-uim
 PLIST.uim=		yes
 LICENSE+=		AND gnu-lgpl-v2
+.else
+CONFIGURE_ARGS+=	--disable-uim
 .endif
 
 .if !empty(PKG_OPTIONS:Mwnn4)
 .include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-wnn
 PLIST.wnn=		yes
+.else
+CONFIGURE_ARGS+=	--disable-wnn
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft2)