Hi,
Here's a diff to update to the latest release of nvi2, released a few
hours ago. It has a number of crash fixes as well as the paragraph
movement change that was recently added to base.
I would like to get this in before release, but I want to see some
positive test reports first.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/nvi/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 11 Mar 2022 18:58:33 -0000 1.20
+++ Makefile 25 Sep 2023 18:16:31 -0000
@@ -1,6 +1,6 @@
COMMENT= ex/vi text editor with wide character support
-V = 2.2.0
+V = 2.2.1
GH_ACCOUNT = lichray
GH_PROJECT = nvi2
GH_TAGNAME = v$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/nvi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 10 Aug 2020 18:20:21 -0000 1.6
+++ distinfo 25 Sep 2023 18:16:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (nvi-2.2.0.tar.gz) = zWaCh/Va8eLM1k5sDttQSuxB0lqe/i5QWrqpDDxVFFU=
-SIZE (nvi-2.2.0.tar.gz) = 439545
+SHA256 (nvi-2.2.1.tar.gz) = n3ya7zkkwOOe+W4arbj105aCW4JRrdqxKQqoZs89WvQ=
+SIZE (nvi-2.2.1.tar.gz) = 443376
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/nvi/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Mar 2022 18:58:33 -0000 1.2
+++ patches/patch-CMakeLists_txt 25 Sep 2023 18:16:31 -0000
@@ -3,21 +3,13 @@ Avoid using flags not supported by in-tr
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -20,14 +20,15 @@ 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($<$<CONFIG:Debug>:-Wall>)
- add_compile_options($<$<CONFIG:Debug>:-Wno-parentheses>)
- add_compile_options($<$<CONFIG:Debug>:-Wno-uninitialized>)
- add_compile_options($<$<CONFIG:Debug>:-Wmissing-prototypes>)
- add_compile_options($<$<CONFIG:Debug>:-Wsystem-headers>)
+@@ -36,7 +36,9 @@ if (NOT APPLE)
+ add_compile_options($<$<CONFIG:Debug>:-Wsystem-headers>)
+ endif()
add_compile_options($<$<CONFIG:Release>:-Wuninitialized>)
--add_compile_options($<$<CONFIG:Release>:-Wno-dangling-else>)
+if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-+ add_compile_options($<$<CONFIG:Release>:-Wno-dangling-else>)
+ add_compile_options($<$<CONFIG:Release>:-Wno-dangling-else>)
+endif()
+ add_compile_options(-Wno-string-compare)
add_compile_options(-Wstack-protector -fstack-protector)
add_compile_options(-Wstrict-aliasing -fstrict-aliasing)
-
