Update mlterm to 3.3.4. (leaf package update)

pkgsrc changes:
 - remove post-3.3.3 fix patches
 - pull a post-3.3.4 bug fix patch for NetBSD and OpenBSD

Changes from doc/en/ReleaseNote:

ver 3.3.4
* Support not only sixel graphics but also other major image formats on Android.
* Support ReGIS partially. (depends on SDL(SDL2), SDL_ttf(SDL2_ttf) and fontconfig)
* Output strerror(errno) on error.
* Support "key=value #comment" style in the same line in ~/.mlterm/main.
* Draw all ambiguous width characters one by one to fit the column width unless
  -V option is specified.
* Merge patches:
  https://gist.github.com/tsutsui/9285759. (Thanks to @tsutsuii)
* Bug fixes:
  Change the default resolution on NetBSD/x68k from 512x512x8 to 768x512x4.
  Fix the bug which output help message to stdout where mlterm waits for image
  data and which made mlterm allocate too large memory. (enbugged at 3.3.3)
  Fix the bug which disabled to start mlconfig. (enbugged at 3.3.3)
  Fix the bug which caused segfault if x11 forwarding failed.
  Fix the bug which caused segfault in resuming on Android.
  Show candidate strings of uim-mozc correctly.
  Fix the bug which disabled normal users from opening screen on NetBSD/x68k framebuffer.
  Fix segfault in connecting unknown hosts on java.

9 files changed, 40 insertions, 369 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 98113612293..1b39d8e6dbd 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2014/03/14 17:42:17 tsutsui Exp $
+# $NetBSD: Makefile,v 1.102 2014/03/23 07:04:00 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.3
-PKGREVISION=	2
+DISTNAME=	mlterm-3.3.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index dd1350d4f76..0862152a795 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.42 2014/03/14 17:42:17 tsutsui Exp $
+$NetBSD: distinfo,v 1.43 2014/03/23 07:04:00 tsutsui Exp $
 
-SHA1 (mlterm-3.3.3.tar.gz) = 9d5befee155e5e514874b45c46b1b7fe2fdf3dbd
-RMD160 (mlterm-3.3.3.tar.gz) = 9c669c523aa2e8b7e48420a58ab74b851cea3dfe
-Size (mlterm-3.3.3.tar.gz) = 3578266 bytes
-SHA1 (patch-configure) = 950194a8be2ebd7f3ed22c9ebaba545def6c7351
-SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318
-SHA1 (patch-inputmethod_uim_im__uim.c) = c61931c6d6ca5295e16a68c2b4fa89641817ee58
-SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = b4e106db5530c57010b811f0c15a4dd4bdc233a6
-SHA1 (patch-xwindow_x__main__config.c) = 501dbde1484e93066fdaa652853679468a6ce78a
-SHA1 (patch-xwindow_x__screen.c) = 4b09a17ad85c47d30f03b742994f09131994dc36
+SHA1 (mlterm-3.3.4.tar.gz) = eb065d2048ab1b7a0bcb7d1bddf253eb02ceacca
+RMD160 (mlterm-3.3.4.tar.gz) = 5c63c78a5e602dc473eaf0c6f50546cb9c944819
+Size (mlterm-3.3.4.tar.gz) = 3589264 bytes
+SHA1 (patch-common_c__imagelib.c) = baf6de1fa4d6b55f7dd1ba77e42b0c91921fc872
+SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
+SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
diff --git a/x11/mlterm/patches/patch-common_c__imagelib.c b/x11/mlterm/patches/patch-common_c__imagelib.c
new file mode 100644
index 00000000000..9ca30eda42e
--- /dev/null
+++ b/x11/mlterm/patches/patch-common_c__imagelib.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-common_c__imagelib.c,v 1.1 2014/03/23 07:04:00 tsutsui Exp $
+
+Pull post-3.3.4 bug fixes patch:
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.4/mlterm-3.3.4-fixes.patch/download
+ - fix build error on NetBSD and OpenBSD with framebuffer support.
+
+--- common/c_imagelib.c.orig	2014-03-22 22:06:31.000000000 +0000
++++ common/c_imagelib.c
+@@ -795,6 +795,9 @@ end:
+ 	return  pixels ;
+ }
+ 
++
++#ifndef  __CONVERT_REGIS_TO_BMP__
++#define  __CONVERT_REGIS_TO_BMP__
+ #ifdef  USE_WIN32API
+ 
+ static int
+@@ -905,6 +908,7 @@ convert_regis_to_bmp(
+ }
+ 
+ #endif
++#endif	/* CONVERT_REGIS_TO_BMP */
+ 
+ 
+ #ifndef  SIXEL_1BPP
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 835eae64dda..3b3e90dd456 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.6 2013/12/25 16:32:31 tsutsui Exp $
+$NetBSD: patch-configure,v 1.7 2014/03/23 07:04:00 tsutsui Exp $
 
 - setuid root is handled by SPECIAL_PERMS in pkgsrc
 
