From nobody Wed Jan 3 03:24:36 2024
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T4ZpD3pf9z56XlB;
Wed, 3 Jan 2024 03:24:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4T4ZpD3Fngz4PY7;
Wed, 3 Jan 2024 03:24:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1704252276;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MlhUJ54n/UqIqn31Qhv0Z8ZDlXEpCZE2Nybod7zTBl8=;
b=S+e/4dvUiQTUt49XfkOgT+IyZInOH1DqxOvmwRj+0BAj5EmMPWijXSqPILks+u+ISyC7ee
XtuNeyVTDc6fvGJqirqlCV8VinJFUzdULNZnnauXkJqjtEAiWA4hUJU1yogAl0/Ba05tgw
QhDzgwRx8Ih7paH4B3sXIqgZX+ehJPa5/lRbn8dly62hHyKQAQ/gB4i2wL5ANjSywY5SXB
QZwHzQbiJJgZOj0TEWY6OvbcueqZeexI+pgeoPOpUaVV6nyHvZlWmSjuBr/PI/rxrY4Ofi
KKNa0PWDoayXGs5pIOxve7VMg0No/TsTrfv1YFzIooK+zmkn0rBfz38i+hVv7Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704252276; a=rsa-sha256; cv=none;
b=iuahJjbG8rgYbOemE4T+62DZ1TpMxMqkdoBSy9PcedZ2wPRw4TTgncD+WWQ9gTtuFzx8cX
Mw9OBRBRFC4LQo5PaVqzyAIEocnSJeo9/YjyK4pybG/1snTOBf03tRlkfg8ukKGPGHWVVC
l+tq1CA6A98IjmFjCerKZbxmPcpeL7a8cGArue1uQdI8BNZP18ZUaFKSSnGjDXvPh6rrJb
LDm21awIbumw3Gg+6N4X8LLIYQdkAa+9GeDCh85mWy4oy7h4nV9YV/IhDLcHPHX8AAl1Nv
i+xPbQSa/UaJAPlFvHWSIf9u2JQRg+Kj8IUYJ0dPMPj6bU7guoDWWDYvk5Z6mA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1704252276;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=MlhUJ54n/UqIqn31Qhv0Z8ZDlXEpCZE2Nybod7zTBl8=;
b=VddnuU34Y4QbdUbxqp2a8kPhYuGUoHUOBSuERB/eOR8kEkGn4EVRl8T/GQYJHb7sn5cPgr
QB6jNEoO6KFUYFDSQRWLX5nqNDvVNaZnBrhXKWqyjKSstVAx72IuxsWnOFNygJJqcbXskz
yIzV7+9ZKZcNEaIhcwjS0y3KGBXW1lrUh9YBflNVV3BfrdLu3axQuSbSq569shQzkK1o5R
O8Q6n0Dz7/Sixyq2jttQol5zalvkNOTl6GTGPxs/OH3B2K8BzGNVvBrd1CC4WN5XMLs34W
zrKCME13AkxPrQC5iHSVNjRM78CzPZKCU1UYEMrFD3c6rybKWNmz5FwwS8cAmg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4ZpD218Xz1SBM;
Wed, 3 Jan 2024 03:24:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4033Oakq092512;
Wed, 3 Jan 2024 03:24:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4033OaY0092509;
Wed, 3 Jan 2024 03:24:36 GMT
(envelope-from git)
Date: Wed, 3 Jan 2024 03:24:36 GMT
Message-Id: <202401030324.4033OaY0092509@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 8659dcf7d134 - main - sysutils/screen: Ignore legacy
pty (pty.ko) during build
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 8659dcf7d13450b4a26260b284d3a71367628b8c
Auto-Submitted: auto-generated
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8659dcf7d13450b4a26260b284d3a71367628b8c
commit 8659dcf7d13450b4a26260b284d3a71367628b8c
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-01-03 03:17:27 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-01-03 03:23:18 +0000
sysutils/screen: Ignore legacy pty (pty.ko) during build
screen built on a machine with pty.ko (legacy SYSVR4 pty support)
loaded will fail to run on machines without pty.ko loaded. It will
try to open /dev/ptmx and fail, crashing screen. This commit fixes
this by removing the test for /dev/ptmx (legacy SYSVR4 pty support).
Reported by: Jonathan Chen <jonc@chen.org.nz>
---
sysutils/screen/Makefile | 1 +
sysutils/screen/files/patch-configure.ac | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 0ca99d2f6c9a..fe7f443fb75e 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -1,5 +1,6 @@
PORTNAME= screen
PORTVERSION= 4.9.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= GNU \
ftp://ftp.gnu.org/gnu/screen/ \
diff --git a/sysutils/screen/files/patch-configure.ac b/sysutils/screen/files/patch-configure.ac
index 77608dbebb05..1f32616b3797 100644
--- a/sysutils/screen/files/patch-configure.ac
+++ b/sysutils/screen/files/patch-configure.ac
@@ -1,5 +1,5 @@
--- configure.ac.orig 2023-08-15 17:29:26.000000000 -0700
-+++ configure.ac 2023-08-19 07:32:42.246552000 -0700
++++ configure.ac 2024-01-02 18:30:11.205776000 -0800
@@ -669,7 +669,7 @@
tgetent((char *)0, (char *)0);
],,
@@ -9,7 +9,27 @@
AC_CHECKING(libcurses)
AC_TRY_LINK([
#include <curses.h>
-@@ -900,11 +900,11 @@
+@@ -756,19 +756,6 @@
+ fi
+ fi
+
+-if test "$cross_compiling" = no ; then
+-AC_CHECKING(for SVR4 ptys)
+-sysvr4ptys=
+-if test -c /dev/ptmx ; then
+-AC_TRY_LINK([
+- #include <stdlib.h>
+-], [
+- ptsname(0);grantpt(0);unlockpt(0);
+-],[AC_DEFINE(HAVE_SVR4_PTYS)
+-sysvr4ptys=1])
+-fi
+-fi
+-
+ AC_CHECK_FUNCS(getpt)
+
+ dnl check for openpty()
+@@ -900,11 +887,11 @@
dnl
dnl **** utmp handling ****
dnl
@@ -23,7 +43,7 @@
#include <utmpx.h>
#define utmp utmpx
#else
-@@ -917,11 +917,11 @@
+@@ -917,11 +904,11 @@
[int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT),
olibs="$LIBS"
LIBS="$LIBS -lgen"
@@ -37,7 +57,7 @@
#include <utmpx.h>
#define utmp utmpx
#else
-@@ -931,13 +931,13 @@
+@@ -931,13 +918,13 @@
#define pututline _pututline
#endif
],