Update mlterm to 3.3.6.

pkgsrc changes:
 - remove post-3.3.5 fix patches

Changes noted in doc/en/ReleaseNote:

ver 3.3.6
* Support fcitx. (Experimental)
* Support scrollbar on Android.
* Remove the original "simple" scrollbar and link "sample" scrollbar statically
  to mlterm as "simple" one. Rename "sample2" scrollbar to "sample".
* Bug fixes:
  Fix partially corrupt screen in drawing animation gif.
  Fix https://twitter.com/yoshikaw/status/462125454107738112
  Fix corrupt screen in drawing large images.
  Fix https://twitter.com/kefir_/status/467340224628924416
  Fix the corrupt scrolling in vertical mode.

5 files changed, 7 insertions, 73 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 3f01c1662be..f411c1a2f71 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2014/05/05 00:48:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.106 2014/06/01 16:00:30 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.5
-PKGREVISION=	1
+DISTNAME=	mlterm-3.3.6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index 1c27b02cca0..1a024ab96b9 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2013/06/29 20:29:46 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.30 2014/06/01 16:00:30 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -39,8 +39,6 @@ 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
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 51cddd69706..5b82237c5a8 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.45 2014/05/02 05:09:29 tsutsui Exp $
+$NetBSD: distinfo,v 1.46 2014/06/01 16:00:30 tsutsui Exp $
 
-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 (mlterm-3.3.6.tar.gz) = 02ce7544c17aa6c33ddc4ad4e103d2e2bbfde85a
+RMD160 (mlterm-3.3.6.tar.gz) = a4145851a09595f1c07c9151f939a30fc55865bb
+Size (mlterm-3.3.6.tar.gz) = 3600399 bytes
 SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
 SHA1 (patch-etc_font-fb) = 7e5c1ced916fdb2b6da1dc86dd37d7bad5a7ede7
-SHA1 (patch-xwindow_fb_x__display__wscons.c) = 4732655e60338883279c9a32161bcc804a52daf0
-SHA1 (patch-xwindow_x__draw__str.c) = 73f3160a2dbc363bfd4bfc8db079d95b830550c8
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c b/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c
deleted file mode 100644
index fad9c8eaf45..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$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
deleted file mode 100644
index 0310f1cc2a3..00000000000
--- a/x11/mlterm/patches/patch-xwindow_x__draw__str.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$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)