Update mlterm to 3.2.0.

In this version, mlterm now supports NetBSD wsfb framebuffer
so NetBSD users can use a multi-lingual terminal without
Xserver on ports that support wsdisplay framebuffer console,
i.e. NetBSD/i386 with VESA framebuffer, NetBSD/dreamcast,
or even NetBSD/luna68k with 1bpp framebuffer.

Special thanks to Araki Ken, an auther of mlterm, for
various efforts and improvements for NetBSD wsfb support,
including dumb 1bpp optimizations on luna68k.
mlterm-fb demonstration movies are available on YouTube:
 http://youtu.be/5IH1NYSVpHY  (NetBSD/i386 6.1)
 http://youtu.be/BP8AIceWgxA  (NetBSD/luna68k 6.1)


pkgsrc changes:

 - update descriptions per the framebuffer support
 - add a MESSAGE file to mention miscellaneous configurations to use mlterm
 - remove MAKE_JOBS_SAFE=no which has been fixed in upstream Makefiles
 - split SUBST rules into ones for Makefiles, man page, and config files
 - install misc README files in doc dirs which are useful after installation
 - add "mlterm-fb" and "ibus" options and make mlterm-fb default
   on supported platforms
 - update PLIST per above changes (XXX tested only on NetBSD)


Upstream Changes per doc/en/ReleaseNote:

