[pkgsrc/trunk]: pkgsrc/editors/nvi2 nvi2: Update to 2.2.0

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/15a251b6da00
branches:  trunk
changeset: 442477:15a251b6da00
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Nov 24 18:27:00 2020 +0000

description:
nvi2: Update to 2.2.0

Changes:

    Vim-style expandtab option (#75, #76, #80)
    Provides Turkish translation (#68)
    Backspace now deletes \ rather than being escaped (#25)
    T during motion commands is now VI-compatible (#35)
    Encoding related fixes, such as UTF-8 detection (#61, #42, #65)
    Fixed a number of memory management issues (#56)

diffstat:

 editors/nvi2/Makefile                      |  17 ++++++++++++-----
 editors/nvi2/distinfo                      |  12 +++++-------
 editors/nvi2/patches/patch-common_cut.c    |  12 ------------
 editors/nvi2/patches/patch-ex_ex__filter.c |  12 ------------
 4 files changed, 17 insertions(+), 36 deletions(-)

diffs (96 lines):

diff -r 175beb0437fc -r 15a251b6da00 editors/nvi2/Makefile
--- a/editors/nvi2/Makefile     Tue Nov 24 18:21:50 2020 +0000
+++ b/editors/nvi2/Makefile     Tue Nov 24 18:27:00 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2020/06/14 11:44:02 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/11/24 18:27:00 nia Exp $
 
-DISTNAME=      nvi2-2.1.3
+DISTNAME=      nvi2-2.2.0
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lichray/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,9 +15,13 @@
 
 USE_CMAKE=     yes
 
+CMAKE_ARG_PATH=        ..
 CONFIGURE_DIRS=        build
 BUILD_DIRS=    build
 
+# gcc: error: unrecognized command line option '-fcolor-diagnostics'
+BUILDLINK_TRANSFORM+=  rm:-fcolor-diagnostics
+
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 .include "options.mk"
@@ -25,13 +29,16 @@
 SUBST_CLASSES+=                curses
 SUBST_STAGE.curses=    pre-configure
 SUBST_MESSAGE.curses=  Correcting the path to curses.
-SUBST_FILES.curses+=   build/CMakeLists.txt
+SUBST_FILES.curses+=   CMakeLists.txt
 SUBST_SED.curses+=     -e "s,HINTS /usr/lib,HINTS ${BUILDLINK_PREFIX.curses}/lib NO_DEFAULT_PATH,g"
 
+pre-configure:
+       ${MKDIR} -p ${WRKSRC}/build
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/build/nvi ${DESTDIR}${PREFIX}/bin/nex
        ${INSTALL_PROGRAM} ${WRKSRC}/build/nvi ${DESTDIR}${PREFIX}/bin/nvi
-       ${INSTALL_MAN} ${WRKSRC}/docs/man/vi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nex.1
-       ${INSTALL_MAN} ${WRKSRC}/docs/man/vi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nvi.1
+       ${INSTALL_MAN} ${WRKSRC}/man/vi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nex.1
+       ${INSTALL_MAN} ${WRKSRC}/man/vi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nvi.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 175beb0437fc -r 15a251b6da00 editors/nvi2/distinfo
--- a/editors/nvi2/distinfo     Tue Nov 24 18:21:50 2020 +0000
+++ b/editors/nvi2/distinfo     Tue Nov 24 18:27:00 2020 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/06/14 11:44:02 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/11/24 18:27:00 nia Exp $
 
-SHA1 (nvi2-2.1.3.tar.gz) = 8840cbc6c128e1f47517754be06d71be0e4446dc
-RMD160 (nvi2-2.1.3.tar.gz) = a8d2ed70388a6d698371f5e25bd53e2b49d80375
-SHA512 (nvi2-2.1.3.tar.gz) = d3f8837990aa59dd524a55a302dc892325b232a949f4f2a7114c9efdfa3406cae821edb48dd5d2763bbadd42624bda5a47a4fc21267db86c9021b1a09164db8c
-Size (nvi2-2.1.3.tar.gz) = 437664 bytes
+SHA1 (nvi2-2.2.0.tar.gz) = 00606c4ffaa2d3cb7b69ab73722114c59e2d811b
+RMD160 (nvi2-2.2.0.tar.gz) = e304f500deea1ba54cde58a086a3b1702b3fe423
+SHA512 (nvi2-2.2.0.tar.gz) = 46251f8b9b1e663e38cb7386a9497b8f9e96e9364ee04f89e73081b2351c7ff51b41a272ab7aaffc37b9485781600218e1529d9436fa1b5ad5505e297f63c9eb
+Size (nvi2-2.2.0.tar.gz) = 439545 bytes
 SHA1 (patch-cl_cl__screen.c) = de98539a79da66d2489ec6df29351d3cbaac3c56
-SHA1 (patch-common_cut.c) = 87f42be3f61aa13059391665851895534c30c762
-SHA1 (patch-ex_ex__filter.c) = b1d15ec6129fe427af61d4a2ea726d8565325f02
diff -r 175beb0437fc -r 15a251b6da00 editors/nvi2/patches/patch-common_cut.c
--- a/editors/nvi2/patches/patch-common_cut.c   Tue Nov 24 18:21:50 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-common_cut.c,v 1.1 2020/06/14 11:44:02 nia Exp $
-
-Missing timespec definition.
-
---- common/cut.c.orig  2015-04-08 21:20:21.000000000 +0000
-+++ common/cut.c
-@@ -14,4 +14,5 @@ static const char sccsid[] = "$Id: cut.c
- #endif /* not lint */
- 
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/queue.h>
diff -r 175beb0437fc -r 15a251b6da00 editors/nvi2/patches/patch-ex_ex__filter.c
--- a/editors/nvi2/patches/patch-ex_ex__filter.c        Tue Nov 24 18:21:50 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ex_ex__filter.c,v 1.1 2020/06/14 11:44:02 nia Exp $
-
-Missing timespec definition.
-
---- ex/ex_filter.c.orig        2015-04-08 21:20:21.000000000 +0000
-+++ ex/ex_filter.c
-@@ -14,4 +14,5 @@ static const char sccsid[] = "$Id: ex_fi
- #endif /* not lint */
- 
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/queue.h>