Update mlterm to 3.3.8.

pkgsrc changes:
 - remove post-3.3.7 fix patches

Changes noted in doc/en/ReleaseNote:

ver 3.3.8
* Support rectangle selection by pressing alt key while selecting.
* Support DECDMAC/DECINVM.
* Start scp by drag&drop a file with shift key to the screen on ssh connection.
* Add --seqfmt/vt_seq_format option.
* Read /dev/kbd on NetBSD/x68k framebuffer.
* Add "Auto detect" entry to "Encoding" tab of mlconfig.
* Add "Local echo" checkbox to "Others" tab in mlconfig.
* Bug fixes:
  Fix weird background picture on NetBSD/x68k Text VRAM by unexpectedly cached pixels.

8 files changed, 10 insertions, 396 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 9201fe8ba88..37e8d41074d 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2014/07/21 15:42:56 tsutsui Exp $
+# $NetBSD: Makefile,v 1.110 2014/08/16 04:10:44 tsutsui Exp $
 
-DISTNAME=	mlterm-3.3.7
+DISTNAME=	mlterm-3.3.8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index ea3e28abb68..d0a03795bf1 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.49 2014/07/21 15:42:56 tsutsui Exp $
+$NetBSD: distinfo,v 1.50 2014/08/16 04:10:44 tsutsui Exp $
 
-SHA1 (mlterm-3.3.7.tar.gz) = a6ba30fb73ac183aff0b1b91d83af3fe960799a8
-RMD160 (mlterm-3.3.7.tar.gz) = 366592392644fb7a9c8029994f7cf92b9e0f442d
-Size (mlterm-3.3.7.tar.gz) = 3610286 bytes
-SHA1 (patch-configure) = 923dfcba01d52d655defffa9a7ec96e56207df6e
+SHA1 (mlterm-3.3.8.tar.gz) = 2552cb12fe74629b2eb4ae364f6c8751faa34118
+RMD160 (mlterm-3.3.8.tar.gz) = f8914ca27ea467e50458703aa2c643be61ee1871
+Size (mlterm-3.3.8.tar.gz) = 3621297 bytes
+SHA1 (patch-configure) = cdea6c383b7b8d0fdfeef668aacf0e602027b06e
 SHA1 (patch-etc_font-fb) = c9f116aae7640807f4adc4042adc49ddd9805e67
-SHA1 (patch-xwindow_fb_x.h) = 1eabc67aeb2df3fdc212fb5855ffd3a63f6ad83d
-SHA1 (patch-xwindow_fb_x__display.c) = 4afe5b96dbb9af47bb78f632182adebb7525abe2
-SHA1 (patch-xwindow_fb_x__display__wscons.c) = 20d43950a2f96109bbbe30f9aaf3561cd6ecc398
-SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = a2b6384835523fb8c4f8beec21d5c80304bb4d92
-SHA1 (patch-xwindow_libtype_Makefile.in) = 350da4e217a1014d258e6c77a1de443392e50d57
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 845ef97c936..8503c205fd3 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,38 +1,10 @@
-$NetBSD: patch-configure,v 1.8 2014/07/21 15:42:56 tsutsui Exp $
+$NetBSD: patch-configure,v 1.9 2014/08/16 04:10:44 tsutsui Exp $
 
 - setuid root is handled by SPECIAL_PERMS in pkgsrc
 
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * configure.in: "-lfontconfig -lfreetype" is added to CAIRO_LIBS and XFT_LIBS
-   because mlterm has undefined symbols if --disable-shared is specified on
-   some platforms where dependency_libs="" in libcairo.la.
-
---- configure.orig	2014-07-05 21:40:48.000000000 +0000
+--- configure.orig	2014-08-16 01:06:01.000000000 +0000
 +++ configure
