From nobody Mon Sep 25 22:39:19 2023 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 4Rvd8m1crdz4v9VM; Mon, 25 Sep 2023 22:39:20 +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 4Rvd8m17zPz4T0q; Mon, 25 Sep 2023 22:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695681560; 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=RHu3FRgSxq/plBfE+PbsoJGWenw58OFhcZ9DUIIEesk=; b=bqp/GUOOrm/P415Xe5HHCu2bjm0BOqyx7y+HMTwxmXDjVPG34EzPKcOPviVSUd4tw7NIu8 MUMp5yIox4yA56rOCeJZKKqpIuJiypGbiVOQfUWvjlWwHlMbGWmqO52ddG49RVwW5hafQJ Ev+Z+bfIbOHMYIeMlO5ByN8AK9cp/oyfyLOy6z+dNsLLrrQ1H5jX6ppY2LdGU+EDWk/QfG V8Pw23x3LbgUdGy3c7xTL6QgkvWlhBRsLDL05sGXf3BZxJbrhnfyUP065/W8U1jmiWjgJG HUTsYnM418hzCEOkuKhofn29mQCaog3SWbL3T9H/VYtKs7sXe1aA4O//+AIn0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695681560; a=rsa-sha256; cv=none; b=Ov3+KXpq4uD4vH6qSZvxGRdp+PcSTBVBKMkbSvAP47aLQ3HD84zDdTB6GSAsJfmArKuajc et/uDnoykyTVdwzu0c9ejRY87DpikqTIqXZ/fkpn71PFSxzAOMLG6dGsjtYNxe9l+jgIaY s0WZlhKUxst8jPhUXjsneIqUD7jIVpl0MiFA2c1pm/rzwlWSR1lSqZIS+A8XawkzlJPNrU V3Nen+AUa6zGx58VDY9TqSlkWC0axH1QR1ivTXzYx93Ku6ydAzUKP7S+Xcp+9ZbaZOEkTQ dqzNulEnPc2hFvW5+rQ83Ar7Y7BielxXxvRVIppi53Hdj7iTpXQBpTNoR1yYQw== 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=1695681560; 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=RHu3FRgSxq/plBfE+PbsoJGWenw58OFhcZ9DUIIEesk=; b=wE1kIWB0RmHDbESkBq1pAmXUfZJjiR73IQRn+auYo9NvuTVnu4fuQPn5u5Cs1O6UPzJLhq CEAiPZy/kkZIJCCgVilgouTCJvSRdEc01H8wEoj672L9+6K6FCAVL3BQa85VT5+RUmaIcK AHrQcRYkKJRCd1M1/Slu6XgfNNQScaaIlBVxmh9jGn3vfeyMYjkrc+UF9H+qVvYU7V9FBT 4C8Efmw1N0eOC1BRqVw/HFKO8ZzPaE9gEr5FCZo7NTq+KuSqTXZt6Jsy3SOrGlLeQQj1xW VUu4cp5pQluz07uDHk/2OmKqqfwFcQWc0HDUbEQCb/9JUt/MLL2pa874R2EcqQ== 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 4Rvd8m05jCzXW7; Mon, 25 Sep 2023 22:39:20 +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 38PMdJF8010130; Mon, 25 Sep 2023 22:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PMdJbU010127; Mon, 25 Sep 2023 22:39:19 GMT (envelope-from git) Date: Mon, 25 Sep 2023 22:39:19 GMT Message-Id: <202309252239.38PMdJbU010127@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: cd5299ac4798 - main - editors/nvi2: Update to V2.2.1 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: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd5299ac4798448925546ac008459d4d97233749 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd5299ac4798448925546ac008459d4d97233749 commit cd5299ac4798448925546ac008459d4d97233749 Author: Craig Leres AuthorDate: 2023-09-25 22:38:28 +0000 Commit: Craig Leres CommitDate: 2023-09-25 22:38:28 +0000 editors/nvi2: Update to V2.2.1 https://github.com/lichray/nvi2/releases/tag/v2.2.1 Changes since V2.2.0: - Display control chars in altnotation. - Intuitively jump between troff paragraphs. - Keep correct count for unprintable character sequences in opts_print(). - Do a full reformat when ^L/^R redrawing. - Fix printing of line number when the 's' command is used with the 'c' flag and the number option is set. - Fix wide buffer growth when expanding filenames. - Fix segmentation fault when window size changes. - Fix buffer overflow in ex_comm_search. - Fix segmentation fault in number increment. - Fix for terminal state corruption on q from ex-mode. - Fix core dump when tags file pattern has a trailing '\'. Reported by: Zhihao Yuan --- editors/nvi2/Makefile | 8 ++++-- editors/nvi2/distinfo | 6 ++-- editors/nvi2/files/patch-CMakeLists.txt | 10 ------- editors/nvi2/files/patch-ex_ex__subst.c | 12 -------- editors/nvi2/files/patch-vi_v__paragraph.c | 45 ------------------------------ 5 files changed, 9 insertions(+), 72 deletions(-) diff --git a/editors/nvi2/Makefile b/editors/nvi2/Makefile index 9240ea4f4994..d680a3b65e6a 100644 --- a/editors/nvi2/Makefile +++ b/editors/nvi2/Makefile @@ -1,7 +1,6 @@ PORTNAME= nvi2 -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= editors MAINTAINER= leres@FreeBSD.org @@ -35,6 +34,11 @@ PLIST_FILES= bin/nex \ man/man1/nvi.1.gz \ man/man1/nview.1.gz +post-patch: + ${REINPLACE_CMD} -e \ + '/-Wall/s/^/add_compile_options(-fcolor-diagnostics)\n/' \ + ${WRKSRC}/CMakeLists.txt + do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/nvi ${STAGEDIR}${PREFIX}/bin ${LN} ${STAGEDIR}${PREFIX}/bin/nvi ${STAGEDIR}${PREFIX}/bin/nex diff --git a/editors/nvi2/distinfo b/editors/nvi2/distinfo index caf8198d36ef..06302bfe8461 100644 --- a/editors/nvi2/distinfo +++ b/editors/nvi2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600161316 -SHA256 (lichray-nvi2-v2.2.0_GH0.tar.gz) = cd668287f55af1e2ccd64e6c0edb504aec41d25a9efe2e505abaa90c3c551455 -SIZE (lichray-nvi2-v2.2.0_GH0.tar.gz) = 439545 +TIMESTAMP = 1695680540 +SHA256 (lichray-nvi2-v2.2.1_GH0.tar.gz) = 9f7c9aef3924c0e39ef96e1aadb8f5d396825b8251addab1290aa866cf3d5af4 +SIZE (lichray-nvi2-v2.2.1_GH0.tar.gz) = 443376 diff --git a/editors/nvi2/files/patch-CMakeLists.txt b/editors/nvi2/files/patch-CMakeLists.txt deleted file mode 100644 index 06506fde8732..000000000000 --- a/editors/nvi2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2020-08-17 12:57:48 UTC -+++ CMakeLists.txt -@@ -20,7 +20,6 @@ mark_as_advanced(CMAKE_INSTALL_PREFIX) - option(USE_WIDECHAR "Enable wide character support" ON) - option(USE_ICONV "Enable iconv support" ON) - --add_compile_options(-fcolor-diagnostics) - add_compile_options($<$:-Wall>) - add_compile_options($<$:-Wno-parentheses>) - add_compile_options($<$:-Wno-uninitialized>) diff --git a/editors/nvi2/files/patch-ex_ex__subst.c b/editors/nvi2/files/patch-ex_ex__subst.c deleted file mode 100644 index 6ff00423160c..000000000000 --- a/editors/nvi2/files/patch-ex_ex__subst.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ex/ex_subst.c.orig 2020-08-01 22:27:51 UTC -+++ ex/ex_subst.c -@@ -1194,7 +1194,8 @@ re_tag_conv(SCR *sp, CHAR_T **ptrnp, size_t *plenp, in - for (; len > 0; --len) { - if (p[0] == '\\' && (p[1] == '/' || p[1] == '?')) { - ++p; -- --len; -+ if (len > 1) -+ --len; - } else if (STRCHR(L("^.[]$*"), p[0])) - *t++ = '\\'; - *t++ = *p++; diff --git a/editors/nvi2/files/patch-vi_v__paragraph.c b/editors/nvi2/files/patch-vi_v__paragraph.c deleted file mode 100644 index caa061cb8dfb..000000000000 --- a/editors/nvi2/files/patch-vi_v__paragraph.c +++ /dev/null @@ -1,45 +0,0 @@ -From 517d821de7939f74a74bb6a553df0fff425fdead Mon Sep 17 00:00:00 2001 -From: Zhihao Yuan -Date: Tue, 29 Aug 2023 03:50:08 -0500 -Subject: [PATCH] Treat consecutive paragraph indicators as different - paragraphs (#119) - -Consecutive empty lines count toward the same state, so there're -2x states (to get in and out). ^L and .PP are counted as text, -hitting those in the text should be treated as getting out of a -paragraph and then getting in. - -Closes: #118 -See also: https://marc.info/?l=openbsd-bugs&m=169100763926909&w=2 ---- - vi/v_paragraph.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/vi/v_paragraph.c b/vi/v_paragraph.c -index abe8d9cf..2d7f0756 100644 ---- vi/v_paragraph.c.orig 2020-08-01 22:27:51 UTC -+++ vi/v_paragraph.c -@@ -39,15 +39,20 @@ - if (p[0] == '\014') { \ - if (!--cnt) \ - goto found; \ -+ if (pstate == P_INTEXT && !--cnt) \ -+ goto found; \ - continue; \ - } \ - if (p[0] != '.' || len < 2) \ - continue; \ - for (lp = VIP(sp)->ps; *lp != '\0'; lp += 2) \ - if (lp[0] == p[1] && \ -- (lp[1] == ' ' && len == 2 || lp[1] == p[2]) && \ -- !--cnt) \ -- goto found; \ -+ (lp[1] == ' ' && len == 2 || lp[1] == p[2])) { \ -+ if (!--cnt) \ -+ goto found; \ -+ if (pstate == P_INTEXT && !--cnt) \ -+ goto found; \ -+ } \ - } - - /*