Update mlterm to 3.2.1. (leaf package update)

Also pull post-3.2.1 patches for configure scripts.

pkgsrc changes:
 - remove obsolete post-3.2.0 patches
 - adjust for etc/font-fb changes
 - update PLIST for new framebuffer software keyboard files

Changes from doc/en/ReleaseNote:

ver 3.2.1
* Support framebuffer on OpenBSD.
* Support software keyboard on framebuffer.
  (Double-click Button1 at the right bottom corner of the screen to show it.)
* Support USB keyboard with iBus on NetBSD/OpenBSD framebuffer.
* Support CSI ? 69 h, CSI ? 69 l (DECLRMM) and CSI pl;pr s (DECSLRM).
* Support CSI 3 m and CSI 23 m which set/unset italic attribute.
* Prefer JISX0208 to JISX0213 all the time in converting Unicode to other cs.
* If DEFAULT=-foo-bar-medium-r-*--%d-*- is specified in ~/.mlterm/font,
  -foo-bar-bold-r-*--%d-*-, -foo-bar-medium-i-*--%d-*- or -foo-bar-bold-i-*--%d-*-
  are automatically searched for a bold, italic or bold italic font.
* Bug fixes:
  SF Bug #3614142 (Thanks to Ahmed El-Mahmoudy)
  SF Bug #3614192 (Thanks to Ahmed El-Mahmoudy)
  Fix the bug which caused segmentation fault in using a font whose width doesn't
  match the usascii font on 24 or 32 bpp framebuffer.
  Fix the bug which caused segmentation fault in closing input method status window.
  Fix the bug which caused segmentation fault in loading illegal pcf fonts.
  Resize the window in attaching a new pty. (enbugged at 3.2.0)
  Fix the bug which disabled mlconfig and mlterm-menu. (enbugged at 3.2.0)
  Fix the error message in the failure of loading US-ASCII font.
  Fix the bug which lets parcellite reset the selected region.
  Report relative-origin position of the cursor to CPR sequence.

14 files changed, 100 insertions, 489 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 0ca6d977c82..a4759d04a14 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2013/06/26 11:29:47 tsutsui Exp $
+# $NetBSD: Makefile,v 1.90 2013/06/29 20:29:46 tsutsui Exp $
 
-DISTNAME=	mlterm-3.2.0
-PKGREVISION=	6
+DISTNAME=	mlterm-3.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST
index cf0cfb0185b..1c27b02cca0 100644
--- a/x11/mlterm/PLIST
+++ b/x11/mlterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2013/06/23 01:30:06 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.29 2013/06/29 20:29:46 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -83,3 +83,5 @@ share/locale/de/LC_MESSAGES/mlconfig.mo
 share/locale/ja/LC_MESSAGES/mlconfig.mo
 share/locale/vi/LC_MESSAGES/mlconfig.mo
 share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
+${PLIST.fb}share/mlterm/kbd/kbd.six
+${PLIST.fb}share/mlterm/kbd/pressed_kbd.six
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index fdfe6bdd4bf..ba3be5b4c67 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.33 2013/06/26 11:29:47 tsutsui Exp $
+$NetBSD: distinfo,v 1.34 2013/06/29 20:29:46 tsutsui Exp $
 
