From nobody Fri Mar 18 13:11:28 2022 X-Original-To: dev-commits-ports-main@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 6D3561A278D4; Fri, 18 Mar 2022 13:11:28 +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 4KKkt82jJ1z4s4J; Fri, 18 Mar 2022 13:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647609088; 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=h2w3vFCkUIBvmHLKRiryKfB1yzOZki/n7CfaXeUpA6c=; b=YUEQGoJc/YwRUJ9GagYep2qrq4wZPWc4zXhTDAy8i+RjjQ2UNWNgm9lwhLqfgpDAsHVlrq woIFgM4epkrIYuEYzm+iV0py/WUkdIw55e9ULKrtSf0o1F2u1kw0Elg20IK1ySKIgfrb2G eNHYkDEEdiCMsDvblx9rSTqUYxZqTq7IRqaB17yVRD6qwRtNk4TuhwHkjuuOQWkwk6mW4Q Rckx6NJ7ZPB7R/Bzfiupv/RzhM/V6vfWxn1ZDjTlZv5Axxd+NfJY0ReBqe7DE6XPAd/TRe 0To0aVxkvOmo4MIOCsBqg7kpRojS1DXdHHSsQWFMK2oQ6XiBjIa8APrpeaQxQA== 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 3D3801F836; Fri, 18 Mar 2022 13:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22IDBStl088031; Fri, 18 Mar 2022 13:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22IDBSMX088030; Fri, 18 Mar 2022 13:11:28 GMT (envelope-from git) Date: Fri, 18 Mar 2022 13:11:28 GMT Message-Id: <202203181311.22IDBSMX088030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: f65342707d22 - main - sysutils/screen: Fix SHOWENC build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f65342707d226f3685e96f5463ea14921dc27f71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647609088; 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=h2w3vFCkUIBvmHLKRiryKfB1yzOZki/n7CfaXeUpA6c=; b=n599WpX2yJmyKgOTBYdGQyzHB/ROn7a1IVIcucs2fgoD/vE8M3THx4/c4cT5oXfvBqwNyA 8MZ6m2jnOs/SC7lGcoC8m1IljFy/E1PuHLZq0Xz7RdV4k065jlHG0kVWXl8dRDqsizwbi4 Z2klW6o5yPgsnIYzSNetZswsw50bT6ddgHr98rd6gY5ebQHpiQ9CYSJdJGDHEZjUCJFX5s YueqGJn2Ahv2yinmy5rQS9jTDdHva7UkFvNK8NiJrwN/+znhyEhXuRJWT6BLF8+MSsOwXd jQ6QkyYWanx0EOBveOlr+/l0joNEUXlJW89E60LK0jT/WconuDJAKBhMaT2mhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647609088; a=rsa-sha256; cv=none; b=kH5zkecsXuxbVbU/YfMrksGW8LpwkIRiOTdM1af5F+wVqNLvNC9OG7qIM6JEyyIx2jzTrT CSi3hndQr7AZAoVma+M8th55ThsufMdKLhJGBHYIvJLxDP2DuV+vBIjLejhwxREOIbNtzc TjmfiJPX/AKIwWDLmYD96Ga+o1AOvOxjFH+tp9jcZ5OAwVikpIYsbRx4xiGs/W1N2doHl4 zhP1R91YGBmpS4ls8AV5uAAJxQHIXDwXNW7WzixR3VjgSFabk141L6ceLC2DlSMBT4HAnZ XM5exu0xhBfnWpjdJfIYWytU/5DvYMT/4rg7No6ODNmxLuSel2AuTmyZqh1uow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f65342707d226f3685e96f5463ea14921dc27f71 commit f65342707d226f3685e96f5463ea14921dc27f71 Author: Cy Schubert AuthorDate: 2022-03-18 13:05:49 +0000 Commit: Cy Schubert CommitDate: 2022-03-18 13:05:49 +0000 sysutils/screen: Fix SHOWENC build The SHOWENC optional patch is now included in screen 4.9.0. We simply enable the option now and build. The patch is redundant. PR: 262641 Reported by: Trond.Endrestol@ximalas.info, sunpoet, many others Fixes: 9bdc78861688 --- sysutils/screen/Makefile | 2 +- sysutils/screen/files/opt-showencoding | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index e0cd0e7b650a..70c2698736ad 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -75,7 +75,7 @@ CFLAGS+= -DNONETHACK # show encoding on the status line via option "showenc" .if ${PORT_OPTIONS:MSHOWENC} -EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding +CFLAGS+= -DENCODINGS .endif post-patch: diff --git a/sysutils/screen/files/opt-showencoding b/sysutils/screen/files/opt-showencoding deleted file mode 100644 index b931f0d67292..000000000000 --- a/sysutils/screen/files/opt-showencoding +++ /dev/null @@ -1,21 +0,0 @@ ---- screen.c.orig 2017-01-17 11:28:29.397404660 -0800 -+++ screen.c 2017-01-18 12:24:40.855402000 -0800 -@@ -2760,6 +2760,18 @@ - } - p += strlen(p) - 1; - break; -+#ifdef ENCODINGS -+ case 'e': -+ *p = 0; -+ D_encoding = nwin_options.encoding > 0 ? nwin_options.encoding : 0; -+ if (win && win->w_encoding) -+ { -+ *p++ = ' '; -+ strcpy(p, EncodingName(win->w_encoding)); -+ } -+ p += strlen(p) - 1; -+ break; -+#endif - - case '{': - {