CVS commit: pkgsrc/x11/mlterm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/mlterm
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Mon, 27 Apr 2020 15:45:43 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Mon Apr 27 15:45:43 UTC 2020

Modified Files:
        pkgsrc/x11/mlterm: Makefile PLIST distinfo options.mk
        pkgsrc/x11/mlterm/patches: patch-configure

Log Message:
mlterm: update to 3.9.0.

pkgsrc changes:

- adjust options.mk and PLIST for new build support of both mlterm-wscons
  and mlterm-x68kgrf on NetBSD/m68k (now packages build on any
  NetBSD/m68k machines can build x68k grf(4) framebuffer version too)
- remove obsolete CONFIGURE_ARGS
- utmp is no longer optional

Upstream changes noted in doc/en/ReleaseNote:

ver 3.9.0
* Support CSI>4;1m.
* Support uniscribe for libotl on win32.
* Support SCP by Shift+DnD on HaikuOS.
* Support xdg-shell on wayland.
* Support DEC Technical character set.
* Support input of unicode characters on mlterm-fb.
* Support ormode of Sixel Graphics.
* Update unicode property table (generated from UnicodeData.txt and
  EastAsianWidth.txt) to version 12.1.0.
* Mlconfig configures files in ~/.mlterm directly if it starts without options
  or with --file option.