-SHA1 (mlterm-3.2.0.tar.gz) = 66478d4f345bb2fe225c498b585797e66f2f931f
-RMD160 (mlterm-3.2.0.tar.gz) = b14f5304e690eb300093ce905f89c89f1a5f4bb7
-Size (mlterm-3.2.0.tar.gz) = 3509742 bytes
-SHA1 (patch-configure) = b09182d7cb0ceb73557cf9e568445ad2d46aa04c
-SHA1 (patch-etc_font-fb) = 95a39d6e2aa56ecc745edec3d324f3dcf57b3b39
-SHA1 (patch-mkf_lib_mkf__ucs4__map.c) = 1bec2e100d5a53a84ca81436389c5cf2ce67f34b
-SHA1 (patch-xwindow_fb_x__display.c) = 20bbfc87028828eeec33b3bc8bdbba93766ff9a1
-SHA1 (patch-xwindow_fb_x__font.c) = a55515411ed9063e609eb70bddf40ad6c486376b
-SHA1 (patch-xwindow_fb_x__window.c) = bbeafd847b6654bec9dd517bf669194e964a2758
-SHA1 (patch-xwindow_win32_x__font.c) = 3c33fe26bbac54ee6ec9ad6add086f8903269a31
-SHA1 (patch-xwindow_x__screen.c) = 1408ec3a64a9b6f9455bd1937c2a9a78600986c2
-SHA1 (patch-xwindow_x__shortcut.c) = 8ec6c9a5dcfbc68d034a4d1c359ac7402684c9f9
-SHA1 (patch-xwindow_xlib_x__window.c) = dc1ca6adb74e0cbd086ba81ad448edcc5ec78743
+SHA1 (mlterm-3.2.1.tar.gz) = 67c2036ab3e280b4da5e3935ca56f0166d160eab
+RMD160 (mlterm-3.2.1.tar.gz) = ca550a1efe99b903303308db6bd49649b9a10d71
+Size (mlterm-3.2.1.tar.gz) = 3529721 bytes
+SHA1 (patch-configure) = e912c9ee89cd338bc4f0b40bccf38dd2587cda6d
+SHA1 (patch-configure.in) = 2f175e1ac4f933940197d8dff1f429ffb6e7538f
+SHA1 (patch-etc_font-fb) = 019d92cafbbae85629ae2914adcfca9d01f347d0
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 2d3e254a79f..60bf6ac9a8d 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,10 +1,32 @@
-$NetBSD: patch-configure,v 1.2 2013/05/28 15:22:18 tsutsui Exp $
+$NetBSD: patch-configure,v 1.3 2013/06/29 20:29:47 tsutsui Exp $
 
-setuid root is handled by SPECIAL_PERMS in pkgsrc
+- setuid root is handled by SPECIAL_PERMS in pkgsrc
+- pull post-3.2.1 fixes:
+  http://mlterm.sf.net/mlterm-3.2.1-fixes.patch
+  > Fix configure error which --with-gui=xlib,fb option causes.
+  > (enbugged at 3.2.1)
 
---- configure.orig	2013-05-26 02:13:16.000000000 +0000
+--- configure.orig	2013-06-29 12:45:20.000000000 +0000
 +++ configure
-@@ -21332,7 +21332,7 @@ else
+@@ -19758,11 +19758,16 @@ if test "$gui" = "fb,xlib" -o "$gui" = "
+ 	fi
+ 	mkdir -p ${top_srcdir-$srcdir}/fb
+ 	for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \
+-		main man mlterm script scrollbar xwindow ; do
++		main man mlterm script scrollbar xwindow doc ; do
+ 		cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/
+ 	done
+ fi
+ 
++if test "$gui" = "fb" ; then
++	MAKE_DIRS="doc/kbd ${MAKE_DIRS}"
++	OUTPUT_FILES="doc/kbd/Makefile ${OUTPUT_FILES}"
++fi
++
+ ml_cv_is_posix="yes"
+ 
+ case "${host_os}" in
+@@ -21332,7 +21337,7 @@ else
  fi
  
  if test "$gui" = "fb" ; then
@@ -13,3 +35,14 @@ setuid root is handled by SPECIAL_PERMS in pkgsrc
  fi
  
  
