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: Thu, 3 Apr 2025 16:33:08 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Thu Apr  3 16:33:08 UTC 2025

Modified Files:
        pkgsrc/x11/mlterm: Makefile PLIST distinfo hacks.mk options.mk
        pkgsrc/x11/mlterm/patches: patch-configure
Removed Files:
        pkgsrc/x11/mlterm/patches: patch-common_c__imagelib.c
            patch-common_c__sixel.c patch-configure.in
            patch-contrib_scrollbar_pixmap__engine_pixmap__engine.c
            patch-doc_ja_README.ja patch-drcssixel_DRCS-SIXEL-v2
            patch-libvterm_vterm.c patch-man_mlterm.1
            patch-tool_mlconfig_Makefile.in patch-tool_mlimgloader_Makefile.in
            patch-tool_mlimgloader_gdk-pixbuf.c patch-tool_mlimgloader_libpng.c
            patch-tool_mlimgloader_stb__image__resize2.h
            patch-uitoolkit_beos_ui__imagelib.c
            patch-uitoolkit_console_ui__imagelib.c
            patch-uitoolkit_fb_ui__imagelib.c
            patch-uitoolkit_fb_ui__virtual__kbd.c
            patch-uitoolkit_quartz_ui__imagelib.c
            patch-uitoolkit_ui__copymode.c patch-uitoolkit_ui__copymode.h
            patch-uitoolkit_ui__draw__str.c patch-uitoolkit_ui__imagelib.h
            patch-uitoolkit_ui__picture.c patch-uitoolkit_ui__picture.h
            patch-uitoolkit_ui__sb__view.h patch-uitoolkit_ui__screen.c
            patch-uitoolkit_ui__screen__manager.c patch-uitoolkit_ui__xic.h
            patch-uitoolkit_win32_ui__imagelib.c
            patch-uitoolkit_xlib_ui__imagelib.c patch-uitoolkit_xlib_ui__xic.c
            patch-vtemu_Makefile.in patch-vtemu_vt__char.h
            patch-vtemu_vt__edit.c patch-vtemu_vt__parser.c
            patch-vtemu_vt__parser.h

Log Message:
mlterm: update to 3.9.4.

pkgsrc changes:
- remove patches already integrated into the upstream source tree
- remove hack for PR pkg/56936 fixed by upstream issue #113
  https://github.com/arakiken/mlterm/issues/113
- add options libssh2 (disabled by default)
- misc pkglint

Upstream changes (from doc/en/ReleaseNote):

ver 3.9.4
* Support Shift+Control+v and Shift+Control+c to copy&paste via clipboard by default.
  Drop -P/--clip/use_clipboard option.
  Add --chsel/change_selection_immediately option in anything except xlib and wayland.
