Update mlterm to 3.3.3.

New "rotate_display" options make mlterm-fb usable even on
NetBSD/hpcarm W-ZERO3 and NetBSD/zaurus SL-C1000/3000:
http://movapic.com/ebijun/pic/5101480
http://movapic.com/ebijun/pic/5102258

pkgsrc changes:
 - remove post-3.3.2 patches

Changes from doc/en/ReleaseNote:

ver 3.3.3
* Double-clicking a picture sets it to the clipboard.
* All configuration protocol keys whose value is boolean accept "switch"
  which inverts the current value.
* Support IME on Android. (Experimental)
* Mlterm works without SD card on Android.
* Support devanagari and bengali on win32gdi.
* Support CSI ? 8800 h and CSI ? 8800 l which enables / disables the conversion
  from drcs to unicode private area. (Disabled by default.)
  (See http://github.com/saitoha/drcsterm/blob/master/README.rst)
* Add "rotate_display" option which rotates display clockwise or counterclockwise
  on framebuffer and Android.
* Merge patches:
  https://gist.github.com/steleto/8671862 (Thanks to @tristelo)
* Bug fixes:
  Fix the bug of scrolling on framebuffer. (enbugged at 3.3.2)
  Fix the failure of starting mlterm on Android 3.x.
  Fix the conversion from unicode to ISCII characters with nukta.
  Fix the bug of unexpectedly large cursor shape in unfocused.

6 files changed, 6 insertions, 278 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index ce5497390ad..2bce7224dba 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2013/12/25 16:32:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.99 2014/02/28 16:02:12 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.2
+DISTNAME=	mlterm-3.3.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 5de95071684..615edc38f0e 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.39 2013/12/25 16:32:31 tsutsui Exp $
+$NetBSD: distinfo,v 1.40 2014/02/28 16:02:12 tsutsui Exp $
 
-SHA1 (mlterm-3.3.2.tar.gz) = 035988a7e9440b3e44e9f0b210e4fe131d2056ee
-RMD160 (mlterm-3.3.2.tar.gz) = 32318d4482da82d893b89dc69c6893ffedb6d947
-Size (mlterm-3.3.2.tar.gz) = 3574269 bytes
+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-xwindow_fb_x__display.c) = 4d877709bd2493c919c7d6c8c660966ee2411936
-SHA1 (patch-xwindow_fb_x__display.h) = 07b1d0f17995862c02fe8b4c69d32fc662802eb0
-SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = 2a3f0bb7f37bab3c1ee566e6d987f3666514e2d7
-SHA1 (patch-xwindow_fb_x__imagelib.c) = ba95c47740b8c6120405043ca9df15a56fe7bb9c
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display.c b/x11/mlterm/patches/patch-xwindow_fb_x__display.c
deleted file mode 100644
index 725c9bcf1d5..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display.c
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display.c,v 1.4 2013/12/25 16:32:31 tsutsui Exp $
-
-Pull post-3.3.2 fixes:
- - 4d974f7: fix mlterm-fb scroll on >=8bpp framebuffers
- - 0b2987a: fix palette handling on 4bpp framebuffers
-
---- xwindow/fb/x_display.c.orig	2013-12-21 17:11:35.000000000 +0000
-+++ xwindow/fb/x_display.c
-@@ -1180,6 +1180,7 @@ cmap_init(void)
- 		_display.cmap->blue[color] = BYTE_COLOR_TO_WORD(b) ;
- 	}
- 
-+	/* Same processing as x_display_set_cmap(). */
- #ifndef  USE_GRF
- 	ioctl( _display.fb_fd , FBIOPUTCMAP , _display.cmap) ;
- #else
-@@ -1553,12 +1554,45 @@ x_display_set_use_ansi_colors(
- }
- 
- void
-+x_display_enable_to_change_cmap(
-+	int  flag
-+	)
-+{
-+	if( flag)
-+	{
-+	#ifdef  USE_GRF
-+		x68k_set_use_tvram_colors( 1) ;
-+	#endif
-+
-+		if( ! use_ansi_colors)
-+		{
-+			use_ansi_colors = -1 ;
-+		}
-+	}
-+	else
-+	{
-+	#ifdef  USE_GRF
-+		x68k_set_use_tvram_colors( 0) ;
-+	#endif
-+
-+		if( use_ansi_colors == -1)
-+		{
-+			use_ansi_colors = 0 ;
-+		}
-+	}
-+}
-+
-+void
- x_display_set_cmap(
- 	u_int32_t *  pixels ,
- 	u_int  cmap_size
- 	)
- {
--	if( ! use_ansi_colors && cmap_size <= 16 && _disp.depth == 4)
-+	if(
-+	#ifdef  USE_GRF
-+	    ! x68k_set_tvram_cmap( pixels , cmap_size) &&
-+	#endif
-+	    use_ansi_colors == -1 && cmap_size <= 16 && _disp.depth == 4)
- 	{
- 		u_int  count ;
- 		ml_color_t  color ;
-@@ -1584,7 +1618,18 @@ x_display_set_cmap(
- 			_display.cmap->blue[color] = pixels[count] & 0xff ;
- 		}
- 
-+		/* Same processing as cmap_init(). */
-+	#ifndef  USE_GRF
- 		ioctl( _display.fb_fd , FBIOPUTCMAP , _display.cmap) ;
-+	#else
-+		for( count = 0 ; count < CMAP_SIZE(_display.cmap) ; count++)
-+		{
-+			((fb_reg_t*)_display.fb)->gpal[count] =
-+				(_display.cmap->red[count] >> 3) << 6 |
-+				(_display.cmap->green[count] >> 3) << 11 |
-+				(_display.cmap->blue[count] >> 3) << 1 ;
-+		}
-+	#endif
- 	}
- }
- 
-@@ -1829,12 +1874,14 @@ x_display_fill_with(
- 				fb_end += _display.line_length ;
- 			}
- 
-+		#ifndef  ENABLE_2_4_PPB
- 			if( ++plane < _disp.depth)
- 			{
- 				fb = fb_orig + _display.plane_len * plane ;
- 				fb_end = fb + (buf_end - buf) ;
- 			}
- 			else
-+		#endif
- 			{
- 				break ;
- 			}
-@@ -1870,6 +1917,7 @@ x_display_copy_lines(
- 	u_char *  dst ;
- 	u_int  copy_len ;
- 	u_int  count ;
-+	int  num_of_planes ;
- 	int  plane ;
- 
- 	/* XXX cheap implementation. */
-@@ -1878,7 +1926,16 @@ x_display_copy_lines(
- 	/* XXX could be different from FB_WIDTH_BYTES(display, dst_x, width) */
- 	copy_len = FB_WIDTH_BYTES(&_display, src_x, width) ;
- 
--	for( plane = 0 ; plane < _disp.depth ; plane++)
-+	if( _display.pixels_per_byte == 8)
-+	{
-+		num_of_planes = _disp.depth ;
-+	}
-+	else
-+	{
-+		num_of_planes = 1 ;
-+	}
-+
-+	for( plane = 0 ; plane < num_of_planes ; plane++)
- 	{
- 		if( src_y <= dst_y)
- 		{
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display.h b/x11/mlterm/patches/patch-xwindow_fb_x__display.h
deleted file mode 100644
index 5f1094e8bbf..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display.h,v 1.1 2013/12/25 16:32:31 tsutsui Exp $
-
-Pull post-3.3.2 fixes:
- - 0b2987a: fix palette handling on 4bpp framebuffers  
-
---- xwindow/fb/x_display.h.orig	2013-12-21 17:11:36.000000000 +0000
-+++ xwindow/fb/x_display.h
-@@ -43,15 +43,13 @@ int  x_cmap_get_closest_color( u_long * 
- int  x_cmap_get_pixel_rgb( u_int8_t *  red , u_int8_t *  green ,
- 	u_int8_t *  blue , u_long  pixel) ;
- 
-+void  x_display_enable_to_change_cmap( int  flag) ;
-+
- void  x_display_set_cmap( u_int32_t *  cmap , u_int  cmap_size) ;
- 
- #ifdef  USE_GRF
- int  x68k_tvram_is_enabled(void) ;
- 
--void  x68k_set_use_tvram_colors( int  use) ;
--
--int  x68k_set_tvram_cmap( u_int32_t *  cmap , u_int  cmap_size) ;
--
- int  x68k_tvram_set_wall_picture( u_short *  image , u_int  width , u_int  height) ;
- #endif
- 
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 871b5f5ff92..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.1 2013/12/25 16:32:31 tsutsui Exp $
-
-Pull post-3.3.2 fixes:
- - 0b2987a: fix palette handling on 4bpp framebuffers
-
---- xwindow/fb/x_display_x68kgrf.c.orig	2013-12-21 17:11:34.000000000 +0000
-+++ xwindow/fb/x_display_x68kgrf.c
-@@ -563,16 +563,7 @@ gpal_init(
- 	return  1 ;
- }
- 
--
--/* --- global functions --- */
--
--int
--x68k_tvram_is_enabled(void)
--{
--	return  (grf0_fd != -1) ? 1 : 0 ;
--}
--
--void
-+static void
- x68k_set_use_tvram_colors(
- 	int  use
- 	)
-@@ -600,7 +591,7 @@ x68k_set_use_tvram_colors(
- 
- static fb_cmap_t *  cmap_new( int  num_of_colors) ;
- 
--int
-+static int
- x68k_set_tvram_cmap(
- 	u_int32_t *  pixels ,
- 	u_int  cmap_size
-@@ -629,6 +620,15 @@ x68k_set_tvram_cmap(
- 	return  0 ;
- }
- 
-+
-+/* --- global functions --- */
-+
-+int
-+x68k_tvram_is_enabled(void)
-+{
-+	return  (grf0_fd != -1) ? 1 : 0 ;
-+}
-+
- /*
-  * On success, if /dev/grf0 is opened just now, 2 is returned, while if
-  * /dev/grf0 has been already opened, 1 is returned.
-@@ -676,8 +676,6 @@ x68k_tvram_set_wall_picture(
- 							MAP_FILE|MAP_SHARED ,
- 							grf0_fd , (off_t)0)) != MAP_FAILED)
- 				{
--					u_long  color ;
--
- 					/* Enale the text vram. */
- 					grf0_reg->videoc.r2 = 0x0030 ;
- 
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__imagelib.c b/x11/mlterm/patches/patch-xwindow_fb_x__imagelib.c
deleted file mode 100644
index 3682b8d3295..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__imagelib.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__imagelib.c,v 1.1 2013/12/25 16:32:31 tsutsui Exp $
-
-Pull post-3.3.2 fixes:
- - 0b2987a: fix palette handling on 4bpp framebuffers
-
---- xwindow/fb/x_imagelib.c.orig	2013-12-21 17:11:37.000000000 +0000
-+++ xwindow/fb/x_imagelib.c
-@@ -211,7 +211,7 @@ modify_pixmap(
- #endif
- 
- /* For old machines */
--#if  defined(__NetBSD__) || defined(__OpenBSD__)
-+#if  (defined(__NetBSD__) || defined(__OpenBSD__)) && ! defined(USE_GRF)
- 
- #ifndef  BUILTIN_IMAGELIB
- #define  BUILTIN_IMAGELIB
-@@ -340,7 +340,7 @@ load_file(
- 	}
- 
- /* For old machines */
--#if  defined(__NetBSD__) || defined(__OpenBSD__)
-+#if  (defined(__NetBSD__) || defined(__OpenBSD__)) && ! defined(USE_GRF)
- 	if( depth == 1)
- 	{
- 		if( load_sixel_with_mask_from_file_1bpp( display , path , width , height ,
-@@ -358,12 +358,7 @@ load_file(
- 						&(*pixmap)->width , &(*pixmap)->height)))
- 		{
- 		#if  defined(__NetBSD__) || defined(__OpenBSD__)
--		#ifdef  USE_GRF
--			if( ! x68k_set_tvram_cmap( sixel_cmap , sixel_cmap_size))
--		#endif
--			{
--				x_display_set_cmap( sixel_cmap , sixel_cmap_size) ;
--			}
-+			x_display_set_cmap( sixel_cmap , sixel_cmap_size) ;
- 		#endif
- 
- 			goto  loaded ;
-@@ -570,8 +565,8 @@ x_imagelib_load_file_for_background(
- {
- 	Pixmap  pixmap ;
- 
--#ifdef  USE_GRF
--	x68k_set_use_tvram_colors( 1) ;
-+#if  defined(__NetBSD__) || defined(__OpenBSD__)
-+	x_display_enable_to_change_cmap( 1) ;
- #endif
- 
- 	if( ! load_file( win->disp->display , path ,
-@@ -581,8 +576,8 @@ x_imagelib_load_file_for_background(
- 		pixmap = None ;
- 	}
- 
--#ifdef  USE_GRF
--	x68k_set_use_tvram_colors( 0) ;
-+#if  defined(__NetBSD__) || defined(__OpenBSD__)
-+	x_display_enable_to_change_cmap( 0) ;
- #endif
- 
- 	return  pixmap ;