CVS commit: pkgsrc/x11/mlterm

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Oct  8 00:06:10 UTC 2024

Modified Files:
        pkgsrc/x11/mlterm: Makefile distinfo
        pkgsrc/x11/mlterm/patches: patch-configure

Log Message:
mlterm: allow bl_cv_pty to be overridden as a configure argument

As of 3.9.3, the configure script was altered to no longer allow
builders to override the value of bl_cv_pty as an argument. Restore the
previous capability, in order to continue to address PR pkg/56936.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.22 -r1.23 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.195 pkgsrc/x11/mlterm/Makefile:1.196
--- pkgsrc/x11/mlterm/Makefile:1.195    Sun Sep 22 21:40:32 2024
+++ pkgsrc/x11/mlterm/Makefile  Tue Oct  8 00:06:09 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.195 2024/09/22 21:40:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.196 2024/10/08 00:06:09 gutteridge Exp $
 
 DISTNAME=      mlterm-3.9.3
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=arakiken/}
 GITHUB_PROJECT=        ${PKGBASE}

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.100 pkgsrc/x11/mlterm/distinfo:1.101
--- pkgsrc/x11/mlterm/distinfo:1.100    Sun Sep 22 21:40:32 2024
+++ pkgsrc/x11/mlterm/distinfo  Tue Oct  8 00:06:09 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.100 2024/09/22 21:40:32 tsutsui Exp $
+$NetBSD: distinfo,v 1.101 2024/10/08 00:06:09 gutteridge 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) = c65e0aae9725c50f4869112f13beaf04ed634659
+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

Index: pkgsrc/x11/mlterm/patches/patch-configure
diff -u pkgsrc/x11/mlterm/patches/patch-configure:1.22 pkgsrc/x11/mlterm/patches/patch-configure:1.23
--- pkgsrc/x11/mlterm/patches/patch-configure:1.22      Sun Sep 22 21:40:32 2024
+++ pkgsrc/x11/mlterm/patches/patch-configure   Tue Oct  8 00:06:09 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.22 2024/09/22 21:40:32 tsutsui Exp $
+$NetBSD: patch-configure,v 1.23 2024/10/08 00:06:09 gutteridge Exp $
 
 - setuid root / setgid utmp is handled by SPECIAL_PERMS in pkgsrc
 
@@ -10,6 +10,8 @@ $NetBSD: patch-configure,v 1.22 2024/09/
   > * 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
 @@ -700,6 +700,8 @@ SDL_CFLAGS
@@ -121,7 +123,39 @@ $NetBSD: patch-configure,v 1.22 2024/09/
                fi
  
  
-@@ -28244,16 +28323,16 @@ if test "$INSTALL_OPT" = ""; then
+@@ -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
        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