---- configure.orig	2013-12-21 17:11:50.000000000 +0000
+--- configure.orig	2014-03-22 22:06:40.000000000 +0000
 +++ configure
-@@ -21358,7 +21358,7 @@ else
+@@ -21377,7 +21377,7 @@ else
  fi
  
  if test "$gui" = "fb" ; then
diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb
index 04aebc2818a..7740f22bb42 100644
--- a/x11/mlterm/patches/patch-etc_font-fb
+++ b/x11/mlterm/patches/patch-etc_font-fb
@@ -1,8 +1,8 @@
-$NetBSD: patch-etc_font-fb,v 1.5 2013/10/28 13:26:07 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.6 2014/03/23 07:04:00 tsutsui Exp $
 
 add more examples for typical NetBSD and pkgsrc installation
 
---- etc/font-fb.orig	2013-10-26 16:47:13.000000000 +0000
+--- etc/font-fb.orig	2014-03-22 22:06:39.000000000 +0000
 +++ etc/font-fb
 @@ -1,10 +1,17 @@
  #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
diff --git a/x11/mlterm/patches/patch-inputmethod_uim_im__uim.c b/x11/mlterm/patches/patch-inputmethod_uim_im__uim.c
deleted file mode 100644
index 91d46b5855f..00000000000
--- a/x11/mlterm/patches/patch-inputmethod_uim_im__uim.c
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-inputmethod_uim_im__uim.c,v 1.1 2014/03/07 18:22:50 tsutsui Exp $
-
-Pull mlterm-3.3.3-fixes.patch from upstream:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3-fixes.patch/download
- - Hack for uim-mozc is added
-
---- inputmethod/uim/im_uim.c.orig	2014-02-21 16:51:46.000000000 +0000
-+++ inputmethod/uim/im_uim.c
-@@ -78,6 +78,8 @@ typedef struct im_uim
- 
- 	u_int  cand_limit ;
- 
-+	int  is_mozc ;
-+
- }  im_uim_t ;
- 
- KIK_LIST_TYPEDEF( im_uim_t) ;
-@@ -744,13 +746,13 @@ candidate_activate(
- 
- 	uim = (im_uim_t*) p ;
- 
-+	(*uim->im.listener->get_spot)( uim->im.listener->self ,
-+				       uim->im.preedit.chars ,
-+				       uim->im.preedit.segment_offset ,
-+				       &x , &y) ;
-+
- 	if( uim->im.cand_screen == NULL)
- 	{
--		(*uim->im.listener->get_spot)( uim->im.listener->self ,
--					       uim->im.preedit.chars ,
--					       uim->im.preedit.segment_offset ,
--					       &x , &y) ;
--
- 		if( ! ( uim->im.cand_screen = (*syms->x_im_candidate_screen_new)(
- 				uim->im.disp , uim->im.font_man , uim->im.color_man ,
- 				(*uim->im.listener->is_vertical)(uim->im.listener->self) ,
-@@ -847,6 +849,22 @@ candidate_select(
- 
- 	if( uim->im.cand_screen)
- 	{
-+		/*
-+		 * XXX Hack for uim-mozc (1.11.1522.102)
-+		 * If candidate_activate() is called with num == 20 and limit = 10,
-+		 * uim_get_candidate() on mozc doesn't returns 20 candidates but 10 ones.
-+		 * (e.g. uim_get_candidate(0) and uim_get_candidate(10) returns the same.)
-+		 */
-+		if( uim->is_mozc &&
-+		    uim->im.cand_screen->index != index &&
-+		    uim->im.cand_screen->index / uim->cand_limit != index / uim->cand_limit &&
-+		    (index % uim->cand_limit) == 0)
-+		{
-+			candidate_activate( p ,
-+				uim->im.cand_screen->num_of_candidates ,
-+				uim->cand_limit) ;
-+		}
-+
- 		(*uim->im.cand_screen->select)( uim->im.cand_screen , index) ;
- 	}
- }
-@@ -1616,6 +1634,8 @@ im_uim_new(
- 		goto  error ;
- 	}
- 
-+	uim->is_mozc = (strcmp( engine , "mozc") == 0) ;
-+
- 	uim_set_preedit_cb( uim->context ,
- 			    preedit_clear ,
- 			    preedit_pushback ,
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c b/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c
deleted file mode 100644
index a2a6f9b7085..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.4 2014/03/14 17:42:17 tsutsui Exp $
-
-Pull fixes for NetBSD/x68k framebuffer from upstream:
-https://bitbucket.org/arakiken/mlterm/commits/f32b4ef020ab4ce25ab46166efac5c02f5e692eb
- - Allow non-privileged users to use mlterm-fb
- - The default resolution is changed to 768x512x4
-
-https://bitbucket.org/arakiken/mlterm/commits/097ac4f2b78e1dea5a53a55fa070007655d85add#chg-xwindow/fb/x_display_x68kgrf.c
- - Also allow non-privileged users to use Text VRAM by --multivram=true option
-
---- xwindow/fb/x_display_x68kgrf.c.orig	2014-02-21 16:51:44.000000000 +0000
-+++ xwindow/fb/x_display_x68kgrf.c
-@@ -72,10 +72,10 @@ typedef struct  fb_reg_conf
- /* --- static variables --- */
- 
- static int  console_id = -1 ;
--u_int  fb_width = 640 ;
--u_int  fb_height = 480 ;
--u_int  fb_depth = 8 ;
--int  separate_wall_picture ;
-+u_int  fb_width = 768 ;
-+u_int  fb_height = 512 ;
-+u_int  fb_depth = 4 ;
-+int  separate_wall_picture = 1 ;
- static fb_reg_conf_t  orig_reg ;
- static int  grf0_fd = -1 ;
- static size_t  grf0_len ;
-@@ -185,8 +185,15 @@ open_display(
- 	struct rgb_info  rgb_info_15bpp = { 3 , 3 , 3 , 6 , 11 , 1 } ;
- 	struct termios  tm ;
- 
--	if( ( _display.fb_fd = open( ( dev = getenv("FRAMEBUFFER")) ? dev : "/dev/grf1" ,
--					O_RDWR)) < 0)
-+	kik_priv_restore_euid() ;
-+	kik_priv_restore_egid() ;
-+
-+	_display.fb_fd = open( ( dev = getenv("FRAMEBUFFER")) ? dev : "/dev/grf1" , O_RDWR);
-+
-+	kik_priv_change_euid( kik_getuid()) ;
-+	kik_priv_change_egid( kik_getgid()) ;
-+
-+	if( _display.fb_fd < 0)
- 	{
- 		kik_msg_printf( "Couldn't open %s.\n" , dev ? dev : "/dev/grf1") ;
- 
-@@ -663,7 +670,15 @@ x68k_tvram_set_wall_picture(
- 	{
- 		struct grfinfo  vinfo ;
- 
--		if( image && ( grf0_fd = open( "/dev/grf0" , O_RDWR)) >= 0)
-+		kik_priv_restore_euid() ;
-+		kik_priv_restore_egid() ;
-+
-+		grf0_fd = open( "/dev/grf0" , O_RDWR) ;
-+
-+		kik_priv_change_euid( kik_getuid()) ;
-+		kik_priv_change_egid( kik_getgid()) ;
-+
-+		if( grf0_fd >= 0)
- 		{
- 			kik_file_set_cloexec( grf0_fd) ;
- 
diff --git a/x11/mlterm/patches/patch-xwindow_x__main__config.c b/x11/mlterm/patches/patch-xwindow_x__main__config.c
deleted file mode 100644
index fea28401bbc..00000000000
--- a/x11/mlterm/patches/patch-xwindow_x__main__config.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-xwindow_x__main__config.c,v 1.1 2014/03/07 18:22:50 tsutsui Exp $
-
-Pull fixes for NetBSD/x68k framebuffer from upstream:
-https://bitbucket.org/arakiken/mlterm/commits/f32b4ef020ab4ce25ab46166efac5c02f5e692eb
- - The default value "separate_wall_picture" option is changed to true
-
---- xwindow/x_main_config.c.orig	2014-02-21 16:51:45.000000000 +0000
-+++ xwindow/x_main_config.c
-@@ -282,7 +282,7 @@ x_prepare_for_main_config(
- 		"embold glyphs by drawing doubly at 1 pixel leftward instead of rightward.") ;
- #ifdef  USE_GRF
- 	kik_conf_add_opt( conf , '\0' , "multivram" , 1 , "separate_wall_picture" ,
--		"draw wall picture on another vram. (available on 4bpp) [false]") ;
-+		"draw wall picture on another vram. (available on 4bpp) [true]") ;
- #endif
- #ifdef  USE_FRAMEBUFFER
- 	kik_conf_add_opt( conf , '\0' , "rotate" , 0 , "rotate_display" ,
-@@ -1368,12 +1368,9 @@ x_main_config_init(
- #ifdef  USE_GRF
- 	if( ( value = kik_conf_get_value( conf , "separate_wall_picture")))
- 	{
--		if( strcmp( value , "true") == 0)
--		{
--			extern int  separate_wall_picture ;
-+		extern int  separate_wall_picture ;
- 
--			separate_wall_picture = 1 ;
--		}
-+		separate_wall_picture = (strcmp( value , "true") == 0 ? 1 : 0) ;
- 	}
- #endif
- 
diff --git a/x11/mlterm/patches/patch-xwindow_x__screen.c b/x11/mlterm/patches/patch-xwindow_x__screen.c
deleted file mode 100644
index 5eb8f1ab677..00000000000
--- a/x11/mlterm/patches/patch-xwindow_x__screen.c
+++ /dev/null
@@ -1,189 +0,0 @@
-$NetBSD: patch-xwindow_x__screen.c,v 1.6 2014/03/14 17:42:17 tsutsui Exp $
-
-Pull mlterm-3.3.3-fixes.patch from upstream:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3-fixes.patch/download
- - Fix the bug which disabled to start mlconfig
-
-https://bitbucket.org/arakiken/mlterm/commits/1b9ecfa74b0f305c89cff60310f671aef7479246#chg-xwindow/x_screen.c
- - x_color_cache and x_color_manager are reloaded after loading a wall
-   picture on NetBSD/OpenBSD 4bpp framebuffer.
-
-https://bitbucket.org/arakiken/mlterm/commits/fa6c82190cc62d356285d7dde71e49a9f671b132#chg-xwindow/x_screen.c
- - update mouse cursor fg and bg colors after loading a wall picture
-   on NetBSD/OpenBSD 4bpp framebuffer.
-
---- xwindow/x_screen.c.orig	2014-02-21 16:51:45.000000000 +0000
-+++ xwindow/x_screen.c
-@@ -1275,6 +1275,28 @@ set_wall_picture(
- 		return  0 ;
- 	}
- 
-+#if  defined(USE_FRAMEBUFFER) && (defined(__NetBSD__) || defined(__OpenBSD__))
-+	if( screen->window.disp->depth == 4 && strstr( screen->pic_file_path , "six"))
-+	{
-+		/*
-+		 * Color pallette of x_display can be changed by x_acquire_bg_picture().
-+		 * (see x_display_set_cmap() called from fb/x_imagelib.c.)
-+		 */
-+		x_color_cache_unload( screen->color_man->color_cache) ;
-+
-+		x_color_manager_reload( screen->color_man) ;
-+		x_window_set_fg_color( &screen->window ,
-+			x_get_xcolor( screen->color_man , ML_FG_COLOR)) ;
-+		x_xic_fg_color_changed( &screen->window) ;
-+		/* XXX should change scrollbar fg color */
-+
-+		x_window_set_bg_color( &screen->window ,
-+			x_get_xcolor( screen->color_man , ML_BG_COLOR)) ;
-+		x_xic_bg_color_changed( &screen->window) ;
-+		/* XXX should change scrollbar bg color */
-+	}
-+#endif
-+
- 	if( ! x_window_set_wall_picture( &screen->window , pic->pixmap))
- 	{
- 		x_release_picture( pic) ;
-@@ -5268,11 +5290,13 @@ change_im(
-  * Callbacks of x_config_event_listener_t events.
-  */
- 
--static char *
-+static void
- get_config_intern(
- 	x_screen_t *  screen ,
- 	char *  dev ,	/* can be NULL */
--	char *  key	/* can be "error" */
-+	char *  key ,	/* can be "error" */
-+	int  to_menu ,	/* -1: don't output to pty and menu. */
-+	int *  flag	/* 1(true), 0(false) or -1(other) is returned. */
- 	)
- {
- 	ml_term_t *  term ;
-@@ -5285,7 +5309,7 @@ get_config_intern(
- 		if( ( term = (*screen->system_listener->get_pty)( screen->system_listener->self ,
- 				dev)) == NULL)
- 		{
--			return  NULL ;
-+			return ;
- 		}
- 	}
- 	else
-@@ -5829,7 +5853,34 @@ get_config_intern(
- 		}
- 	}
- 
--	return  value ;
-+	if( to_menu >= 0)
-+	{
-+		if( value == NULL)
-+		{
-+			ml_term_write( screen->term , "#error\n" , 7 , to_menu) ;
-+
-+		#ifdef  __DEBUG
-+			kik_debug_printf( KIK_DEBUG_TAG " #error\n") ;
-+		#endif
-+		}
-+		else
-+		{
-+			ml_term_write( screen->term , "#" , 1 , to_menu) ;
-+			ml_term_write( screen->term , key , strlen( key) , to_menu) ;
-+			ml_term_write( screen->term , "=" , 1 , to_menu) ;
-+			ml_term_write( screen->term , value , strlen( value) , to_menu) ;
-+			ml_term_write( screen->term , "\n" , 1 , to_menu) ;
-+
-+		#ifdef  __DEBUG
-+			kik_debug_printf( KIK_DEBUG_TAG " #%s=%s\n" , key , value) ;
-+		#endif
-+		}
-+	}
-+
-+	if( flag)
-+	{
-+		*flag = value ? true_or_false( value) : -1 ;
-+	}
- }
- 
- static void
-@@ -5840,31 +5891,7 @@ get_config(
- 	int  to_menu
- 	)
- {
--	x_screen_t *  screen ;
--	char *  value ;
--
--	screen = p ;
--
--	if( ( value = get_config_intern( screen , dev , key)) == NULL)
--	{
--		ml_term_write( screen->term , "#error\n" , 7 , to_menu) ;
--
--	#ifdef  __DEBUG
--		kik_debug_printf( KIK_DEBUG_TAG " #error\n") ;
--	#endif
--	}
--	else
--	{
--		ml_term_write( screen->term , "#" , 1 , to_menu) ;
--		ml_term_write( screen->term , key , strlen( key) , to_menu) ;
--		ml_term_write( screen->term , "=" , 1 , to_menu) ;
--		ml_term_write( screen->term , value , strlen( value) , to_menu) ;
--		ml_term_write( screen->term , "\n" , 1 , to_menu) ;
--
--	#ifdef  __DEBUG
--		kik_debug_printf( KIK_DEBUG_TAG " #%s=%s\n" , key , value) ;
--	#endif
--	}
-+	get_config_intern( p , dev , key , to_menu , NULL) ;
- }
- 
- static void
-@@ -8286,18 +8313,21 @@ x_screen_set_config(
- 	}
- 	else if( strcmp( value , "switch") == 0)
- 	{
--		char *  val ;
-+		int  flag ;
- 
--		if( ( val = get_config_intern( screen , /* dev */ NULL , key)))
-+		get_config_intern( screen , /* dev */ NULL , key , -1 , &flag) ;
-+
-+		if( flag == 1)
- 		{
--			if( strcmp( val , "true") == 0)
--			{
--				value = "false" ;
--			}
--			else if( strcmp( val , "false") == 0)
--			{
--				value = "true" ;
--			}
-+			value = "false" ;
-+		}
-+		else if( flag == 0)
-+		{
-+			value = "true" ;
-+		}
-+		else
-+		{
-+			return  1 ;
- 		}
- 	}
- 
-@@ -8312,7 +8342,7 @@ x_screen_set_config(
- 		if( ( term = (*screen->system_listener->get_pty)( screen->system_listener->self ,
- 				dev)) == NULL)
- 		{
--			return  0 ;
-+			return  1 ;
- 		}
- 	}
- 	else
-@@ -8838,7 +8868,7 @@ x_screen_set_config(
- 			}
- 			else
- 			{
--				return  0 ;
-+				return  1 ;
- 			}
- 
- 			usascii_font_cs_changed( screen , ml_term_get_encoding( screen->term)) ;