mlterm: update to 3.9.1.

pkgsrc changes:

- remove a patch applied in the upstream
- pull an upstream fix for NetBSD/x68k VGA mode support:
 https://github.com/arakiken/mlterm/commit/0d3a3b0bdc36ee2d702167fd234dcfc3c500ac09

Upstream changes noted in doc/en/ReleaseNote:

ver 3.9.1
* Support copy mode which starts by Control+Shift+Return.
* Support OSC 1337;Setmark ST.
* Support CSI 3 J (ED) which clears backlog.
* Support gradle to build mlterm for Android. (See doc/en/README.android)
* Add --enable-utmp-suid option to ./configure script.
  (The default value is disabled.)
* Add --with-utmp option which specifies the way of accessing to utmp database
  to ./configure script.
* Add SCROLL_UP_TO_MARK, SCROLL_DOWN_TO_MARK and SET_MARK shortcut keys.
* Add resize_mode / --rz option, and drop scroll_on_resize / --sr option.
  (If you want to revert to the old behavior, specify --rz=none option.)
* Add emoji_file_format / --emojifmt option.
* Add libvterm 0.1 API symbols to libvterm compatible library.
* Add vte 0.62 API symbols to libvte compatible library.
* Drop SCROLL_DOWN and PAGE_DOWN shortcut keys.
* Drop use_extended_scroll_shortcut option and SCROLL_UP shortcut key is enabled
  by default. (If you want to disable it, add UNUSED=SCROLL_UP to ~/.mlterm/key.)
* Update unicode property table (generated from UnicodeData.txt and
  EastAsianWidth.txt) to version 13.0.0.
* letter_space / --csp option accepts negative value.
* libvte compatible library supports XInput2.
* Bug fixes:
  Fix a bug which caused a 'mlimgloader' process not to exit after loading a wall picture.
  (Enbugged at 3.8.8)
  Fix a bug which disabled keyboard and mouse on Haiku R1/beta2.
  Mlconfig starts correctly by Ctrl + RightClick on cygwin 3.1.4.
  Fix https://sourceforge.net/p/mlterm/mailman/message/37033060/
  Fix segfault of mlcc in exiting after changing configurations.
  Fix segfault in double click at RTL characters. (Enbugged at 3.6.2)
  Fix corruption of data transferred by "OSC 5379; scp ... ST".
  Fix https://github.com/arakiken/mlterm/issues/4.
  Fix	http://twitter.com/oshimyja/status/1320251099211649024.

5 files changed, 55 insertions, 150 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 66b083c6a03..06ec294830e 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.163 2020/11/05 09:09:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.164 2020/11/16 11:58:08 tsutsui Exp $
 
-DISTNAME=	mlterm-3.9.0
-PKGREVISION=	4
+DISTNAME=	mlterm-3.9.1
+#PKGREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 393945bccc2..450c7157fd9 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.85 2020/06/21 17:53:01 tsutsui Exp $
+$NetBSD: distinfo,v 1.86 2020/11/16 11:58:08 tsutsui Exp $
 
-SHA1 (mlterm-3.9.0.tar.gz) = be37059caab99219be79b14cfabfb26d34bb8954
-RMD160 (mlterm-3.9.0.tar.gz) = d5fec228b86918fe8dec05a6957869520dc8e5d4
-SHA512 (mlterm-3.9.0.tar.gz) = d89340eb460904ca36c6ed063b356625d9c9b4ad129dc51640d50a04e166f8239124d0003db778376c47daa6311c869f9fe7e337c90937fed5ae4151f5af57c4
-Size (mlterm-3.9.0.tar.gz) = 4143644 bytes
-SHA1 (patch-configure) = ce9fe3642258c5ab01d4e371e067c5f1501d5c22
+SHA1 (mlterm-3.9.1.tar.gz) = f05490c56528db2e2a88ca1979ebdf145c79a03f
+RMD160 (mlterm-3.9.1.tar.gz) = 9858b73a4b70516978dd47bc78abce5d8b9acd38
+SHA512 (mlterm-3.9.1.tar.gz) = 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870
+Size (mlterm-3.9.1.tar.gz) = 4175186 bytes
+SHA1 (patch-configure) = 266b3e8383c425c7ef8cd180f07e1199890521ba
 SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0
-SHA1 (patch-uitoolkit_xlib_ui__imagelib.c) = 787e38dc9505850151d58177ea1cbadbecb96075
+SHA1 (patch-uitoolkit_fb_ui__display__x68kgrf.c) = f532c5ed1011c7752437786217c1cfccf419c926
 SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368
