Update mlterm to 3.4.0.

pkgsrc changes:
- add options for cairo and fribidi and enable them and xft2 by default
  per upstream default changes
- also make gdk_pixbuf2 support optional (enabled by default)
- regen a patch to adjust offset
- take over maintainership to reflect reality

Changes noted in doc/en/ReleaseNote:

ver 3.4.0
* Support DEC Locator mode (which is necessary for Xsixel
  (http://github.com/saitoha/xserver-SIXEL)).
* Support CSI > 2 p (for SDL-sixel and Xsixel) which always hides mouse pointer
  even if it moves. (Not compatible with xterm though.)
* Add --point/use_point_size option.
* Support software keyboard on rotated display.
* Support HLS in sixel sequence.
* Change the default mouse pointer on a mlterm window from IDC_ARROW to IDC_IBEAM
  on win32.
* Embed sixel processing to mlterm which is built without --with-imagelib option
  instead of using 'mlimgloader' to improve performance.
* './configure;make install' (without 'make') is available.
* Build with fribidi, xft and cairo by default.
* Change the default value of "type_engine" option from "xcore" to "xft".
  (If you want to use xcore, add "type_engine = xcore" to ~/.mlterm/main.)
* Bug fixes:
  Fix corrupt scrolling within left-right margin which contains full-width characters.
  Fix a bug which disabled to show inline pictures if logsize=unlimited.
  Fix a bug which calls select(2) with an invalid file descriptor after restarting ibus.
  Fix a libvte bug which disabled color configurations on roxterm or sakura.

5 files changed, 48 insertions, 19 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 37e8d41074d..400ead09009 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.110 2014/08/16 04:10:44 tsutsui Exp $
+# $NetBSD: Makefile,v 1.111 2014/11/02 19:38:12 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.8
+DISTNAME=	mlterm-3.4.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
-MAINTAINER=	uebayasi@NetBSD.org
+MAINTAINER=	tsutsui@NetBSD.org
 HOMEPAGE=	http://mlterm.sourceforge.net/
 COMMENT=	Multilingual terminal emulator
 LICENSE=	modified-bsd
@@ -24,7 +24,6 @@ EGDIR=			${PREFIX}/share/examples/mlterm
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 CONFIGURE_ARGS+=	--without-libintl-prefix
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
@@ -76,7 +75,6 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 1a024ab96b9..ad18e8f1e48 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2014/06/01 16:00:30 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.31 2014/11/02 19:38:12 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -12,6 +12,7 @@ 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
 lib/mlterm/libim-kbd.la
 ${PLIST.fb}lib/mlterm/libim-kbd-fb.la
@@ -34,6 +35,7 @@ ${PLIST.ind}lib/mlterm/libind_punjabi.la
 ${PLIST.ind}lib/mlterm/libind_roman.la
 ${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
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index d0a03795bf1..11a1d8a3b52 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.50 2014/08/16 04:10:44 tsutsui Exp $
+$NetBSD: distinfo,v 1.51 2014/11/02 19:38:12 tsutsui Exp $
 
-SHA1 (mlterm-3.3.8.tar.gz) = 2552cb12fe74629b2eb4ae364f6c8751faa34118
-RMD160 (mlterm-3.3.8.tar.gz) = f8914ca27ea467e50458703aa2c643be61ee1871
-Size (mlterm-3.3.8.tar.gz) = 3621297 bytes
-SHA1 (patch-configure) = cdea6c383b7b8d0fdfeef668aacf0e602027b06e
+SHA1 (mlterm-3.4.0.tar.gz) = b30a1fdbdac1acbb3409218038d05d3d1c7bbb81
+RMD160 (mlterm-3.4.0.tar.gz) = 3e3e7c01b6f1defa0b6327dccb75ffa395218014
+Size (mlterm-3.4.0.tar.gz) = 3630918 bytes
+SHA1 (patch-configure) = 30ce9b53fae4689fb0ffb86a3a63a78ef01cb65f
 SHA1 (patch-etc_font-fb) = c9f116aae7640807f4adc4042adc49ddd9805e67
diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk
index 6ec4eaee0fe..5b5945fba19 100644
--- a/x11/mlterm/options.mk
+++ b/x11/mlterm/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.7 2013/05/26 18:18:25 tsutsui Exp $
+# $NetBSD: options.mk,v 1.8 2014/11/02 19:38:12 tsutsui Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS=	ibus libind m17nlib mlterm-fb uim xft2
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS=	cairo fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb uim xft2
+PKG_SUGGESTED_OPTIONS=	cairo fribidi gdk_pixbuf2 xft2
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	mlterm-fb
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		fb ibus ind m17nlib uim xft2
+PLIST_VARS+=		bidi cairo fb ibus ind m17nlib uim xft2
 
 .if !empty(PKG_OPTIONS:Mmlterm-fb)
 CONFIGURE_ARGS+=	--with-gui=xlib,fb
@@ -18,6 +18,25 @@ SPECIAL_PERMS+=		${PREFIX:Q}/bin/mlterm-fb ${SETUID_ROOT_PERMS}
 CONF_FILES+=		${EGDIR}/font-fb ${PKG_SYSCONFDIR}/font-fb
 .endif
 
+.if !empty(PKG_OPTIONS:Mcairo)
+.include "../../graphics/cairo/buildlink3.mk"
+PLIST.cairo=		yes
+.else
+.endif
+
+.if !empty(PKG_OPTIONS:Mfribidi)
+.include "../../converters/fribidi/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-fribidi
+PLIST.bidi=		yes
+.else
+CONFIGURE_ARGS+=	--disable-fribidi
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdk_pixbuf2)
+CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mibus)
 .include "../../inputmethod/ibus/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-ibus
@@ -44,6 +63,16 @@ LICENSE+=		AND gnu-lgpl-v2
 .endif
 
 .if !empty(PKG_OPTIONS:Mxft2)
-CONFIGURE_ARGS+=	--with-type-engines=xft
+.include "../../x11/libXft/buildlink3.mk"
 PLIST.xft2=		yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mcairo) && !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=	--with-type-engines=xcore,xft,cairo
+.elif !empty(PKG_OPTIONS:Mcairo)
+CONFIGURE_ARGS+=	--with-type-engines=xcore,cairo
+.elif !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=	--with-type-engines=xcore,xft
+.else
+CONFIGURE_ARGS+=	--with-type-engines=xcore
+.endif
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 8503c205fd3..0f017707607 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.9 2014/08/16 04:10:44 tsutsui Exp $
+$NetBSD: patch-configure,v 1.10 2014/11/02 19:38:12 tsutsui Exp $
 
 - setuid root is handled by SPECIAL_PERMS in pkgsrc
 
---- configure.orig	2014-08-16 01:06:01.000000000 +0000
+--- configure.orig	2014-10-27 22:26:49.000000000 +0000
 +++ configure
-@@ -21390,7 +21390,7 @@ else
+@@ -21404,7 +21404,7 @@ else
  fi
  
  if test "$gui" = "fb" ; then