<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5fea0197ccb558f242dacceaadd5e26f5910deb6">https://github.com/macports/macports-ports/commit/5fea0197ccb558f242dacceaadd5e26f5910deb6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5fea0197ccb nvi2: new port in editors
</span>5fea0197ccb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5fea0197ccb558f242dacceaadd5e26f5910deb6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu May 2 06:14:16 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> nvi2: new port in editors
</span>---
editors/nvi2/Portfile | 48 ++++++++++++++++++++++++
editors/nvi2/files/patch-SLIST_REMOVE_AFTER.diff | 13 +++++++
editors/nvi2/files/patch-fix-include-path.diff | 41 ++++++++++++++++++++
3 files changed, 102 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/nvi2/Portfile b/editors/nvi2/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8cbfc5c8463
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/nvi2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strndup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lichray nvi2 2.2.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories editors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Reimplementation of nex/nvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}, text editors originally distributed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as part of the Fourth Berkeley Software Distribution (4BSD), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by the University of California, Berkeley.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7ac37a051d6054682bf9e89fdac8bb59fedb203c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f7c9aef3924c0e39ef96e1aadb8f5d396825b8251addab1290aa866cf3d5af4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 443376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/lichray/nvi2/issues/133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-include-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-SLIST_REMOVE_AFTER.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*gcc-[34].*} {clang < 400}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ICONV=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_WIDECHAR=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${cmake.build_dir}/nvi ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} INSTALL.md LICENSE README ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/man ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/nvi2/files/patch-SLIST_REMOVE_AFTER.diff b/editors/nvi2/files/patch-SLIST_REMOVE_AFTER.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7dbe95dc082
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/nvi2/files/patch-SLIST_REMOVE_AFTER.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/common.h 2023-09-25 16:47:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/common.h 2024-05-02 05:00:43.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,3 +92,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mem.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "extern.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SLIST_REMOVE_AFTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SLIST_REMOVE_AFTER(elm, field) do { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SLIST_NEXT(elm, field) = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SLIST_NEXT(SLIST_NEXT(elm, field), field); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} while (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/nvi2/files/patch-fix-include-path.diff b/editors/nvi2/files/patch-fix-include-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..82084e8b6be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/nvi2/files/patch-fix-include-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This hack is unneeded and breaks the build on some systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Just remove it, then the build works robustly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2023-09-25 16:47:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-05-02 04:27:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,18 +209,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT DBOPEN_IN_LIBC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(nvi PRIVATE db1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Avoid using an incompatible db.h installed to /usr/local (since this is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # part of the default search path on macOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DB_H_GUESS "${CMAKE_OSX_SYSROOT}/usr/include/db.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NOT EXISTS ${DB_H_GUESS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Could not find db.h at the expected path (${DB_H_GUESS}).")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions("-DDB_H_ABS_PATH=<${DB_H_GUESS}>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(DB_INCLUDE_DIR db.h PATH_SUFFIXES db1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_include_directories(nvi PRIVATE ${DB_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_path(DB_INCLUDE_DIR db.h PATH_SUFFIXES db1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(nvi PRIVATE ${DB_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_include_files(libutil.h HAVE_LIBUTIL_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_include_files(ncurses.h HAVE_NCURSES_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/common.h 2023-09-25 16:47:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/common.h 2024-05-02 06:04:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,11 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TCSASOFT 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef DB_H_ABS_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include DB_H_ABS_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <db.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <regex.h> /* May refer to the bundled regex. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span></pre><pre style='margin:0'>
</pre>