diff --git a/x11/mlterm/patches/patch-configure b/x11/mlterm/patches/patch-configure
index 5a8da7f4241..88c6da12836 100644
--- a/x11/mlterm/patches/patch-configure
+++ b/x11/mlterm/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.19 2020/04/27 15:45:43 tsutsui Exp $
+$NetBSD: patch-configure,v 1.20 2020/11/16 11:58:09 tsutsui Exp $
 
 - setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc
 
---- configure.orig	2020-04-26 12:54:54.000000000 +0000
+--- configure.orig	2020-11-08 12:57:32.000000000 +0000
 +++ configure
-@@ -25571,16 +25571,16 @@ if test "$INSTALL_OPT" = ""; then
- 	if test "$utmp_none_obj" = "" -a "$gui" != "quartz"; then
+@@ -25581,16 +25581,16 @@ if test "$INSTALL_OPT" = ""; then
+ 	if test "$utmp_suid" = "yes" -a "$utmp_none_obj" = "" -a "$gui" != "quartz"; then
  		has_utmp=`grep utmp /etc/group 2>/dev/null`
  		if test "$has_utmp" ; then
 -			INSTALL_OPT="-m 2755 -g utmp"
diff --git a/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c b/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c
new file mode 100644
index 00000000000..ab027c67e82
--- /dev/null
+++ b/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__x68kgrf.c
@@ -0,0 +1,41 @@
+$NetBSD: patch-uitoolkit_fb_ui__display__x68kgrf.c,v 1.4 2020/11/16 11:58:09 tsutsui Exp $
+
+- Add support of X68030 CRT Mode 19 (640x480x4) for mlterm-x68kgrf.
+ https://github.com/arakiken/mlterm/commit/0d3a3b0bdc36ee2d702167fd234dcfc3c500ac09
+
+--- uitoolkit/fb/ui_display_x68kgrf.c.orig	2020-11-08 12:57:31.000000000 +0000
++++ uitoolkit/fb/ui_display_x68kgrf.c
+@@ -153,6 +153,8 @@ static int open_display(u_int depth) {
+                                   {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
+   fb_reg_conf_t conf_1024_768_4 = {{169, 14, 28, 156, 439, 5, 40, 424, 27, 1050},
+                                    {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
++  fb_reg_conf_t conf_640_480_4 = {{99, 11, 13, 93, 524, 1, 33, 513, 27, 1047},
++                                   {4, 0x24e4 /* Graphic vram is prior to text one. */, 0x0010}};
+   struct rgb_info rgb_info_15bpp = {3, 3, 3, 6, 11, 1};
+   struct termios tm;
+ 
+@@ -214,7 +216,11 @@ static int open_display(u_int depth) {
+                   orig_reg.crtc.r08, orig_reg.crtc.r20, orig_reg.videoc.r0, orig_reg.videoc.r1,
+                   orig_reg.videoc.r2);
+ #else
+-  orig_reg = conf_768_512_4;
++  if (vinfo.gd_dwidth == 640) {
++    orig_reg = conf_640_480_4;
++  } else {
++    orig_reg = conf_768_512_4;
++  }
+   orig_reg.videoc.r2 = 0x20;
+ #endif
+ 
+@@ -240,6 +246,11 @@ static int open_display(u_int depth) {
+ 
+         _display.width = _disp.width = 1024;
+         _display.height = _disp.height = 768;
++      } else if (fb_width == 640 && fb_height == 480) {
++        conf = &conf_640_480_4;
++
++        _display.width = _disp.width = 640;
++        _display.height = _disp.height = 480;
+       } else {
+         conf = &conf_768_512_4;
+ 
diff --git a/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c b/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c
deleted file mode 100644
index 3e670c8ac23..00000000000
--- a/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c
+++ /dev/null
@@ -1,136 +0,0 @@
-$NetBSD: patch-uitoolkit_xlib_ui__imagelib.c,v 1.1 2020/06/21 17:53:01 tsutsui Exp $
-
-Pull upstrem fixes from mlterm-3.9.0-fixes.patch:
-> This patch gets mlimgloader to exit correctly after loading a wall picture.
-
---- uitoolkit/xlib/ui_imagelib.c.orig	2020-04-26 12:54:53.000000000 +0000
-+++ uitoolkit/xlib/ui_imagelib.c
-@@ -1226,20 +1226,24 @@ static int modify_image(GdkPixbuf *pixbu
- 
- #else /* NO_TOOLS */
- 
--static pid_t exec_mlimgloader(int *read_fd, Window window,
--                              u_int width, u_int height, char *path, char *dst, char *opt) {
--  int fds[2];
-+static pid_t exec_mlimgloader(int *read_fd,
-+                              int *write_fd /* close(write_fd) makes mlimgloader exit */,
-+                              Window window, u_int width, u_int height,
-+                              char *path, char *dst, char *opt) {
-+  int fds1[2];
-+  int fds2[2];
-   pid_t pid;
- 
--  if (!path || !*path || pipe(fds) == -1) {
-+  if (!path || !*path || pipe(fds1) == -1) {
-     return -1;
-   }
- 
--  if ((pid = fork()) == -1) {
--    close(fds[0]);
--    close(fds[1]);
-+  if (pipe(fds2) == -1) {
-+    goto error1;
-+  }
- 
--    return -1;
-+  if ((pid = fork()) == -1) {
-+    goto error2;
-   }
- 
-   if (pid == 0) {
-@@ -1262,9 +1266,10 @@ static pid_t exec_mlimgloader(int *read_
-     args[6] = opt;
-     args[7] = NULL;
- 
--    close(fds[0]);
-+    close(fds1[1]);
-+    close(fds2[0]);
- 
--    if (dup2(fds[1], STDOUT_FILENO) != -1) {
-+    if (dup2(fds1[0], STDIN_FILENO) != -1 && dup2(fds2[1], STDOUT_FILENO) != -1) {
-       execv(args[0], args);
-     }
- 
-@@ -1273,23 +1278,35 @@ static pid_t exec_mlimgloader(int *read_
-     exit(1);
-   }
- 
--  close(fds[1]);
-+  close(fds1[0]);
-+  close(fds2[1]);
- 
--  *read_fd = fds[0];
-+  *write_fd = fds1[1];
-+  *read_fd = fds2[0];
- 
-   return pid;
-+
-+error2:
-+  close(fds2[0]);
-+  close(fds2[1]);
-+error1:
-+  close(fds1[0]);
-+  close(fds1[1]);
-+
-+  return -1;
- }
- 
- static int load_file(ui_display_t *disp, char *path, u_int *width, u_int *height, int keep_aspect,
-                      ui_picture_modifier_t *pic_mod, Pixmap *pixmap, Pixmap *mask /* Can be NULL */
-                      ) {
-   int read_fd;
-+  int write_fd;
-   char pix_str[DIGIT_STR_LEN(Pixmap) + 1 + DIGIT_STR_LEN(Pixmap) + 1];
-   Pixmap pixmap_tmp;
-   Pixmap mask_tmp;
-   ssize_t size;
- 
--  if (exec_mlimgloader(&read_fd, ui_display_get_group_leader(disp), *width, *height,
-+  if (exec_mlimgloader(&read_fd, &write_fd, ui_display_get_group_leader(disp), *width, *height,
-                        path, "pixmap", keep_aspect ? "-a" : NULL) == -1) {
-     return 0;
-   }
-@@ -1338,22 +1355,29 @@ static int load_file(ui_display_t *disp,
- 
-   XSync(disp->display, False);
- 
--  close(read_fd); /* child process exited by this. pixmap_tmp is alive until here. */
-+  close(read_fd);
-+  /*
-+   * child process exited by this. pixmap_tmp is alive until here.
-+   * (See read(STDIN_FILENO) in mlimgloader/gdk-pixbuf.c)
-+   */
-+  close(write_fd);
- 
-   return 1;
- 
- error:
-   close(read_fd);
-+  close(write_fd);
- 
-   return 0;
- }
- 
- static u_int32_t *create_cardinals_from_file(char *path, u_int32_t width, u_int32_t height) {
-   int read_fd;
-+  int write_fd;
-   u_int32_t *cardinal;
-   ssize_t size;
- 
--  if (exec_mlimgloader(&read_fd, None, width, height, path, "stdout", NULL) == -1) {
-+  if (exec_mlimgloader(&read_fd, &write_fd, None, width, height, path, "stdout", NULL) == -1) {
-     return 0;
-   }
- 
-@@ -1381,6 +1405,11 @@ static u_int32_t *create_cardinals_from_
-   }
- 
-   close(read_fd);
-+  /*
-+   * child process exited by this. pixmap_tmp is alive until here.
-+   * (See read(STDIN_FILENO) in mlimgloader/gdk-pixbuf.c)
-+   */
-+  close(write_fd);
- 
- #ifdef DEBUG
-   bl_debug_printf(BL_DEBUG_TAG " %s(w %d h %d) is loaded.\n", path, width, height);