Update mlterm to 3.3.5.

pkgsrc changes:
 - remove post-3.3.4 fix patches
 - pull post-3.3.5 bug fixes

Changes from doc/en/ReleaseNote:

* Support Animation GIF on "show_picture" of OSC 5379.
  (It works with https://bitbucket.org/arakiken/w3m/get/remoteimg.tar.gz)
* Add "add_frame" to OSC 5379.
* Bug fixes:
  Fix compiler error on NetBSD/OpenBSD framebuffer. (enbugged at 3.3.4)
  Fix the bug which sometimes disabled to show large sixel graphics sequence.
  (enbugged at 3.3.4)
  Output ^? instead of ^H on TERM=xterm by default in pressing backspace key.
  Fix the bug which sometimes left X11 events untouched for a while.
  Fix the bug of closing the input method window unexpectedly in pressing it.
  ":Percentage" after font names in ~/.mlterm/aafont works on cairo.

6 files changed, 69 insertions, 86 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 24315261e97..b09177d52bb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2014/03/26 16:47:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.104 2014/05/02 05:09:29 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.4
-PKGREVISION=	1
+DISTNAME=	mlterm-3.3.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index fee0ce2942e..51cddd69706 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2014/03/26 16:47:39 tsutsui Exp $
+$NetBSD: distinfo,v 1.45 2014/05/02 05:09:29 tsutsui Exp $
 
-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 (mlterm-3.3.5.tar.gz) = 67b9307b80e7b0e1d56ff841dc9d5705557f0b43
+RMD160 (mlterm-3.3.5.tar.gz) = 190f54aae5dcfb471287c4f7221a04ced8a760dc
+Size (mlterm-3.3.5.tar.gz) = 3596286 bytes
 SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
 SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
-SHA1 (patch-kiklib_src_kik__debug.c) = 0e718f1ccafacf2ae282c8c672ca3c4c6b8aa991
+SHA1 (patch-xwindow_fb_x__display__wscons.c) = 4732655e60338883279c9a32161bcc804a52daf0
+SHA1 (patch-xwindow_x__draw__str.c) = 73f3160a2dbc363bfd4bfc8db079d95b830550c8
diff --git a/x11/mlterm/patches/patch-common_c__imagelib.c b/x11/mlterm/patches/patch-common_c__imagelib.c
deleted file mode 100644
index 9ca30eda42e..00000000000
--- a/x11/mlterm/patches/patch-common_c__imagelib.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$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-kiklib_src_kik__debug.c b/x11/mlterm/patches/patch-kiklib_src_kik__debug.c
deleted file mode 100644
index 960014f09d4..00000000000
--- a/x11/mlterm/patches/patch-kiklib_src_kik__debug.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-kiklib_src_kik__debug.c,v 1.1 2014/03/26 16:47:39 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 with gcc-4.8.x
-
---- kiklib/src/kik_debug.c.orig	2014-03-22 22:06:35.000000000 +0000
-+++ kiklib/src/kik_debug.c
-@@ -160,16 +160,38 @@ kik_error_printf(
- 	)
- {
- 	va_list  arg_list ;
-+	char *  prefix ;
-+	int  ret ;
- 
- 	va_start( arg_list , format) ;
- 
- #ifdef  HAVE_ERRNO_H
--	debug_printf( "ERROR(" , strerror( errno) , NULL) ;
-+	if( errno != 0)
-+	{
-+		char *  error ;
-+
-+		error = strerror( errno) ;
-+
-+		if( ! ( prefix = alloca( 6 + strlen( error) + 3 + 1)))
-+		{
-+			ret = 0 ;
-+			goto  end ;
-+		}
- 
--	return  debug_printf( "): " , format , arg_list) ;
--#else
--	return  debug_printf( "ERROR: " , format , arg_list) ;
-+		sprintf( prefix , "ERROR(%s): " , error) ;
-+	}
-+	else
- #endif
-+	{
-+		prefix = "ERROR: " ;
-+	}
-+
-+	ret = debug_printf( prefix , format , arg_list) ;
-+
-+end:
-+	va_end( arg_list) ;
-+
-+	return  ret ;
- }
- 
- /*
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c b/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c
new file mode 100644
index 00000000000..fad9c8eaf45
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-xwindow_fb_x__display__wscons.c,v 1.1 2014/05/02 05:09:29 tsutsui Exp $
+
+Pull post-3.3.5 bug fix:
+https://bitbucket.org/arakiken/mlterm/commits/aea132fea6b324125be7383f210c09d24cfe67d4?at=default#chg-xwindow/fb/x_display_wscons.c
+ - WSDISPLAYIO_MODE_DUMBFB is used instead of WSDISPLAYIO_MODE_MAPPED
+   on NetBSD.
+
++++ xwindow/fb/x_display_wscons.c
+@@ -359,9 +359,7 @@ open_display(
+ 
+ 	ioctl( STDIN_FILENO , WSDISPLAYIO_GMODE , &orig_console_mode) ;
+ 
+-#ifdef  __NetBSD__
+-	mode = WSDISPLAYIO_MODE_MAPPED ;
+-#else
++#ifdef  __OpenBSD__
+ 	{
+ 		struct wsdisplay_gfx_mode  gfx_mode ;
+ 
+@@ -371,13 +369,12 @@ open_display(
+ 
+ 		if( ioctl( _display.fb_fd , WSDISPLAYIO_SETGFXMODE , &gfx_mode) == -1)
+ 		{
+-			/* Always failed on OpenBSD/luna88k. */
+ 			kik_error_printf( "Couldn't set screen resolution (gfx mode).\n") ;
+ 		}
+ 	}
++#endif
+ 
+ 	mode = WSDISPLAYIO_MODE_DUMBFB ;
+-#endif
+ 
+ 	if( ioctl( STDIN_FILENO , WSDISPLAYIO_SMODE , &mode) == -1)
+ 	{
diff --git a/x11/mlterm/patches/patch-xwindow_x__draw__str.c b/x11/mlterm/patches/patch-xwindow_x__draw__str.c
new file mode 100644
index 00000000000..0310f1cc2a3
--- /dev/null
+++ b/x11/mlterm/patches/patch-xwindow_x__draw__str.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-xwindow_x__draw__str.c,v 1.1 2014/05/02 05:09:29 tsutsui Exp $
+
+Pull post-3.3.5 bug fix patch:
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.5/mlterm-3.3.5-fixes.patch/download
+ - Fix partially corrupt screen in drawing animation gif.
+
+--- xwindow/fb/x_display_wscons.c.orig	2014-04-25 23:40:19.000000000 +0000
+--- xwindow/x_draw_str.c.orig	2014-04-25 23:40:19.000000000 +0000
++++ xwindow/x_draw_str.c
+@@ -129,7 +129,7 @@ draw_picture(
+ 			}
+ 		}
+ 
+-		if( need_clear)
++		if( need_clear > 0)
+ 		{
+ 			x_window_clear( window , dst_x , dst_y , dst_width , line_height) ;
+ 		}
+@@ -175,7 +175,7 @@ draw_picture(
+ 		if( strstr( cur_pic->file_path , "mlterm/animx") && cur_pic->next_frame >= 0)
+ 		{
+ 			/* Don't clear if cur_pic is 2nd or later GIF Animation frame. */
+-			need_clear = 0 ;
++			need_clear = -1 ;
+ 		}
+ 
+ 		if( (src_width = w) < ch_width && ! need_clear)