+@@ -25229,8 +25234,8 @@ subdirs="$subdirs ${SUBDIRS}"
+ 
+ fi
+ 
+-MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc doc/kbd ${MAKE_DIRS}"
+-OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile doc/kbd/Makefile ${OUTPUT_FILES}"
++MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc ${MAKE_DIRS}"
++OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile ${OUTPUT_FILES}"
+ 
+ # Check whether --enable-ind was given.
+ if test "${enable_ind+set}" = set; then :
diff --git a/x11/mlterm/patches/patch-configure.in b/x11/mlterm/patches/patch-configure.in
new file mode 100644
index 00000000000..c35b35effde
--- /dev/null
+++ b/x11/mlterm/patches/patch-configure.in
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure.in,v 1.1 2013/06/29 20:29:47 tsutsui Exp $
+
+- pull post-3.2.1 fixes:
+  http://mlterm.sf.net/mlterm-3.2.1-fixes.patch
+  > Fix configure error which --with-gui=xlib,fb option causes.
+  > (enbugged at 3.2.1)
+
+--- configure.in.orig	2013-06-29 12:45:20.000000000 +0000
++++ configure.in
+@@ -82,11 +82,16 @@ if test "$gui" = "fb,xlib" -o "$gui" = "
+ 	fi
+ 	mkdir -p ${top_srcdir-$srcdir}/fb
+ 	for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \
+-		main man mlterm script scrollbar xwindow ; do
++		main man mlterm script scrollbar xwindow doc ; do
+ 		cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/
+ 	done
+ fi
+ 
++if test "$gui" = "fb" ; then
++	MAKE_DIRS="doc/kbd ${MAKE_DIRS}"
++	OUTPUT_FILES="doc/kbd/Makefile ${OUTPUT_FILES}"
++fi
++
+ ml_cv_is_posix="yes"
+ 
+ case "${host_os}" in
+@@ -1094,8 +1099,8 @@ if test "${SUBDIRS}" != "" ; then
+ 	AC_CONFIG_SUBDIRS(${SUBDIRS})
+ fi
+ 
+-MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc doc/kbd ${MAKE_DIRS}"
+-OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile doc/kbd/Makefile ${OUTPUT_FILES}"
++MAKE_DIRS="mlterm mlterm/libctl xwindow/libtype xwindow main man etc ${MAKE_DIRS}"
++OUTPUT_FILES="Makefile mlterm/Makefile mlterm/libctl/Makefile xwindow/libtype/Makefile xwindow/Makefile main/Makefile man/Makefile etc/Makefile java/Makefile ${OUTPUT_FILES}"
+ 
+ AC_ARG_ENABLE(ind,
+ 	[  --enable-ind            libind @<:@default=disabled@:>@],
diff --git a/x11/mlterm/patches/patch-etc_font-fb b/x11/mlterm/patches/patch-etc_font-fb
index 3cf4006b2dc..5937c3c88f7 100644
--- a/x11/mlterm/patches/patch-etc_font-fb
+++ b/x11/mlterm/patches/patch-etc_font-fb
@@ -1,26 +1,24 @@
-$NetBSD: patch-etc_font-fb,v 1.2 2013/05/28 15:22:18 tsutsui Exp $
+$NetBSD: patch-etc_font-fb,v 1.3 2013/06/29 20:29:47 tsutsui Exp $
 
 add more examples for typical NetBSD and pkgsrc installation
 
---- etc/font-fb.orig	2013-05-26 02:13:15.000000000 +0000
+--- etc/font-fb.orig	2013-06-29 12:45:19.000000000 +0000
 +++ etc/font-fb
-@@ -6,5 +6,17 @@
- #JISX0208_1990 = &JISX0208_1983
- #JISX0213_2000_1 = &JISX0208_1983
- 
--ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
--ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1
-+#ISO10646_UCS4_1 = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
-+#ISO10646_UCS4_1_BIWIDTH = &ISO10646_UCS4_1
-+
-+
+@@ -1,10 +1,17 @@
+ #DEFAULT = /usr/share/fonts/X11/misc/unifont.pcf.gz:100
 +#DEFAULT = /usr/pkg/lib/X11/fonts/efont/b16.pcf.gz
-+
+ 
+ #ISO8859_1 = /usr/share/fonts/X11/misc/mplus_f12r.pcf.gz
 +#ISO8859_1 = /usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz
 +#JISX0201_KATA = /usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz
+ #JISX0208_1983 = /usr/share/fonts/X11/misc/mplus_j12r.pcf.gz
 +#JISX0208_1983 = /usr/X11R7/lib/X11/fonts/misc/jiskan16.pcf.gz
+ JISC6226_1978 = &JISX0208_1983
+ JISX0208_1990 = &JISX0208_1983
+ JISX0213_2000_1 = &JISX0208_1983
 +#JISX0213_2000_1=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-1.pcf.gz
 +#JISX0213_2000_2=/usr/pkg/lib/X11/fonts/local/jiskan16-2000-2.pcf.gz
-+
+ 
+ #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_BIWIDTH = &ISO10646_UCS4_1
diff --git a/x11/mlterm/patches/patch-mkf_lib_mkf__ucs4__map.c b/x11/mlterm/patches/patch-mkf_lib_mkf__ucs4__map.c
deleted file mode 100644
index 4f2c9f8884e..00000000000
--- a/x11/mlterm/patches/patch-mkf_lib_mkf__ucs4__map.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-mkf_lib_mkf__ucs4__map.c,v 1.1 2013/05/28 15:22:18 tsutsui Exp $
-
-Pull a change from upstream:
- https://bitbucket.org/arakiken/mlterm/commits/8f6a1a969340b78cbeee5ace4a7200383ca18abe#chg-mkf/lib/mkf_ucs4_map.c
- > mkf_ucs4_map.c: mkf_map_ucs4_to_jisx0213_2000_1 is not cached
- > in mkf_map_ucs4_to() to prefer JISX0208 to JISX0213 all the time.
-
---- mkf/lib/mkf_ucs4_map.c.orig	2013-05-26 02:13:01.000000000 +0000
-+++ mkf/lib/mkf_ucs4_map.c
-@@ -246,7 +246,14 @@ mkf_map_ucs4_to(
- 	{
- 		if( (*map_table[count].map_ucs4_to)( non_ucs , ucs4_code))
- 		{
--			cached_map = &map_table[count] ;
-+			/*
-+			 * Don't cache the map function of JISX0213_2000_1 to
-+			 * prefer JISX0208 to JISX0213 all the time.
-+			 */
-+			if( map_table[count].cs != JISX0213_2000_1)
-+			{
-+				cached_map = &map_table[count] ;
-+			}
- 
- 			return  1 ;
- 		}
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 d63072f5804..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__display.c
+++ /dev/null
@@ -1,189 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__display.c,v 1.2 2013/06/26 11:29:47 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> Fix the bug which caused segmentation fault in closing input method
-> status window.
-
-Pull update for ibus on mlterm-fb from rev c881417
- https://bitbucket.org/arakiken/mlterm/commits/c8814173cb051b32ce1d1b440b4033bd0bba567d#chg-xwindow/fb/x_display.c
-> fb/x_display.c: get_ps2_kcode() is added to convert usb keycode
-> to ps2 keycode for iBus on NetBSD/OpenBSD framebuffer.
-
---- xwindow/fb/x_display.c.orig	2013-05-26 02:13:13.000000000 +0000
-+++ xwindow/fb/x_display.c
-@@ -169,6 +169,7 @@ static x_display_t *  opened_disps[] = {
- #if  defined(__FreeBSD__)
- static keymap_t  keymap ;
- #elif  defined(__NetBSD__)
-+static u_int  kbd_type ;
- static struct wskbd_map_data  keymap ;
- static int  console_id = -1 ;
- static int  orig_console_mode = WSDISPLAYIO_MODE_EMUL ;	/* 0 */
-@@ -1589,6 +1590,149 @@ receive_key_event(void)
- 
- #elif  defined(__NetBSD__)
- 
-+/* For iBus */
-+static u_int
-+get_ps2_kcode(
-+	u_int  kcode
-+	)
-+{
-+	if( kbd_type == WSKBD_TYPE_USB)
-+	{
-+		static u_char  map_table1[] =
-+		{
-+			30 ,	/* A (4) */
-+			48 ,	/* B */
-+			46 ,	/* C */
-+			32 ,	/* D */
-+			18 ,	/* E */
-+			33 ,	/* F */
-+			34 ,	/* G (10) */
-+			35 ,	/* H */
-+			23 ,	/* I */
-+			36 ,	/* J */
-+			37 ,	/* K */
-+			38 ,	/* L */
-+			50 ,	/* M */
-+			49 ,	/* N */
-+			24 ,	/* O */
-+			25 ,	/* P */
-+			16 ,	/* Q (20) */
-+			19 ,	/* R */
-+			31 ,	/* S */
-+			20 ,	/* T */
-+			22 ,	/* U */
-+			47 ,	/* V */
-+			17 ,	/* W */
-+			45 ,	/* X */
-+			21 ,	/* Y */
-+			44 ,	/* Z */
-+			 2 ,	/* 1 (30) */
-+			 3 ,	/* 2 */
-+			 4 ,	/* 3 */
-+			 5 ,	/* 4 */
-+			 6 ,	/* 5 */
-+			 7 ,	/* 6 */
-+			 8 ,	/* 7 */
-+			 9 ,	/* 8 */
-+			10 ,	/* 9 */
-+			11 ,	/* 0 */
-+			28 ,	/* Enter (40) */
-+			 1 ,	/* ESC */
-+			14 ,	/* BackSpace */
-+			15 ,	/* Tab */
-+			57 ,	/* Space */
-+			12 ,	/* _ - */
-+			13 ,	/* + = */
-+			26 ,	/* { [ */
-+			27 ,	/* } ] */
-+			43 ,	/* \ | */
-+			 0 ,	/* (50) */
-+			39 ,	/* : ; */
-+			40 ,	/* " ' */
-+			41 ,	/* ~ ` */
-+			51 ,	/* < , */
-+			52 ,	/* > . */
-+			53 ,	/* ? / */
-+			58 ,	/* CapsLock */
-+			59 ,	/* F1 */
-+			60 ,	/* F2 */
-+			61 ,	/* F3 (60) */
-+			62 ,	/* F4 */
-+			63 ,	/* F5 */
-+			64 ,	/* F6 */
-+			65 ,	/* F7 */
-+			66 ,	/* F8 */
-+			67 ,	/* F9 */
-+			68 ,	/* F10 */
-+			87 ,	/* F11 */
-+			88 ,	/* F12 */
-+			 0 ,	/* Print Screen (70) */
-+			70 ,	/* ScreenLock */
-+			 0 ,	/* Pause */
-+			110 ,	/* Insert */
-+			102 ,	/* Home */
-+			104 ,	/* Page Up */
-+			111 ,	/* Delete */
-+			107 ,	/* End */
-+			109 ,	/* Page Down */
-+			106 ,	/* Right */
-+			105 ,	/* Left (80) */
-+			108 ,	/* Down */
-+			103 ,	/* Up */
-+			69 ,	/* NumLock */
-+			 0 ,	/* Num / */
-+			55 ,	/* Num * */
-+			74 ,	/* Num - */
-+			78 ,	/* Num + */
-+			 0 ,	/* Num Enter */
-+			79 ,	/* Num 1 */
-+			80 ,	/* Num 2 (90) */
-+			81 ,	/* Num 3 */
-+			75 ,	/* Num 4 */
-+			76 ,	/* Num 5 */
-+			77 ,	/* Num 6 */
-+			71 ,	/* Num 7 */
-+			72 ,	/* Num 8 */
-+			73 ,	/* Num 9 */
-+			82 ,	/* Num 0 */
-+			83 ,	/* Num . */
-+		} ;
-+
-+		static u_char  map_table2[] =
-+		{
-+			29 ,	/* Control L (224) */
-+			42 ,	/* Shift L */
-+			56 ,	/* Alt L */
-+			 0 ,	/* Windows L */
-+			97 ,	/* Control R */
-+			54 ,	/* Shift R */
-+			100 ,	/* Alt R (230) */
-+			 0 ,	/* Windows R */
-+		} ;
-+
-+		if( 4 <= kcode)
-+		{
-+			if( kcode <= 99)
-+			{
-+				return  map_table1[kcode - 4] ;
-+			}
-+			else if( 224 <= kcode)
-+			{
-+				if( kcode <= 231)
-+				{
-+					return  map_table2[kcode - 224] ;
-+				}
-+			}
-+		}
-+
-+		return  0 ;
-+	}
-+	else
-+	{
-+		return  kcode ;
-+	}
-+}
-+
- static void
- process_wskbd_event(
- 	struct wscons_event *  ev
-@@ -1656,7 +1800,7 @@ process_wskbd_event(
- 			xev.ksym = ksym ;
- 			xev.state = _mouse.button_state |
- 				    _display.key_state ;
--			xev.keycode = ev->value ;
-+			xev.keycode = get_ps2_kcode( ev->value) ;
- 
- 			receive_event_for_multi_roots( &xev) ;
- 
-@@ -1884,6 +2028,8 @@ open_display(void)
- 		ioctl( _display.fd , WSKBDIO_SETVERSION , &mode) ;
- 	#endif
- 
-+		ioctl( _display.fd , WSKBDIO_GTYPE , &kbd_type) ;
-+
- 		keymap.maplen = KS_NUMKEYCODES ;
- 		keymap.map = map ;
- 		ioctl( _display.fd , WSKBDIO_GETMAP , &keymap) ;
diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__font.c b/x11/mlterm/patches/patch-xwindow_fb_x__font.c
deleted file mode 100644
index 7d35d4dd143..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__font.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__font.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> Fix the error message in the failure of loading US-ASCII font.
-
---- xwindow/fb/x_font.c.orig	2013-05-26 02:13:13.000000000 +0000
-+++ xwindow/fb/x_font.c
-@@ -1066,7 +1066,18 @@ x_font_get_encoding_names(
- 	mkf_charset_t  cs
- 	)
- {
--	return  NULL ;
-+	static char *  csnames[] = { NULL , NULL , } ;	/* dummy */
-+
-+	if( cs == ISO10646_UCS4_1)
-+	{
-+		csnames[0] = "iso10646-1" ;
-+	}
-+	else
-+	{
-+		csnames[0] = "iso8859" ;
-+	}
-+
-+	return  csnames ;
- }
- 
- /* Return written size */
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 f8c49c981f1..00000000000
--- a/x11/mlterm/patches/patch-xwindow_fb_x__window.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xwindow_fb_x__window.c,v 1.1 2013/05/28 15:22:18 tsutsui Exp $
-
-Pull a fix from upstream:
- https://bitbucket.org/arakiken/mlterm/commits/7c4748b4e79b9bf749685d944c174f2145074e9f#chg-xwindow/fb/x_window.c
- > fb/x_display.c: Segfault in x_font_t::x_off > 0 is fixed.
-
---- xwindow/fb/x_window.c.orig	2013-05-26 02:13:13.000000000 +0000
-+++ xwindow/fb/x_window.c
-@@ -322,7 +322,7 @@ draw_string(
- 					{
- 						p += (font->x_off * 4) ;
- 
--						for( x_off = 0 ; x_off < font->width ; x_off++)
-+						for( x_off = 0 ; x_off < glyph_width ; x_off++)
- 						{
- 							if( x_get_bitmap_cell( bitmap_line ,
- 									x_off))
diff --git a/x11/mlterm/patches/patch-xwindow_win32_x__font.c b/x11/mlterm/patches/patch-xwindow_win32_x__font.c
deleted file mode 100644
index 572cd682464..00000000000
--- a/x11/mlterm/patches/patch-xwindow_win32_x__font.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-xwindow_win32_x__font.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> Fix the error message in the failure of loading US-ASCII font.
-
---- xwindow/win32/x_font.c.orig	2013-05-26 02:13:12.000000000 +0000
-+++ xwindow/win32/x_font.c
-@@ -862,8 +862,17 @@ x_font_get_encoding_names(
- 	mkf_charset_t  cs
- 	)
- {
--	static char *  csnames[] = { "iso8859-1" } ;	/* dummy */
--	
-+	static char *  csnames[] = { NULL , NULL , } ;	/* dummy */
-+
-+	if( cs == ISO10646_UCS4_1)
-+	{
-+		csnames[0] = "iso10646-1" ;
-+	}
-+	else
-+	{
-+		csnames[0] = "iso8859" ;
-+	}
-+
- 	return  csnames ;
- }
- 
diff --git a/x11/mlterm/patches/patch-xwindow_x__screen.c b/x11/mlterm/patches/patch-xwindow_x__screen.c
deleted file mode 100644
index d1479d4a52c..00000000000
--- a/x11/mlterm/patches/patch-xwindow_x__screen.c
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-xwindow_x__screen.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> Resize the window in attaching a new pty. (enbugged at 3.2.0)
-> Fix the bug which lets parcellite reset the selected region.
-
---- xwindow/x_screen.c.orig	2013-05-26 02:13:14.000000000 +0000
-+++ xwindow/x_screen.c
-@@ -3696,12 +3696,6 @@ selecting_with_motion(
- 	if( ! x_is_selecting( &screen->sel))
- 	{
- 		restore_selected_region_color_instantly( screen) ;
--
--		if( ! x_window_set_selection_owner( &screen->window , time))
--		{
--			return ;
--		}
--
- 		start_selection( screen , char_index , row , SEL_CHAR) ;
- 	}
- 	else
-@@ -3787,12 +3781,6 @@ selecting_word(
- 	if( ! x_is_selecting( &screen->sel))
- 	{
- 		restore_selected_region_color_instantly( screen) ;
--
--		if( ! x_window_set_selection_owner( &screen->window , time))
--		{
--			return ;
--		}
--
- 		start_selection( screen , beg_char_index , beg_row , SEL_WORD) ;
- 		selecting( screen , end_char_index , end_row) ;
- 		x_sel_lock( &screen->sel) ;
-@@ -3858,12 +3846,6 @@ selecting_line(
- 	if( ! x_is_selecting( &screen->sel))
- 	{
- 		restore_selected_region_color_instantly( screen) ;
--
--		if( ! x_window_set_selection_owner( &screen->window , time))
--		{
--			return ;
--		}
--
- 		start_selection( screen , beg_char_index , beg_row , SEL_LINE) ;
- 		selecting( screen , end_char_index , end_row) ;
- 		x_sel_lock( &screen->sel) ;
-@@ -4518,7 +4500,7 @@ change_font_present(
- 	font_size_changed( screen) ;
- }
- 
--static void
-+static int
- usascii_font_cs_changed(
- 	x_screen_t *  screen ,
- 	ml_char_encoding_t  encoding
-@@ -4548,6 +4530,12 @@ usascii_font_cs_changed(
- 		 * x_font_manager_usascii_font_cs_changed()
- 		 */
- 		x_xic_font_set_changed( &screen->window) ;
-+
-+		return  1 ;
-+	}
-+	else
-+	{
-+		return  0 ;
- 	}
- }
- 
-@@ -6188,7 +6176,16 @@ select_in_window(
- 	}
- #endif
- 
--	return  1 ;
-+	if( ! x_window_set_selection_owner( &screen->window , CurrentTime))
-+	{
-+		ml_str_delete( *chars , size) ;
-+
-+		return  0 ;
-+	}
-+	else
-+	{
-+		return  1 ;
-+	}
- }
- 
- 
-@@ -7923,12 +7920,10 @@ x_screen_attach(
- 		return  1 ;
- 	}
- 
--	/* XXX */
--#ifdef  USE_FRAMEBUFFER
--	window_resized( &screen->window) ;
--#endif
--
--	usascii_font_cs_changed( screen , ml_term_get_encoding( screen->term)) ;
-+	if( ! usascii_font_cs_changed( screen , ml_term_get_encoding( screen->term)))
-+	{
-+		resize_window( screen) ;
-+	}
- 
- 	update_special_visual( screen) ;
- 	/* Even if update_special_visual succeeded or not, all screen should be redrawn. */
diff --git a/x11/mlterm/patches/patch-xwindow_x__shortcut.c b/x11/mlterm/patches/patch-xwindow_x__shortcut.c
deleted file mode 100644
index 36c3732ced3..00000000000
--- a/x11/mlterm/patches/patch-xwindow_x__shortcut.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-xwindow_x__shortcut.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> Fix the bug which disabled mlconfig and mlterm-menu. (enbugged at 3.2.0)
-
---- xwindow/x_shortcut.c.orig	2013-05-26 02:13:14.000000000 +0000
-+++ xwindow/x_shortcut.c
-@@ -194,6 +194,7 @@ x_shortcut_init(
- 							".exe"
- 						#endif
- 						) ;
-+		button_mask |= (Button1Mask|Button3Mask) ;
- 	}
- 	else
- 	{
diff --git a/x11/mlterm/patches/patch-xwindow_xlib_x__window.c b/x11/mlterm/patches/patch-xwindow_xlib_x__window.c
deleted file mode 100644
index 5b062d7eb5e..00000000000
--- a/x11/mlterm/patches/patch-xwindow_xlib_x__window.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-xwindow_xlib_x__window.c,v 1.1 2013/06/23 06:02:39 tsutsui Exp $
-
-Pull fix from http://mlterm.sf.net/mlterm-3.2.0-fixes.patch
-> SF Bug #3614192
-
---- xwindow/xlib/x_window.c.orig	2013-05-26 02:13:13.000000000 +0000
-+++ xwindow/xlib/x_window.c
-@@ -3664,14 +3664,36 @@ x_window_set_icon(
- 	/* set extended window manager hint's icon */
- 	if( icon->cardinal && icon->cardinal[0] && icon->cardinal[1])
- 	{
-+		int  num ;
-+		u_long *  data ;
-+
-+		/* width * height + 2 */
-+		num = icon->cardinal[0] * icon->cardinal[1] + 2 ;
-+
-+		if( sizeof(u_long) != 4)
-+		{
-+			int  count ;
-+
-+			if( ! ( data = alloca( sizeof(u_long) * num)))
-+			{
-+				return  0 ;
-+			}
-+
-+			for( count = 0 ; count < num ; count++)
-+			{
-+				data[count] = icon->cardinal[count] ;
-+			}
-+		}
-+		else
-+		{
-+			data = icon->cardinal ;
-+		}
-+
- 		/*it should be possible to set multiple icons...*/
- 		XChangeProperty( root->disp->display, root->my_window,
- 				 XA_NET_WM_ICON( root->disp->display),
- 				 XA_CARDINAL, 32, PropModeReplace,
--				 (unsigned char *)(icon->cardinal),
--				 /* (cardinal[0])*(cardinal[1])
--				  *          = width * height */
--				 (icon->cardinal[0])*(icon->cardinal[1]) +2) ;
-+				 data , num) ;
- 	}
- 
- 	if( ( hints = XGetWMHints( root->disp->display , root->my_window)) == NULL &&