* Change DA1 response.
  \x1b[?63;1;2;3;4;7;29c -> \x1b[?63;1;2;3;4;6;7;15;18;22;29c
* geometry / -g option works on HaikuOS.
* Add vte 0.60 API symbols to libvte compatible library.
* Merge patches:
  https://sourceforge.net/p/mlterm/bugs/78/
  https://sourceforge.net/p/mlterm/patches/25/attachment/typos.diff
* Bug fixes:
  Fix a bug which disabled to change the value of "logsize" option from "0" to "unlimited".
  Fix segfault when "snapshot" command of OSC 5379 is executed.
  Fix mouse tracking position if "use_ot_layout = true".
  Fix segfault when mlterm-sdl2 starts with -im=uim option.
  Fix a bug which makes mlterm-sdl2 on win32 stop starting mlconfig.
  Fix compiling error on HaikuOS + gcc-x86.
  Fix http://twitter.com/hamano/status/1177087752208183296
  Fix a bug which disabled clipping of DECDHL in cairo. (Enbugged at 3.8.6)


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/mlterm/PLIST
cvs rdiff -u -r1.83 -r1.84 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/mlterm/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/mlterm/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.158 pkgsrc/x11/mlterm/Makefile:1.159
--- pkgsrc/x11/mlterm/Makefile:1.158    Sat Apr 25 18:11:08 2020
+++ pkgsrc/x11/mlterm/Makefile  Mon Apr 27 15:45:43 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.158 2020/04/25 18:11:08 rillig Exp $
+# $NetBSD: Makefile,v 1.159 2020/04/27 15:45:43 tsutsui Exp $
 
-DISTNAME=      mlterm-3.8.9
-PKGREVISION=   2
+DISTNAME=      mlterm-3.9.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
@@ -25,8 +24,6 @@ EGDIR=                        ${PREFIX}/share/examples/mlterm
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-CONFIGURE_ARGS+=       --without-libiconv-prefix
-CONFIGURE_ARGS+=       --without-libintl-prefix
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples
@@ -59,6 +56,8 @@ SUBST_SED.conf+=      -e 's|/usr/pkg/|${PREFI
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
+SPECIAL_PERMS+=                bin/mlterm ${REAL_ROOT_USER} utmp 2755
+
 INSTALLATION_DIRS=     share/doc/mlterm share/doc/mlterm/en share/doc/mlterm/ja
 
 post-install:

Index: pkgsrc/x11/mlterm/PLIST
diff -u pkgsrc/x11/mlterm/PLIST:1.43 pkgsrc/x11/mlterm/PLIST:1.44
--- pkgsrc/x11/mlterm/PLIST:1.43        Fri Nov 22 18:06:47 2019
+++ pkgsrc/x11/mlterm/PLIST     Mon Apr 27 15:45:43 2020
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.43 2019/11/22 18:06:47 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.44 2020/04/27 15:45:43 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
 bin/mlfc
 bin/mlterm
 ${PLIST.fb}bin/mlterm-fb
+${PLIST.wscons}bin/mlterm-wscons
+${PLIST.x68kgrf}bin/mlterm-x68kgrf
 lib/libmef.la
 lib/libmlterm_${CORE}.la
 lib/libpobl.la
@@ -16,22 +18,22 @@ lib/mlterm/libathena.la
 ${PLIST.bidi}lib/mlterm/libctl_bidi.la
 ${PLIST.ind}lib/mlterm/libctl_iscii.la
 ${PLIST.canna}lib/mlterm/libim-canna.la
-${PLIST.fb}${PLIST.canna}lib/mlterm/libim-canna-fb.la
-${PLIST.fb}${PLIST.fcitx}lib/mlterm/libim-fcitx-fb.la
+${PLIST.fbfiles}${PLIST.canna}lib/mlterm/libim-canna-fb.la
+${PLIST.fbfiles}${PLIST.fcitx}lib/mlterm/libim-fcitx-fb.la
 ${PLIST.fcitx}lib/mlterm/libim-fcitx.la
 ${PLIST.ibus}lib/mlterm/libim-ibus.la
-${PLIST.fb}${PLIST.ibus}lib/mlterm/libim-ibus-fb.la
+${PLIST.fbfiles}${PLIST.ibus}lib/mlterm/libim-ibus-fb.la
 lib/mlterm/libim-kbd.la
-${PLIST.fb}lib/mlterm/libim-kbd-fb.la
+${PLIST.fbfiles}lib/mlterm/libim-kbd-fb.la
 ${PLIST.m17nlib}lib/mlterm/libim-m17nlib.la
-${PLIST.fb}${PLIST.m17nlib}lib/mlterm/libim-m17nlib-fb.la
+${PLIST.fbfiles}${PLIST.m17nlib}lib/mlterm/libim-m17nlib-fb.la
 ${PLIST.scim}lib/mlterm/libim-scim.la
 ${PLIST.skk}lib/mlterm/libim-skk.la
-${PLIST.fb}${PLIST.skk}lib/mlterm/libim-skk-fb.la
+${PLIST.fbfiles}${PLIST.skk}lib/mlterm/libim-skk-fb.la
 ${PLIST.uim}lib/mlterm/libim-uim.la
-${PLIST.fb}${PLIST.uim}lib/mlterm/libim-uim-fb.la
+${PLIST.fbfiles}${PLIST.uim}lib/mlterm/libim-uim-fb.la
 ${PLIST.wnn}lib/mlterm/libim-wnn.la
-${PLIST.fb}${PLIST.wnn}lib/mlterm/libim-wnn-fb.la
+${PLIST.fbfiles}${PLIST.wnn}lib/mlterm/libim-wnn-fb.la
 ${PLIST.ind}lib/mlterm/libind_assamese.la
 ${PLIST.ind}lib/mlterm/libind_bengali.la
 ${PLIST.ind}lib/mlterm/libind_gujarati.la
@@ -95,8 +97,8 @@ 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
+${PLIST.fbfiles}share/mlterm/kbd/kbd.six
+${PLIST.fbfiles}share/mlterm/kbd/pressed_kbd.six
 share/mlterm/scrollbars/sample3/bg_body.png
 share/mlterm/scrollbars/sample3/bg_bottom.png
 share/mlterm/scrollbars/sample3/bg_top.png

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.83 pkgsrc/x11/mlterm/distinfo:1.84
--- pkgsrc/x11/mlterm/distinfo:1.83     Sat Nov 23 10:31:37 2019
+++ pkgsrc/x11/mlterm/distinfo  Mon Apr 27 15:45:43 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.83 2019/11/23 10:31:37 ryoon Exp $
+$NetBSD: distinfo,v 1.84 2020/04/27 15:45:43 tsutsui Exp $
 
-SHA1 (mlterm-3.8.9.tar.gz) = 485d1f3215e12db8cd23f39a5c06b21e3e802307
-RMD160 (mlterm-3.8.9.tar.gz) = e5b6a4ac980866076c7b4f93aa3cbf1b20b4efcb
-SHA512 (mlterm-3.8.9.tar.gz) = 0bd5468dc58095fd9432922490178fe14335724cee08d2f509e8f72a4d5f9aea9ff2f0672706e5290219575f47a1ff15dccb4e21e318c89dd5718fe6ef694c0c
-Size (mlterm-3.8.9.tar.gz) = 4101898 bytes
-SHA1 (patch-configure) = e95b426f028c9bcb9895e69bb85ce8450f78a8c8
+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 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00
 SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368

Index: pkgsrc/x11/mlterm/options.mk
diff -u pkgsrc/x11/mlterm/options.mk:1.17 pkgsrc/x11/mlterm/options.mk:1.18
--- pkgsrc/x11/mlterm/options.mk:1.17   Sun Nov  3 09:14:13 2019
+++ pkgsrc/x11/mlterm/options.mk        Mon Apr 27 15:45:43 2020
@@ -1,21 +1,35 @@
-# $NetBSD: options.mk,v 1.17 2019/11/03 09:14:13 rillig Exp $
+# $NetBSD: options.mk,v 1.18 2020/04/27 15:45:43 tsutsui Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim skk uim utmp wnn4 xft2
-PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl utmp xft2
+PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb mlterm-x68kgrf otl scim skk uim wnn4 xft2
+PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 m17nlib otl xft2
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        mlterm-fb
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           bidi cairo canna fb fcitx ibus ind m17nlib otl scim skk uim wnn xft2
+PLIST_VARS+=           bidi cairo canna fb fbfiles fcitx ibus ind m17nlib otl scim skk uim wscons wnn x68kgrf xft2
 
 .if !empty(PKG_OPTIONS:Mmlterm-fb)
+. if ${OPSYS} == "NetBSD"
+.  if ${MACHINE_ARCH} == "m68k"
+PKG_SUGGESTED_OPTIONS+=        mlterm-x68kgrf
+CONFIGURE_ARGS+=       --with-gui=xlib,wscons,x68kgrf
+SPECIAL_PERMS+=                ${PREFIX:Q}/bin/mlterm-x68kgrf ${SETUID_ROOT_PERMS}
+PLIST.x68kgrf=         yes
+.  else                # NetBSD && !m68k
+CONFIGURE_ARGS+=       --with-gui=xlib,wscons
+.  endif       # NetBSD
+SPECIAL_PERMS+=                ${PREFIX:Q}/bin/mlterm-wscons ${SETUID_ROOT_PERMS}
+PLIST.wscons=          yes
+. else         # !NetBSD (i.e. FreeBSD or Linux)
 CONFIGURE_ARGS+=       --with-gui=xlib,fb
-PLIST.fb=              yes
 SPECIAL_PERMS+=                ${PREFIX:Q}/bin/mlterm-fb ${SETUID_ROOT_PERMS}
+PLIST.fb=              yes
+. endif
 CONF_FILES+=           ${EGDIR}/font-fb ${PKG_SYSCONFDIR}/font-fb
+PLIST.fbfiles=         yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mcairo)
@@ -113,13 +127,6 @@ LICENSE+=          AND gnu-lgpl-v2
 CONFIGURE_ARGS+=       --disable-uim
 .endif
 
-.if !empty(PKG_OPTIONS:Mutmp)
-CONFIGURE_ARGS+=       --enable-utmp
-SPECIAL_PERMS+=                bin/mlterm ${REAL_ROOT_USER} utmp 2755
-.else
-CONFIGURE_ARGS+=       --disable-utmp
-.endif
-
 .if !empty(PKG_OPTIONS:Mwnn4)
 .include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-wnn

Index: pkgsrc/x11/mlterm/patches/patch-configure
diff -u pkgsrc/x11/mlterm/patches/patch-configure:1.18 pkgsrc/x11/mlterm/patches/patch-configure:1.19
--- pkgsrc/x11/mlterm/patches/patch-configure:1.18      Fri Apr  5 12:14:58 2019
+++ pkgsrc/x11/mlterm/patches/patch-configure   Mon Apr 27 15:45:43 2020
@@ -1,19 +1,22 @@
-$NetBSD: patch-configure,v 1.18 2019/04/05 12:14:58 tsutsui Exp $
+$NetBSD: patch-configure,v 1.19 2020/04/27 15:45:43 tsutsui Exp $
 
 - setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc
 
---- configure.orig     2019-03-31 13:10:47.000000000 +0000
+--- configure.orig     2020-04-26 12:54:54.000000000 +0000
 +++ configure
-@@ -25536,7 +25536,7 @@ if test "$INSTALL_OPT" = ""; then
-       if test "$utmp_none_obj" = ""; then
+@@ -25571,16 +25571,16 @@ if test "$INSTALL_OPT" = ""; then
+       if test "$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"
 +                      INSTALL_OPT=""
                else
-                       INSTALL_OPT="-m 4755 -o root"
+-                      INSTALL_OPT="-m 4755 -o root"
++                      INSTALL_OPT=""
                fi
-@@ -25545,7 +25545,7 @@ if test "$INSTALL_OPT" = ""; then
+       else
+-              INSTALL_OPT="-m 755"
++              INSTALL_OPT=""
        fi
  
        if test "$gui" = "fb" ; then

Prev by Date: CVS commit: pkgsrc/devel
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index