* Add COPY_CLIPBOARD shortcut key.
* Pressing '?' in copy mode searches for a string backward.
  (https://github.com/arakiken/mlterm/issues/72)
* Support wp-primary-selection protocol in wayland.
* Support "exesel:" operation in ~/.mlterm/key in win32.
* Support libvte compatible library in win32. (See gtk/README)
* Support ConPTY in win32.
* Support Alternate Scroll Mode. (https://github.com/arakiken/mlterm/issues/80)
* Support P2=1 in sixel graphics. (https://github.com/arakiken/mlterm/issues/81)
* Support libpng to build mlimgloader if gdk-pixbuf is not found.
  (https://github.com/arakiken/mlterm/issues/96)
* Support Emoji variation selectors 15 and 16. (https://github.com/arakiken/mlterm/issues/84)
* Add --conpty/use_conpty and --winsize/output_xtwinops_in_resizing options in win32.
* Add --norepkey/mod_keys_to_stop_mouse_report option.
* Add --clp/use_clipping option. (https://github.com/arakiken/mlterm/issues/132)
* Add tool/accessories/applycfg.sh and applyfontcfg.sh
  (https://github.com/arakiken/mlterm/issues/71)
* Add "de", "fr", "es", "pt" and "jp106" to available values for "kbd"
  input method argument.
* Add vte 0.78 API symbols to libvte compatible library.
* Change the default value of "xterm" entry in etc/termcap from "ut" to "kb=^H:ut".
* Update unicode property table (generated from UnicodeData.txt and
  EastAsianWidth.txt) to version 15.1.0.
* Merge patches:
  https://github.com/arakiken/mlterm/pull/68
  https://github.com/arakiken/mlterm/pull/83 (Add --locktitle/use_locked_title option)
  https://github.com/arakiken/mlterm/pull/119
* Bug fixes:
  https://github.com/arakiken/mlterm/issues/52
  https://github.com/arakiken/mlterm/issues/67
  https://github.com/arakiken/mlterm/issues/69
  https://github.com/arakiken/mlterm/issues/73
  https://github.com/arakiken/mlterm/issues/78
  https://github.com/arakiken/mlterm/issues/79
  https://github.com/arakiken/mlterm/issues/92
  https://github.com/arakiken/mlterm/issues/97
  https://github.com/arakiken/mlterm/issues/103
  https://github.com/arakiken/mlterm/issues/107
  https://github.com/arakiken/mlterm/issues/111
  https://github.com/arakiken/mlterm/issues/113
  https://github.com/arakiken/mlterm/issues/118
  https://github.com/arakiken/mlterm/issues/124
  https://github.com/arakiken/mlterm/issues/125
  https://github.com/arakiken/mlterm/issues/126
  https://github.com/arakiken/mlterm/issues/127
  https://github.com/arakiken/mlterm/issues/128
  https://github.com/arakiken/mlterm/issues/129
  https://github.com/arakiken/mlterm/issues/137
  Fix an issue where mlconfig was not displayed.
  Fix an issue where Control+Shift+xxx shortcut didn't work in SDL2.
  Fix unexpected reset of inverted colors in selected area in SDL2.
  Fix --point / use_point_size option which broke font width in win32.
  Fix drawing glyphs in incorrect position with some fonts, such as devanagari.
  (https://github.com/arakiken/mlterm/issues/131)


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/mlterm/PLIST
cvs rdiff -u -r1.101 -r1.102 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/mlterm/hacks.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/mlterm/options.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/mlterm/patches/patch-common_c__imagelib.c
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/mlterm/patches/patch-common_c__sixel.c \
    pkgsrc/x11/mlterm/patches/patch-contrib_scrollbar_pixmap__engine_pixmap__engine.c \
    pkgsrc/x11/mlterm/patches/patch-doc_ja_README.ja \
    pkgsrc/x11/mlterm/patches/patch-drcssixel_DRCS-SIXEL-v2 \
    pkgsrc/x11/mlterm/patches/patch-libvterm_vterm.c \
    pkgsrc/x11/mlterm/patches/patch-man_mlterm.1 \
    pkgsrc/x11/mlterm/patches/patch-tool_mlconfig_Makefile.in \
    pkgsrc/x11/mlterm/patches/patch-tool_mlimgloader_Makefile.in \
    pkgsrc/x11/mlterm/patches/patch-tool_mlimgloader_gdk-pixbuf.c \
    pkgsrc/x11/mlterm/patches/patch-tool_mlimgloader_libpng.c \
    pkgsrc/x11/mlterm/patches/patch-tool_mlimgloader_stb__image__resize2.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_beos_ui__imagelib.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_console_ui__imagelib.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__imagelib.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__virtual__kbd.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_quartz_ui__imagelib.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__copymode.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__copymode.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__draw__str.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__imagelib.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__picture.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__picture.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__sb__view.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__screen.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__screen__manager.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_ui__xic.h \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_win32_ui__imagelib.c \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__xic.c \
    pkgsrc/x11/mlterm/patches/patch-vtemu_Makefile.in \
    pkgsrc/x11/mlterm/patches/patch-vtemu_vt__char.h \
    pkgsrc/x11/mlterm/patches/patch-vtemu_vt__edit.c \
    pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.h
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/mlterm/patches/patch-configure
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/mlterm/patches/patch-configure.in \
    pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_xlib_ui__imagelib.c

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.202 pkgsrc/x11/mlterm/Makefile:1.203
--- pkgsrc/x11/mlterm/Makefile:1.202    Fri Dec 27 08:21:02 2024
+++ pkgsrc/x11/mlterm/Makefile  Thu Apr  3 16:33:06 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.202 2024/12/27 08:21:02 wiz Exp $
+# $NetBSD: Makefile,v 1.203 2025/04/03 16:33:06 tsutsui Exp $
 
-DISTNAME=      mlterm-3.9.3
-PKGREVISION=   19
+DISTNAME=      mlterm-3.9.4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=arakiken/}
 GITHUB_PROJECT=        ${PKGBASE}
@@ -31,16 +30,6 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-# Work around the fact this package tests whether posix_openpt(3) works at
-# runtime. This fails in typical sandboxed build environments (including
-# TNF's used for official binary builds), which causes a fallback to use
-# "old-style" BSD ptys. (If a user was running a kernel with non-standard
-# settings that don't support the expectations here, they'd need to disable
-# this override.) See PR pkg/56936.
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=                bl_cv_pty=streams
-.endif
-
 SUBST_CLASSES+=                link
 SUBST_MESSAGE.link=    Fixing hardcoded paths and link options in Makefiles.
 SUBST_STAGE.link=      pre-configure

Index: pkgsrc/x11/mlterm/PLIST
diff -u pkgsrc/x11/mlterm/PLIST:1.47 pkgsrc/x11/mlterm/PLIST:1.48
--- pkgsrc/x11/mlterm/PLIST:1.47        Tue Jul 26 02:25:15 2022
+++ pkgsrc/x11/mlterm/PLIST     Thu Apr  3 16:33:06 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2022/07/26 02:25:15 rin Exp $
+@comment $NetBSD: PLIST,v 1.48 2025/04/03 16:33:06 tsutsui Exp $
 bin/mlcc
 bin/mlclient
 bin/mlclientx
@@ -50,6 +50,7 @@ lib/mlterm/libmozmodern.la
 lib/mlterm/libnext.la
 ${PLIST.otl}lib/mlterm/libotl.la
 ${PLIST.gdk_pixbuf2}lib/mlterm/libpixmap_engine.la
+${PLIST.ssh2}lib/mlterm/libptyssh.la
 lib/mlterm/libsample.la
 ${PLIST.cairo}lib/mlterm/libtype_cairo.la
 ${PLIST.xft2}lib/mlterm/libtype_xft.la

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.101 pkgsrc/x11/mlterm/distinfo:1.102
--- pkgsrc/x11/mlterm/distinfo:1.101    Tue Oct  8 00:06:09 2024
+++ pkgsrc/x11/mlterm/distinfo  Thu Apr  3 16:33:06 2025
@@ -1,43 +1,7 @@
-$NetBSD: distinfo,v 1.101 2024/10/08 00:06:09 gutteridge Exp $
+$NetBSD: distinfo,v 1.102 2025/04/03 16:33:06 tsutsui Exp $
 
-BLAKE2s (mlterm-3.9.3.tar.gz) = d3730227673c203bd24c786b95a6c49751a3f554251e2b708a262994526207ec
-SHA512 (mlterm-3.9.3.tar.gz) = 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1
-Size (mlterm-3.9.3.tar.gz) = 4272090 bytes
-SHA1 (patch-common_c__imagelib.c) = 06dd0b570470c28b8d01f1a55c2ee13492e20ee7
-SHA1 (patch-common_c__sixel.c) = 48625d2e64c67942137e357deb4a926a90fb6261
-SHA1 (patch-configure) = f20beb283fea4bb545846133c13204a998b5548d
-SHA1 (patch-configure.in) = c90387f00def6d158e4e3dfcb9d07f5aab9d540f
-SHA1 (patch-contrib_scrollbar_pixmap__engine_pixmap__engine.c) = 5b5922abffe8571f699dd68f339b5a8a1efec6ab
-SHA1 (patch-doc_ja_README.ja) = 14a23d3b48fd16ac900ecb002c8a20d70359abb2
-SHA1 (patch-drcssixel_DRCS-SIXEL-v2) = d105e72a56bffbbe47a153637ab639daf00b7702
+BLAKE2s (mlterm-3.9.4.tar.gz) = 3fff2f4110196b1cf592c0cb2f73e131d8434eda1f21288cecc7c5552255aab5
+SHA512 (mlterm-3.9.4.tar.gz) = f03ce24b89f74510cd8924a2cd9ab795c6ebf7f7ef2b69fb8a17bf3f5855c255cf86558b0e5abc7db64175f7c909b165cf96663825b98f4a2df4371d5e4a9469
+Size (mlterm-3.9.4.tar.gz) = 4227568 bytes
+SHA1 (patch-configure) = bc36ec849b8fa3ee7e9fff971e75f9078b0b738a
 SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0
-SHA1 (patch-libvterm_vterm.c) = e364700ecd70545a87d41ed126cf1b5fbf4d448d
-SHA1 (patch-man_mlterm.1) = 87551485966fae256d28a8c24cc44419d87f615e
-SHA1 (patch-tool_mlconfig_Makefile.in) = d1a8e0310d621a0b4a700d243bffbd445d28a95f
-SHA1 (patch-tool_mlimgloader_Makefile.in) = 37a70cd1a58fdcdf14d3e193d0fdf356b5e5138a
-SHA1 (patch-tool_mlimgloader_gdk-pixbuf.c) = 2558c3bff407b1f93dc26af98c72c8c523feb35c
-SHA1 (patch-tool_mlimgloader_libpng.c) = 76eb507669d0b128d8665be5ac1a21e357f80698
-SHA1 (patch-tool_mlimgloader_stb__image__resize2.h) = 75b3f998ed39cc77f38e28c60e31cd4443e331db
-SHA1 (patch-uitoolkit_beos_ui__imagelib.c) = 16f5e3c0feaae28bc0c8716974eef5298e740f32
-SHA1 (patch-uitoolkit_console_ui__imagelib.c) = 524254ac47ae29912de0402eadfa2de6bb70006a
-SHA1 (patch-uitoolkit_fb_ui__imagelib.c) = b491eec7810e13774946530d3c56b0d07ad0479c
-SHA1 (patch-uitoolkit_fb_ui__virtual__kbd.c) = fc12f58a091230eb4a4fe93ac7691710bd46567b
-SHA1 (patch-uitoolkit_quartz_ui__imagelib.c) = b2838ef86b0f1bff5d0a02653fe8fa22e0d55726
-SHA1 (patch-uitoolkit_ui__copymode.c) = 3c1b43a7f8358f0437cc47503641d087bdaef526
-SHA1 (patch-uitoolkit_ui__copymode.h) = 716a0962593fe1e6ee3eef77262d6b1094333e2d
-SHA1 (patch-uitoolkit_ui__draw__str.c) = 625c51e1e52ec4575771bedea0313357ea7256a6
-SHA1 (patch-uitoolkit_ui__imagelib.h) = b1d95c10dfb2277987a9f8b7d44bfc1a918b2e79
-SHA1 (patch-uitoolkit_ui__picture.c) = a461434695a4c7eb37c108881db2da7bee8c6e78
-SHA1 (patch-uitoolkit_ui__picture.h) = c8e9cf53b0837d1398f97961387842da7b7eb2b9
-SHA1 (patch-uitoolkit_ui__sb__view.h) = b57803c28111911a53c1d1d84eecbf0076a85913
-SHA1 (patch-uitoolkit_ui__screen.c) = 881b4c099e078236833df1606bf5362e97f925c4
-SHA1 (patch-uitoolkit_ui__screen__manager.c) = fa38d6f752a53834579660b24ac6239d201e0745
-SHA1 (patch-uitoolkit_ui__xic.h) = 71f7c2c3e03d734afa87326a5d24616fda5ca82e
-SHA1 (patch-uitoolkit_win32_ui__imagelib.c) = 2bb24b86d8822c327e883cc78383c7f5937d159f
-SHA1 (patch-uitoolkit_xlib_ui__imagelib.c) = ba8273c03bb72880daaede46c2db8e170ee3a721
-SHA1 (patch-uitoolkit_xlib_ui__xic.c) = eea01b83b844c517ea5b892cbf797ef8c78decd0
-SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368
-SHA1 (patch-vtemu_vt__char.h) = 60180a19bb54e44f2e97be059d2a748b229ca674
-SHA1 (patch-vtemu_vt__edit.c) = 04d4f8896ada7e0c91b9f43ade5f135253a8e6a2
-SHA1 (patch-vtemu_vt__parser.c) = 58b6079f18495c69f8e9301bd7ec857c507572a5
-SHA1 (patch-vtemu_vt__parser.h) = 61fe0baa747839ef2695e1a846fd7b74d58572d1

Index: pkgsrc/x11/mlterm/hacks.mk
diff -u pkgsrc/x11/mlterm/hacks.mk:1.2 pkgsrc/x11/mlterm/hacks.mk:1.3
--- pkgsrc/x11/mlterm/hacks.mk:1.2      Tue Nov 24 09:29:45 2020
+++ pkgsrc/x11/mlterm/hacks.mk  Thu Apr  3 16:33:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2020/11/24 09:29:45 tsutsui Exp $
+# $NetBSD: hacks.mk,v 1.3 2025/04/03 16:33:06 tsutsui Exp $
 
 .if !defined(MLTERM_HACKS_MK)
 MLTERM_HACKS_MK=       defined
@@ -8,7 +8,7 @@ MLTERM_HACKS_MK=        defined
 # On NetBSD/sh3el 9.0 (gcc 7.4.0) and 9.1 (gcc 7.5.0), the default -Os
 # causes an error on compiling vt_line_bidi.c and -fno-dce works around.
 # (PR/55265)
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-7.*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-sh3*} && ${CC_VERSION:Mgcc-7.*}
 PKG_HACKS+=            optimisation
 # XXX: is there any good way to replace the default -Os with multiple args?
 #BUILDLINK_TRANSFORM+=

Index: pkgsrc/x11/mlterm/options.mk
diff -u pkgsrc/x11/mlterm/options.mk:1.25 pkgsrc/x11/mlterm/options.mk:1.26
--- pkgsrc/x11/mlterm/options.mk:1.25   Sun Sep 22 21:40:32 2024
+++ pkgsrc/x11/mlterm/options.mk        Thu Apr  3 16:33:06 2025
@@ -1,17 +1,17 @@
-# $NetBSD: options.mk,v 1.25 2024/09/22 21:40:32 tsutsui Exp $
+# $NetBSD: options.mk,v 1.26 2025/04/03 16:33:06 tsutsui Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mlterm
-PKG_SUPPORTED_OPTIONS= cairo canna fribidi gdk_pixbuf2 gtk ibus libind m17nlib mlterm-fb otl scim skk uim wnn4 xft2 debug
-PKG_SUGGESTED_OPTIONS= cairo fribidi gdk_pixbuf2 gtk m17nlib otl xft2
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mlterm
+PKG_SUPPORTED_OPTIONS=         cairo canna fribidi gdk_pixbuf2 gtk ibus libind libssh2 m17nlib mlterm-fb otl scim skk uim wnn4 xft2 debug
+PKG_SUGGESTED_OPTIONS=         cairo fribidi gdk_pixbuf2 gtk m17nlib otl xft2
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        mlterm-fb
+PKG_SUGGESTED_OPTIONS+=                mlterm-fb
 .endif
 PKG_OPTIONS_OPTIONAL_GROUPS=   fcitx
 PKG_OPTIONS_GROUP.fcitx=       fcitx fcitx5
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           bidi cairo canna fb fbfiles fcitx gdk_pixbuf2 gtk ibus ind m17nlib otl scim skk uim wscons wnn x68kgrf xft2
+PLIST_VARS+=           bidi cairo canna fb fbfiles fcitx gdk_pixbuf2 gtk ibus ind m17nlib otl scim skk ssh2 uim wscons wnn x68kgrf xft2
 
 .if !empty(PKG_OPTIONS:Mmlterm-fb)
 .  if ${OPSYS} == "NetBSD"
@@ -104,6 +104,14 @@ LICENSE+=          AND gnu-lgpl-v2
 CONFIGURE_ARGS+=       --disable-ind
 .endif
 
+.if !empty(PKG_OPTIONS:Mlibssh2)
+.include "../../security/libssh2/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ssh2
+PLIST.ssh2=            yes
+.else
+CONFIGURE_ARGS+=       --disable-ssh2
+.endif
+
 .if !empty(PKG_OPTIONS:Mm17nlib)
 .include "../../devel/m17n-lib/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-m17nlib

Index: pkgsrc/x11/mlterm/patches/patch-configure
diff -u pkgsrc/x11/mlterm/patches/patch-configure:1.23 pkgsrc/x11/mlterm/patches/patch-configure:1.24
--- pkgsrc/x11/mlterm/patches/patch-configure:1.23      Tue Oct  8 00:06:09 2024
+++ pkgsrc/x11/mlterm/patches/patch-configure   Thu Apr  3 16:33:06 2025
@@ -1,161 +1,10 @@
-$NetBSD: patch-configure,v 1.23 2024/10/08 00:06:09 gutteridge Exp $
+$NetBSD: patch-configure,v 1.24 2025/04/03 16:33:06 tsutsui Exp $
 
 - setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc
 
-- pull upstream fixes to use libpng if gdk-pixbuf is not used.
-  https://github.com/arakiken/mlterm/commit/0af65caa
-  > * README, doc/ja/README.ja: Updated.
-  > * uitoolkit/ui_copymode.c: Replace the first character of input text
-  >   by '/' or '?' in starting the copy mode every time.
-  > * configure.in: Check libpng if gdk-pixbuf is not found.
-  > * tool/mlimgloader/libpng.c, stb_image_resize2.h: Added.
-
-- allow bl_cv_pty to be overridden as a configure argument (PR pkg/56936)
-
---- configure.orig     2023-04-01 13:54:40.000000000 +0000
+--- configure.orig     2025-03-29 23:13:10.000000000 +0000
 +++ configure
-@@ -700,6 +700,8 @@ SDL_CFLAGS
- EMOJI_LIBS
- EMOJI_CFLAGS
- MLIMGLOADER_LIB
-+LIBPNG_LIBS
-+LIBPNG_CFLAGS
- PERL
- GTK_LIBS_FOR_MLCONFIG
- GTK_CFLAGS_FOR_MLCONFIG
-@@ -1055,6 +1057,8 @@ PROTOBUF_CFLAGS
- PROTOBUF_LIBS
- VTE_CFLAGS
- VTE_LIBS
-+LIBPNG_CFLAGS
-+LIBPNG_LIBS
- SDL_CFLAGS
- SDL_LIBS
- SDLTTF_CFLAGS
-@@ -1829,6 +1833,9 @@ Some influential environment variables:
-               linker flags for PROTOBUF, overriding pkg-config
-   VTE_CFLAGS  C compiler flags for VTE, overriding pkg-config
-   VTE_LIBS    linker flags for VTE, overriding pkg-config
-+  LIBPNG_CFLAGS
-+              C compiler flags for LIBPNG, overriding pkg-config
-+  LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
-   SDL_CFLAGS  C compiler flags for SDL, overriding pkg-config
-   SDL_LIBS    linker flags for SDL, overriding pkg-config
-   SDLTTF_CFLAGS
-@@ -21720,7 +21727,79 @@ rm -f core conftest.err conftest.$ac_obj
-               elif test "$have_gdk_pixbuf2" = "yes" -o "$have_gdk_pixbuf1" = "yes" ; then
-                       MLIMGLOADER_LIB=gdk-pixbuf
-               else
--                      MLIMGLOADER_LIB=none
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5
-+$as_echo_n "checking for LIBPNG... " >&6; }
-+
-+if test -n "$LIBPNG_CFLAGS"; then
-+    pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
-+                    test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$LIBPNG_LIBS"; then
-+    pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
-+                    test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+              LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng" 2>&1`
-+        else
-+              LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng" 2>&1`
-+        fi
-+      # Put the nasty error message in config.log where it belongs
-+      echo "$LIBPNG_PKG_ERRORS" >&5
-+
-+      MLIMGLOADER_LIB=none
-+elif test $pkg_failed = untried; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+      MLIMGLOADER_LIB=none
-+else
-+      LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS
-+      LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+      MLIMGLOADER_LIB=libpng
-+fi
-+
-+
-               fi
- 
- 
-@@ -25095,12 +25174,16 @@ fi
- #
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pty/tty type" >&5
- $as_echo_n "checking for pty/tty type... " >&6; }
--if test "$bl_cv_win32" = "yes" ; then
--      bl_cv_pty=none
--elif test "$bl_cv_mingw" = "yes" ; then
--      bl_cv_pty=streams
--elif test "$host" = "$build" ; then
--      ac_fn_c_check_func "$LINENO" "posix_openpt" "ac_cv_func_posix_openpt"
-+if ${bl_cv_pty+:} false; then : 
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+      if test "$bl_cv_win32" = "yes" ; then
-+              bl_cv_pty=none
-+      elif test "$bl_cv_mingw" = "yes" ; then
-+              bl_cv_pty=streams
-+      elif test "$host" = "$build" ; then
-+              ac_fn_c_check_func "$LINENO" "posix_openpt" "ac_cv_func_posix_openpt"
- if test "x$ac_cv_func_posix_openpt" = xyes; then :
-   if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -25177,6 +25260,8 @@ else
-   bl_cv_pty=bsd
- fi
- 
-+      fi
-+
- fi
- # Check whether --enable-pty_helper was given.
- if test "${enable_pty_helper+set}" = set; then :
-@@ -28244,16 +28329,16 @@ if test "$INSTALL_OPT" = ""; then
+@@ -28392,16 +28392,16 @@ if test "$INSTALL_OPT" = ""; then
        if test "$utmp_suid" = "yes" -a "$UTMP_NAME" != "none" -a "$gui" != "quartz"; then
                has_utmp=`grep utmp /etc/group 2>/dev/null`
                if test "$has_utmp" ; then

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

Home | Main Index | Thread Index | Old Index