-@@ -21066,6 +21066,10 @@ if test "x$ac_cv_lib_Xft_XftDrawCreate" 
- fi
- 
- 		fi
-+	elif test "$gui" = "xlib" -a "$enable_shared" = "no" ; then
-+		# In case --disable-shared is specified on some platforms
-+		# (e.g. ubuntu 14.04) where dependency_libs="" in libXft.la.
-+		XFT_LIBS="$XFT_LIBS -lfontconfig -lfreetype"
- 	fi
- 
- 	if test "$have_xft" = "yes" ; then
-@@ -21193,6 +21197,10 @@ if test "x$ac_cv_lib_cairo_cairo_create"
- 
- fi
- 
-+	elif test "$gui" = "xlib" -a "$enable_shared" = "no" ; then
-+		# In case --disable-shared is specified on some platforms
-+		# (e.g. ubuntu 14.04) where dependency_libs="" in libcairo.la.
-+		CAIRO_LIBS="$CAIRO_LIBS -lfontconfig -lfreetype"
- 	fi
- 
- 	if test "$have_cairo" = "yes" ; then
-@@ -21382,7 +21390,7 @@ else
+@@ -21390,7 +21390,7 @@ else
  fi
  
  if test "$gui" = "fb" ; then
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x.h b/x11/mlterm/patches/patch-xwindow_fb_x.h
deleted file mode 100644
index e6b6836c08e..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xwindow_fb_x.h,v 1.2 2014/07/21 15:42:56 tsutsui Exp $
-
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * x.h: KS_Print -> KS_Print_Screen
-
---- xwindow/fb/x.h.orig	2014-07-05 21:40:41.000000000 +0000
-+++ xwindow/fb/x.h
-@@ -309,7 +309,7 @@ typedef int XFontSet ;	/* dummy */
- #define XK_Right	KS_Right
- #define XK_Down		KS_Down
- #define XK_Select	KS_Select
--#define XK_Print	KS_Print
-+#define XK_Print	KS_Print_Screen
- #define XK_Execute	KS_Execute
- #define XK_Insert	KS_Insert
- #define XK_Delete	KS_Delete
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 e860ab15271..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display.c,v 1.7 2014/07/21 15:42:56 tsutsui Exp $
-
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * x_display.c: Key squences on NetBSD/x68k are added to the table in
-   receive_stdin_key_event().
-
---- xwindow/fb/x_display.c.orig	2014-07-05 21:40:41.000000000 +0000
-+++ xwindow/fb/x_display.c
-@@ -1084,6 +1084,20 @@ receive_stdin_key_event(void)
- 			{ "[B" , XK_Down } ,
- 			{ "[C" , XK_Right } ,
- 			{ "[D" , XK_Left } ,
-+		#if  defined(USE_GRF)
-+			{ "[7~" , XK_End } ,
-+			{ "[1~" , XK_Home } ,
-+			{ "OP" , XK_F1 } ,
-+			{ "OQ" , XK_F2 } ,
-+			{ "OR" , XK_F3 } ,
-+			{ "OS" , XK_F4 } ,
-+			{ "[17~" , XK_F5 } ,
-+			{ "[18~" , XK_F6 } ,
-+			{ "[19~" , XK_F7 } ,
-+			{ "[20~" , XK_F8 } ,
-+			{ "[21~" , XK_F9 } ,
-+			{ "[29~" , XK_F10 } ,
-+		#else	/* USE_GRF */
- 		#if  defined(__NetBSD__) || defined(__OpenBSD__)
- 			{ "[8~" , XK_End } ,
- 			{ "[7~" , XK_Home } ,
-@@ -1117,6 +1131,7 @@ receive_stdin_key_event(void)
- 			{ "[21~" , XK_F10 } ,
- 			{ "[23~" , XK_F11 } ,
- 			{ "[24~" , XK_F12 } ,
-+		#endif	/* USE_GRF */
- 		} ;
- 
- 		size_t  count ;
-@@ -1468,7 +1483,7 @@ x_display_close_all(void)
- {
- 	if( DISP_IS_INITED)
- 	{
--		x_picture_display_closed( &_disp.display) ;
-+		x_picture_display_closed( _disp.display) ;
- 
- 		x_virtual_kbd_hide() ;
- 
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 a744ac5edbb..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display__wscons.c,v 1.4 2014/07/21 15:42:56 tsutsui Exp $
-
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * x_display_wscons.c: The null pointer bug of_display.color_cache in the case
-   of vinfo.depth >= 2 && _disp.depth == 1 is fixed.
-
---- xwindow/fb/x_display_wscons.c.orig	2014-07-05 21:40:42.000000000 +0000
-+++ xwindow/fb/x_display_wscons.c
-@@ -522,6 +522,15 @@ open_display(
- 
- 					goto  error ;
- 				}
-+
-+				if( ! ( _display.color_cache =
-+						calloc( 1 , sizeof(*_display.color_cache))))
-+				{
-+					free( _display.cmap_orig) ;
-+					free( _display.cmap) ;
-+
-+					goto  error ;
-+				}
- 			}
- 
- 			for( color = 0 ; color < num_of_colors ; color ++)
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 517730df037..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c
+++ /dev/null
@@ -1,247 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.6 2014/07/21 15:42:56 tsutsui Exp $
-
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * x_display_x68kgrf.c:
-  - Keyboard events from /dev/kbd are processed instead of stdin.
-  - x68k_set_use_tvram_colors() and x68k_set_tvram_cmap() resets
-    _display.color_cache.
-
---- xwindow/fb/x_display_x68kgrf.c.orig	2014-07-05 21:40:42.000000000 +0000
-+++ xwindow/fb/x_display_x68kgrf.c
-@@ -4,6 +4,8 @@
- 
- #include  <dev/wscons/wsdisplay_usl_io.h>	/* VT_GETSTATE */
- #include  <machine/grfioctl.h>
-+#include  <machine/vuid_event.h>
-+#include  <dev/sun/kbio.h>
- 
- 
- #define get_key_state()  (0)
-@@ -329,12 +331,32 @@ open_display(
- 	tm.c_cc[VTIME] = 0 ;
- 	tcsetattr( STDIN_FILENO , TCSAFLUSH , &tm) ;
- 
--	_display.fd = STDIN_FILENO ;
--
- 	kik_priv_restore_euid() ;
- 	kik_priv_restore_egid() ;
- 
--	_mouse.fd = open( "/dev/mouse" , O_RDWR|O_NONBLOCK|O_EXCL) ;
-+	if( ( _display.fd = open( "/dev/kbd" , O_RDONLY)) >= 0)
-+	{
-+		int  mode ;
-+
-+		fcntl( _display.fd , F_SETOWN , getpid()) ;
-+		fcntl( _display.fd , F_SETFL , O_NONBLOCK|O_ASYNC) ;
-+		mode = 1 ;
-+		ioctl( _display.fd , KIOCSDIRECT , &mode) ;
-+	}
-+	else
-+	{
-+		_display.fd = STDIN_FILENO ;
-+	}
-+
-+	if( ( _mouse.fd = open( "/dev/mouse" , O_RDONLY)) >= 0)
-+	{
-+		int  format ;
-+
-+		format = VUID_FIRM_EVENT ;
-+		ioctl( _mouse.fd , VUIDSFORMAT , &format) ;
-+		fcntl( _mouse.fd , F_SETOWN , getpid()) ;
-+		fcntl( _mouse.fd , F_SETFL , O_NONBLOCK|O_ASYNC) ;
-+	}
- 
- 	kik_priv_change_euid( kik_getuid()) ;
- 	kik_priv_change_egid( kik_getgid()) ;
-@@ -400,13 +422,7 @@ receive_mouse_event(void)
- #define  VKEY_UP      0
- #define  VKEY_DOWN    1
- 
--	struct
--	{
--		u_short  id ;
--		u_short  pad ;
--		int  value ;
--		struct timeval  time ;
--	} ev ;
-+	Firm_event  ev ;
- 	ssize_t  len ;
- 
- 	if( console_id != get_active_console())
-@@ -544,7 +560,148 @@ receive_mouse_event(void)
- static int
- receive_key_event(void)
- {
--	return  receive_stdin_key_event() ;
-+	static u_int16_t  keymap[] =
-+	{
-+		XK_Escape , '1' , '2' , '3' , '4' , '5' , '6' , '7' ,
-+		'8' , '9' , '0' , '-' , '^' , '\\' , XK_BackSpace , XK_Tab ,
-+		'q' , 'w' , 'e' , 'r' , 't' , 'y' , 'u' , 'i' ,
-+		'o' , 'p' , '@' , '[' , XK_Return , 'a' , 's' , 'd' ,
-+		'f' , 'g' , 'h' , 'j' , 'k' , 'l' , ';' , ':' ,
-+		']' , 'z' , 'x' , 'c' , 'v' , 'b' , 'n' , 'm' ,
-+		',' , '.' , '/' , 0 , ' ' , XK_Home , XK_Delete , XK_Prior ,
-+		XK_Next , 0 /* XK_Undo */ , XK_Left , XK_Up , XK_Right , XK_Down ,
-+			XK_Clear , XK_KP_Divide ,
-+		XK_KP_Multiply , XK_KP_Subtract , XK_KP_7 , XK_KP_8 , XK_KP_9 , XK_KP_Add ,
-+			XK_KP_4 , XK_KP_5 ,
-+		XK_KP_6 , '=' /* XK_KP_Equal */ , XK_KP_1 , XK_KP_2 , XK_KP_3 ,
-+			XK_Return /* XK_KP_Enter */ , XK_KP_0 , ',' ,
-+		'.' , 0 , 0 /* XK_Touroku */ , XK_Help , XK_Alt_L , XK_Meta_L ,
-+			XK_Meta_R , XK_Alt_R ,
-+		XK_Control_R , 0 /* XK_Kana_Lock */ , 0 /* XK_Romaji */ , 0 , XK_Caps_Lock ,
-+			XK_Insert , XK_Hiragana_Katakana , XK_Zenkaku_Hankaku ,
-+		0 /* XK_Break */ , XK_Print , XK_F1 , XK_F2 , XK_F3 , XK_F4 , XK_F5 , XK_F6 ,
-+		XK_F7 , XK_F8 , XK_F9 , XK_F10 , 0 , 0 , 0 , XK_Shift_L ,
-+		XK_Control_L , XK_Super_L , XK_Super_R ,
-+	} ;
-+	static u_int8_t  shift_keymap[] =
-+	{
-+		0 , '!' , '\"' , '#' , '$' , '%' , '&' , '\'' ,
-+		'(' , ')' , 0 , '=' , '~' , '|' , 0 , 0 ,
-+		'Q' , 'W' , 'E' , 'R' , 'T' , 'Y' , 'U' , 'I' ,
-+		'O' , 'P' , '`' , '{' , 0 , 'A' , 'S' , 'D' ,
-+		'F' , 'G' , 'H' , 'J' , 'K' , 'L' , '+' , '*' ,
-+		'}' , 'Z' , 'X' , 'C' , 'V' , 'B' , 'N' , 'M' ,
-+		'<' , '>' , '?' , '_' ,
-+	} ;
-+	Firm_event  ev ;
-+
-+	if( _display.fd == STDIN_FILENO)
-+	{
-+		return  receive_stdin_key_event() ;
-+	}
-+
-+	if( console_id != get_active_console())
-+	{
-+		return  0 ;
-+	}
-+
-+	while( read( _display.fd , memset( &ev , 0 , sizeof(ev)) , sizeof(ev)) > 0)
-+	{
-+		XKeyEvent  xev ;
-+		int  pressed ;
-+		int  shift ;
-+
-+		pressed = (ev.value == VKEY_DOWN) ;
-+
-+		ev.id -- ;
-+		ev.id &= 0x7f ;
-+
-+		if( _display.lock_state & CLKED)
-+		{
-+			shift = ! (_display.key_state & ShiftMask) ;
-+		}
-+		else
-+		{
-+			shift = _display.key_state & ShiftMask ;
-+		}
-+
-+		if( ! shift ||
-+		    ev.id >= sizeof(shift_keymap) / sizeof(*shift_keymap) ||
-+		    ! ( xev.ksym = shift_keymap[ev.id]))
-+		{
-+			if( ev.id >= sizeof(keymap) / sizeof(*keymap) ||
-+			    ! ( xev.ksym = keymap[ev.id]))
-+			{
-+				continue ;
-+			}
-+		}
-+
-+		if( pressed)
-+		{
-+			if( xev.ksym == XK_Shift_R ||
-+			    xev.ksym == XK_Shift_L)
-+			{
-+				_display.key_state |= ShiftMask ;
-+			}
-+			else if( xev.ksym == XK_Control_R ||
-+				 xev.ksym == XK_Control_L)
-+			{
-+				_display.key_state |= ControlMask ;
-+			}
-+			else if( xev.ksym == XK_Alt_R ||
-+				 xev.ksym == XK_Alt_L ||
-+				 xev.ksym == XK_Meta_R ||
-+				 xev.ksym == XK_Meta_L)
-+			{
-+				_display.key_state |= ModMask ;
-+			}
-+			else if( xev.ksym == XK_Num_Lock)
-+			{
-+				_display.lock_state ^= NLKED ;
-+			}
-+			else if( xev.ksym == XK_Caps_Lock)
-+			{
-+				_display.lock_state ^= CLKED ;
-+			}
-+			else
-+			{
-+				xev.type = KeyPress ;
-+				xev.state = _mouse.button_state |
-+					    _display.key_state ;
-+				xev.keycode = ev.id + 1 ;
-+
-+			#ifdef  __DEBUG
-+				kik_debug_printf( KIK_DEBUG_TAG
-+					"scancode %d -> ksym 0x%x state 0x%x\n" ,
-+					ev.id , xev.ksym , xev.state) ;
-+			#endif
-+
-+				receive_event_for_multi_roots( &xev) ;
-+			}
-+		}
-+		else
-+		{
-+			if( xev.ksym == XK_Shift_R ||
-+			    xev.ksym == XK_Shift_L)
-+			{
-+				_display.key_state &= ~ShiftMask ;
-+			}
-+			else if( xev.ksym == XK_Control_R ||
-+				 xev.ksym == XK_Control_L)
-+			{
-+				_display.key_state &= ~ControlMask ;
-+			}
-+			else if( xev.ksym == XK_Alt_R ||
-+				 xev.ksym == XK_Alt_L ||
-+				 xev.ksym == XK_Meta_R ||
-+				 xev.ksym == XK_Meta_L)
-+			{
-+				_display.key_state &= ~ModMask ;
-+			}
-+		}
-+	}
-+
-+	return  1 ;
- }
- 
- static int
-@@ -590,6 +747,12 @@ x68k_set_use_tvram_colors(
- 		if( _display.cmap == tcmap)
- 		{
- 			_display.cmap = gcmap ;
-+
-+			if( _display.color_cache)
-+			{
-+				memset( _display.color_cache , 0 ,
-+					sizeof(*_display.color_cache)) ;
-+			}
- 		}
- 
- 		use_tvram_cmap = 0 ;
-@@ -620,6 +783,12 @@ x68k_set_tvram_cmap(
- 			gcmap = _display.cmap ;
- 			_display.cmap = tcmap ;
- 
-+			if( _display.color_cache)
-+			{
-+				memset( _display.color_cache , 0 ,
-+					sizeof(*_display.color_cache)) ;
-+			}
-+
- 			return  1 ;
- 		}
- 	}
diff --git a/x11/mlterm/patches/patch-xwindow_libtype_Makefile.in b/x11/mlterm/patches/patch-xwindow_libtype_Makefile.in
deleted file mode 100644
index 76d33b4af91..00000000000
--- a/x11/mlterm/patches/patch-xwindow_libtype_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xwindow_libtype_Makefile.in,v 1.1 2014/07/21 15:42:56 tsutsui Exp $
-
-- pull post 3.3.7 fixes:
-http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.7/mlterm-3.3.7-fixes.patch/download
- * libtype/Makefile.in: Compiling error is fixed.
-
---- xwindow/libtype/Makefile.in.orig	2014-07-21 09:30:22.000000000 +0000
-+++ xwindow/libtype/Makefile.in
-@@ -59,7 +59,7 @@ libtype_cairo.la: $(CAIRO_OBJ)
- libtype.a: $(NODL_OBJ)
- 	$(LIBTOOL_LINK) -o libtype.a $(NODL_OBJ:.o=.lo)
- 
--x_font_ft.o:
-+x_font_ft.o: x_font_ft.c
- 	$(LIBTOOL_CC) @TYPE_CFLAGS@ -c $<
- 
- .SUFFIXES: .c .o