Update mlterm to 3.3.0.

pkgsrc changes:

 - remove obsolete post-3.2.2 fixes
 - adjust patches per changes in original files

Changes from doc/en/ReleaseNote:

ver 3.3.0
* Support framebuffer on NetBSD/x68k. (Thanks to NetBSD/x68k developers)
* Support Android. (Experimental)
* Update the colormap instead of searching the closest color when
  OSC 4 ; c ; spec changes RGB of the color number on framebuffer.
* Support OSC ? 80 h (disable sixel scrolling).
* Support U+XXXX-XXXX key in 'font' configuration file.
* Add "unicode_noconv_areas" (a.k.a --ucsnoconv) option.
* Add "allow_scp" (a.k.a --scp) option.
* Remove SWITCH_OSC52. (Use "proto:allow_osc52=switch" instead.)
* OSC 5383 reqests challenge sequence.
* Bug fixes:
  #70 (Thanks to Thomas Wolff)
  Fix the bug which disabled redrawing the margin area on framebuffer.
  Fix the bug of the transparent color of sixel graphics on win32.
  OSC 4 has an effect on RGB of the window background color.
  Send a sixel next line character (-) following a sixel dump.
  Fix the bug which disabled Mod+XXX shortcut key settings on win32.
  Fix the bug which erased the end character of each line in scrolling if DECSLRM
  set the right margin at the right end is fixed.
  Fix the bug of DL/IL which scrolled the screen instead of inserting or deleteing
  lines from the cursor position.
  Fix keypad '5' key (VK_CLEAR) on win32.
  Fix the bug of ignoring the next character after sixel graphics data.
  Fix the bug which makes the window smaller than necessary in resizing.
  Support wsdisplay of the BBGGRR format on NetBSD/OpenBSD. (Thanks to @oshimyja san)

5 files changed, 14 insertions, 54 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index c52046d8791..ffda5b28b30 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2013/10/10 14:42:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2013/10/28 13:26:07 tsutsui Exp $
 
-DISTNAME=	mlterm-3.2.2
-PKGREVISION=	3
+DISTNAME=	mlterm-3.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index f195c6a2acb..a0bea0eb88d 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.35 2013/08/11 13:23:34 tsutsui Exp $
+$NetBSD: distinfo,v 1.36 2013/10/28 13:26:07 tsutsui Exp $
 
-SHA1 (mlterm-3.2.2.tar.gz) = c0ecd83991171d1b1563e828a1430cb6c01ba358
-RMD160 (mlterm-3.2.2.tar.gz) = 9d43352e1f7492af6d7dba370616b2cd585eb602
-Size (mlterm-3.2.2.tar.gz) = 3535155 bytes
-SHA1 (patch-configure) = 00c7e3b3e28538c3dd67ba6fe795675294deb719
-SHA1 (patch-etc_font-fb) = ea7a769248570646c5cab35c38f48082f1b17685
-SHA1 (patch-xwindow_fb_x__window.c) = afa10530191329fb949718e40cc70dd7875d2dcd
+SHA1 (mlterm-3.3.0.tar.gz) = d91182988a5a4907978c40b1c22de8ed7b229458
+RMD160 (mlterm-3.3.0.tar.gz) = 9bcc153f8d249ce350324f9728f07b21d3080e5b
+Size (mlterm-3.3.0.tar.gz) = 3560220 bytes
+SHA1 (patch-configure) = 066d0e35d63f30ad9a892937af3a372fbea56936
+SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 9d60f7f9865..a3a2181e093 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.4 2013/08/11 13:23:34 tsutsui Exp $
+$NetBSD: patch-configure,v 1.5 2013/10/28 13:26:07 tsutsui Exp $
 
 - setuid root is handled by SPECIAL_PERMS in pkgsrc
 
---- configure.orig	2013-08-05 12:48:56.000000000 +0000
+--- configure.orig	2013-10-26 16:47:13.000000000 +0000
 +++ configure
-@@ -21337,7 +21337,7 @@ else
+@@ -21343,7 +21343,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 07817b8affd..04aebc2818a 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.4 2013/08/11 13:23:34 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.5 2013/10/28 13:26:07 tsutsui Exp $
 
 add more examples for typical NetBSD and pkgsrc installation
 
---- etc/font-fb.orig	2013-08-05 12:48:53.000000000 +0000
+--- etc/font-fb.orig	2013-10-26 16:47:13.000000000 +0000
 +++ etc/font-fb
 @@ -1,10 +1,17 @@
  #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
@@ -21,4 +21,4 @@ add more examples for typical NetBSD and pkgsrc installation
  
  #ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
 +#ISO10646_UCS4_1 = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
- ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1
+ ISO10646_UCS4_1_FULLWIDTH = &ISO10646_UCS4_1
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__window.c b/x11/mlterm/patches/patch-xwindow_fb_x__window.c
deleted file mode 100644
index 7273812a2b3..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__window.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__window.c,v 1.3 2013/08/11 13:23:34 tsutsui Exp $
-
-- pull a fix from upstream ed13793007b80c8fbd0997c4d74dc23f43dd6b36:
->> fb/x_window.c: The bug of copy_area() which disabled redrawing
->> the margin area is fixed.
-
---- xwindow/fb/x_window.c.orig	2013-08-05 12:48:52.000000000 +0000
-+++ xwindow/fb/x_window.c
-@@ -492,7 +492,7 @@ copy_area(
- 	u_int  height ,
- 	int  dst_x ,	/* can be minus */
- 	int  dst_y ,	/* can be minus */
--	int  accept_margin	/* x/y can be minus or not */
-+	int  accept_margin	/* x/y can be minus and over width/height */
- 	)
- {
- 	int  margin ;
-@@ -503,7 +503,7 @@ copy_area(
- 	u_char *  picture ;
- 	size_t  src_width_size ;
- 
--	if( ! win->is_mapped || dst_x >= (int)win->width || dst_y >= (int)win->height)
-+	if( ! win->is_mapped)
- 	{
- 		return  0 ;
- 	}
-@@ -520,6 +520,11 @@ copy_area(
- 		bottom_margin = BOTTOM_MARGIN(win) ;
- 	}
- 
-+	if( dst_x >= (int)win->width + margin || dst_y >= (int)win->height + margin)
-+	{
-+		return  0 ;
-+	}
-+
- 	if( dst_x + width > win->width + margin - right_margin)
- 	{
- 		width = win->width + margin - right_margin - dst_x ;