ver 3.2.0
* Support framebuffer on NetBSD.
* Support 1 bpp framebuffer.
* Support sixel graphics and wall pictures on 1 and 8 bpp framebuffer.
(See http://www.youtube.com/watch?v=djbEw0G_LMI and http://www.youtube.com/watch?v=5IH1NYSVpHY)
(Thanks to @tsutsuii san)
* Add "use_urgent_bell" option which is equivalent to "bellIsUrgent" option of
  xterm and support CSI ? 1042.
* "only_use_unicode_font" and "not_use_unicode_font" options have an effect
  on preedit and candidate characters of input method plugins.
* Add "sound|visual" to the value of "bel_mode" option.
* Enable to change "not_use_unicode_font" and "only_use_unicode_font" dynamically.
* Add "box_drawing_font" option.
* Support efont-unicode fonts for framebuffer.
* Bug fixes:
  Fix the bug which disabled some shortcut keys in FreeBSD/framebuffer.
  Fix the bug which ignored the specified encoding of "default_server" option
  in opening a new pty.
  Fix the bug which disabled sixel graphic images in framebuffer 16bpp.
  Fix the bug which disabled inline pictures if use_dynamic_comb option is true.
  Fix the bug of iBus input method plugin which disabled to erase the last
  preedited character even if backspace key was pressed.
  Fix the wrong height of the preediting cursor of the input method plugin
  if the value of "inner_border" option isn't 2. (Thanks to @tsutsuii san)
  Fix "use_dynamic_comb" option which didn't work anymore.
  Fix the bug which disabled "UNUSED" key in ~/.mlterm/key.
  Change key seuqences for modifier keys + cursor keys in application cursor key
  mode. (e.g. Ctrl+Up: "\x1bO1;5A" -> "\x1b[1;5A") (Thanks to Mohammad Alsaleh)

8 files changed, 152 insertions, 20 deletions

diff --git a/x11/mlterm/DESCR b/x11/mlterm/DESCR
index 1251798c326..91e6eb7360d 100644
--- a/x11/mlterm/DESCR
+++ b/x11/mlterm/DESCR
@@ -1,6 +1,7 @@
-mlterm is a Multi Lingual TERMinal emulator for X.  It supports
-many character sets, many encodings, and many other decorative
-functions.  Since mlterm retains character tables in memory to
-convert characters between UCS and other encodings, it consumes a
-lot of memory while running, so it's recommended that you open
-multiple ptys in one process.
+mlterm is a Multi Lingual TERMinal emulator for X and
+framebuffer console.  It supports many character sets,
+many encodings, and many other decorative functions.
+Since mlterm retains character tables in memory to
+convert characters between UCS and other encodings,
+it consumes a lot of memory while running, so it's
+recommended that you open multiple ptys in one process.
diff --git a/x11/mlterm/MESSAGE b/x11/mlterm/MESSAGE
new file mode 100644
index 00000000000..d65f9ac97cd
--- /dev/null
+++ b/x11/mlterm/MESSAGE
@@ -0,0 +1,22 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/05/26 18:18:25 tsutsui Exp $
+
+mlterm refers config files under ${PREFIX}/etc/mlterm as system default.
+To use mlterm with per user configurations, you have to prepare own config
+files under ~/.mlterm directory.  Please check and copy config files
+(at least main, font, and font-fb) in ${PREFIX}/share/examples/mlterm
+into ~/.mlterm and modify them per your preferable settings.
+All available configurations are mentioned in the mlterm(1) man page.
+
+To use mlterm-fb on NetBSD/amd64 and NetBSD/i386 console, you have to
+enable VESA on the bootloader prompt.  You also have to modify the default
+/etc/ttys settings to enable getty(8) at ttyE0 instead of console.
+Please check NetBSD's boot(8) and ttys(5) man pages for these settings.
+
+You might also have to install proper UTF-8 fonts like efont-unicode
+to print multilingual characters.
+
+Please also read the documentation in the directory
+  ${PREFIX}/share/doc/mlterm
+for more details.
+===========================================================================
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 0994ead5ae1..508804f9926 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2013/03/24 16:02:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.83 2013/05/26 18:18:25 tsutsui Exp $
 
-DISTNAME=	mlterm-3.1.9
+DISTNAME=	mlterm-3.2.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
@@ -9,8 +9,6 @@ HOMEPAGE=	http://mlterm.sourceforge.net/
 COMMENT=	Multilingual terminal emulator
 LICENSE=	modified-bsd
 
-MAKE_JOBS_SAFE=		no
-
 # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h>
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
 
@@ -33,20 +31,49 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 SUBST_CLASSES+=		link
-SUBST_MESSAGE.link=	Fixing hardcoded paths and link options.
+SUBST_MESSAGE.link=	Fixing hardcoded paths and link options in Makefiles.
 SUBST_STAGE.link=	post-patch
 SUBST_FILES.link=	Makefile.in */Makefile.in */*/Makefile.in \
-			*/*/*/Makefile.in man/mlterm.1
+			*/*/*/Makefile.in
 SUBST_SED.link=		-e 's|(LIBTOOL_LINK).*(LIBS)|& ${X11_LDFLAGS:M*:Q}|g'
 SUBST_SED.link+=	-e 's|(LIBTOOL_LINK).*(LIBDIR)|& ${X11_LDFLAGS:M*:Q}|g'
 SUBST_SED.link+=	-e 's|/usr/local/|${PREFIX}/|g'
 SUBST_SED.link+=	-e 's|/usr/X11R7/|${X11BASE}/|g'
 
+SUBST_CLASSES+=		man
+SUBST_MESSAGE.man=	Fixing hardcoded paths in man pages.
+SUBST_STAGE.man=	post-patch
+SUBST_FILES.man=	man/mlterm.1
+SUBST_SED.man=		-e 's|/usr/X11R6/lib/X11/mlterm/|${PKG_SYSCONFDIR}/|g'
+SUBST_SED.man+=		-e 's|/usr/X11R6/include/|${X11BASE}/include/|g'
+
+SUBST_CLASSES+=		conf
+SUBST_MESSAGE.conf=	Fixing hardcoded paths in config files.
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	etc/font-fb
+SUBST_SED.conf=		-e 's|/usr/X11R7/|${X11BASE}/|g'
+SUBST_SED.conf+=	-e 's|/usr/pkg/|${PREFIX}/|g'
+
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+INSTALLATION_DIRS=	share/doc/mlterm share/doc/mlterm/en share/doc/mlterm/ja
+
+post-install:
+.for f in FAQ PROTOCOL README.bidi README.fb README.indic README.xim
+	${INSTALL_DATA} ${WRKSRC}/doc/en/${f} \
+		${DESTDIR}${PREFIX}/share/doc/mlterm/en
+.endfor
+.for f in BUGS FAQ README.aafont README.comb README.confapp README.fb \
+		README.fontproto README.ja README.pty README.server \
+		README.tate README.utf8 README.xim
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/${f} \
+		${DESTDIR}${PREFIX}/share/doc/mlterm/ja
+.endfor
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 0b2f978e92c..b586d9b8157 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.26 2012/12/14 17:23:28 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.27 2013/05/26 18:18:25 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
 bin/mlterm
+${PLIST.fb}bin/mlterm-fb
 lib/libkik.la
 lib/libmkf.la
 lib/libmlterm_core.la
@@ -13,8 +14,12 @@ lib/mkf/libmkf_zh.la
 lib/mlterm/libathena.la
 ${PLIST.ind}lib/mlterm/libctl_iscii.la
 lib/mlterm/libim-kbd.la
+${PLIST.fb}lib/mlterm/libim-kbd-fb.la
 ${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
 ${PLIST.uim}lib/mlterm/libim-uim.la
+${PLIST.fb}${PLIST.uim}lib/mlterm/libim-uim-fb.la
+${PLIST.ibus}lib/mlterm/libim-ibus.la
+${PLIST.fb}${PLIST.ibus}lib/mlterm/libim-ibus-fb.la
 ${PLIST.ind}lib/mlterm/libind_assamese.la
 ${PLIST.ind}lib/mlterm/libind_bengali.la
 ${PLIST.ind}lib/mlterm/libind_gujarati.la
@@ -33,12 +38,32 @@ lib/mlterm/libmotif.la
 lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 lib/mlterm/libsample.la
+${PLIST.fb}lib/mlterm/libsample-fb.la
 lib/mlterm/libsample2.la
 libexec/mlterm/mlconfig
 libexec/mlterm/mlimgloader
 libexec/mlterm/mlterm-menu
 man/man1/mlclient.1
 man/man1/mlterm.1
+share/doc/mlterm/en/FAQ
+share/doc/mlterm/en/PROTOCOL
+share/doc/mlterm/en/README.bidi
+share/doc/mlterm/en/README.fb
+share/doc/mlterm/en/README.indic
+share/doc/mlterm/en/README.xim
+share/doc/mlterm/ja/BUGS
+share/doc/mlterm/ja/FAQ
+share/doc/mlterm/ja/README.aafont
+share/doc/mlterm/ja/README.comb
+share/doc/mlterm/ja/README.confapp
+share/doc/mlterm/ja/README.fb
+share/doc/mlterm/ja/README.fontproto
+share/doc/mlterm/ja/README.ja
+share/doc/mlterm/ja/README.pty
+share/doc/mlterm/ja/README.server
+share/doc/mlterm/ja/README.tate
+share/doc/mlterm/ja/README.utf8
+share/doc/mlterm/ja/README.xim
 share/examples/mlterm/aafont
 share/examples/mlterm/color
 share/examples/mlterm/font
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 2e36746d1c0..6eb88bd27b7 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.29 2013/03/24 16:02:13 tsutsui Exp $
+$NetBSD: distinfo,v 1.30 2013/05/26 18:18:25 tsutsui Exp $
 
-SHA1 (mlterm-3.1.9.tar.gz) = 96762a10735b61fb5787f2df808b97b6341d3486
-RMD160 (mlterm-3.1.9.tar.gz) = a3f9a0f6308572d3d5f6362756d765398a64215c
-Size (mlterm-3.1.9.tar.gz) = 3522626 bytes
+SHA1 (mlterm-3.2.0.tar.gz) = 66478d4f345bb2fe225c498b585797e66f2f931f
+RMD160 (mlterm-3.2.0.tar.gz) = b14f5304e690eb300093ce905f89c89f1a5f4bb7
+Size (mlterm-3.2.0.tar.gz) = 3509742 bytes
+SHA1 (patch-configure) = c54e74be2941cffc2c4b7a9957517c3fe6702046
+SHA1 (patch-etc_font-fb) = dc456f291d19b37092cc1cad4a8c558611aae69e
diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk
index a839d821fd9..6ec4eaee0fe 100644
--- a/x11/mlterm/options.mk
+++ b/x11/mlterm/options.mk
@@ -1,12 +1,28 @@
-# $NetBSD: options.mk,v 1.6 2012/05/20 13:59:30 obache Exp $
+# $NetBSD: options.mk,v 1.7 2013/05/26 18:18:25 tsutsui Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS=	libind m17nlib uim xft2
+PKG_SUPPORTED_OPTIONS=	ibus libind m17nlib mlterm-fb uim xft2
 PKG_SUGGESTED_OPTIONS=
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+=	mlterm-fb
+.endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		ind m17nlib uim xft2
+PLIST_VARS+=		fb ibus ind m17nlib uim xft2
+
+.if !empty(PKG_OPTIONS:Mmlterm-fb)
+CONFIGURE_ARGS+=	--with-gui=xlib,fb
+PLIST.fb=		yes
+SPECIAL_PERMS+=		${PREFIX:Q}/bin/mlterm-fb ${SETUID_ROOT_PERMS}
+CONF_FILES+=		${EGDIR}/font-fb ${PKG_SYSCONFDIR}/font-fb
+.endif
+
+.if !empty(PKG_OPTIONS:Mibus)
+.include "../../inputmethod/ibus/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-ibus
+PLIST.ibus=		yes
+.endif
 
 .if !empty(PKG_OPTIONS:Mlibind)
 CONFIGURE_ARGS+=	--enable-ind
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
new file mode 100644
index 00000000000..554ae992131
--- /dev/null
+++ b/x11/mlterm/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/05/26 18:18:25 tsutsui Exp $
+
+setuid root is handled by SPECIAL_PERMS in pkgsrc
+
+--- configure.orig	2013-05-06 13:45:26.000000000 +0000
++++ configure
+@@ -21314,7 +21314,7 @@ else
+ fi
+ 
+ if test "$gui" = "fb" ; then
+-	INSTALL_OPT="-m 4755 -o root"
++	INSTALL_OPT=""
+ fi
+ 
+ 
diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb
new file mode 100644
index 00000000000..27c0c896001
--- /dev/null
+++ b/x11/mlterm/patches/patch-etc_font-fb
@@ -0,0 +1,24 @@
+$NetBSD: patch-etc_font-fb,v 1.1 2013/05/26 18:18:25 tsutsui Exp $
+
+add more examples for typical NetBSD and pkgsrc installation
+
+--- etc/font-fb.orig	2013-05-06 13:45:26.000000000 +0000
++++ etc/font-fb
+@@ -6,5 +6,15 @@
+ #JISX0208_1990 = &JISX0208_1983
+ #JISX0213_2000_1 = &JISX0208_1983
+ 
+-ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
+-ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1
++#ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
++#ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1
++
++
++#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++
++#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz
++#JISX0201_KATA = /usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz
++#JISX0208_1983 = /usr/X11R7/lib/X11/fonts/misc/jiskan16.pcf.gz
++
++#ISO10646_UCS4_1 = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
++#ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1