CVS commit: pkgsrc/editors

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 11:44:02 UTC 2020

Modified Files:
        pkgsrc/editors: Makefile
Added Files:
        pkgsrc/editors/nvi2: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/editors/nvi2/patches: patch-cl_cl__screen.c patch-common_cut.c
            patch-ex_ex__filter.c

Log Message:
editors: Add nvi2.

A multibyte fork of the nvi editor for BSD


To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 pkgsrc/editors/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/nvi2/DESCR pkgsrc/editors/nvi2/Makefile \
    pkgsrc/editors/nvi2/PLIST pkgsrc/editors/nvi2/distinfo \
    pkgsrc/editors/nvi2/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/nvi2/patches/patch-cl_cl__screen.c \
    pkgsrc/editors/nvi2/patches/patch-common_cut.c \
    pkgsrc/editors/nvi2/patches/patch-ex_ex__filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/Makefile
diff -u pkgsrc/editors/Makefile:1.206 pkgsrc/editors/Makefile:1.207
--- pkgsrc/editors/Makefile:1.206       Tue Jun  9 14:30:00 2020
+++ pkgsrc/editors/Makefile     Sun Jun 14 11:44:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2020/06/09 14:30:00 nia Exp $
+# $NetBSD: Makefile,v 1.207 2020/06/14 11:44:02 nia Exp $
 #
 
 COMMENT=       Editors
@@ -91,6 +91,7 @@ SUBDIR+=      nedit
 SUBDIR+=       ng
 SUBDIR+=       nts
 SUBDIR+=       nvi
+SUBDIR+=       nvi2
 SUBDIR+=       nvi-m17n
 SUBDIR+=       obby
 SUBDIR+=       p5-Acme-Padre-PlayCode

Added files:

Index: pkgsrc/editors/nvi2/DESCR
diff -u /dev/null pkgsrc/editors/nvi2/DESCR:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/DESCR   Sun Jun 14 11:44:02 2020
@@ -0,0 +1 @@
+A multibyte fork of the nvi editor for BSD
Index: pkgsrc/editors/nvi2/Makefile
diff -u /dev/null pkgsrc/editors/nvi2/Makefile:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/Makefile        Sun Jun 14 11:44:02 2020
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2020/06/14 11:44:02 nia Exp $
+
+DISTNAME=      nvi2-2.1.3
+CATEGORIES=    editors
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=lichray/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/lichray/nvi2
+COMMENT=       Multibyte fork of the nvi editor for BSD
+LICENSE=       modified-bsd
+
+CONFLICTS+=    nvi-[0-9]*
+CONFLICTS+=    nvi-m17n-[0-9]*
+
+USE_CMAKE=     yes
+
+CONFIGURE_DIRS=        build
+BUILD_DIRS=    build
+
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
+
+.include "options.mk"
+
+SUBST_CLASSES+=                curses
+SUBST_STAGE.curses=    pre-configure
+SUBST_MESSAGE.curses=  Correcting the path to curses.
+SUBST_FILES.curses+=   build/CMakeLists.txt
+SUBST_SED.curses+=     -e "s,HINTS /usr/lib,HINTS ${BUILDLINK_PREFIX.curses}/lib NO_DEFAULT_PATH,g"
+
+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
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/nvi2/PLIST
diff -u /dev/null pkgsrc/editors/nvi2/PLIST:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/PLIST   Sun Jun 14 11:44:02 2020
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2020/06/14 11:44:02 nia Exp $
+bin/nex
+bin/nvi
+man/man1/nex.1
+man/man1/nvi.1
Index: pkgsrc/editors/nvi2/distinfo
diff -u /dev/null pkgsrc/editors/nvi2/distinfo:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/distinfo        Sun Jun 14 11:44:02 2020
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2020/06/14 11:44:02 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 (patch-cl_cl__screen.c) = de98539a79da66d2489ec6df29351d3cbaac3c56
+SHA1 (patch-common_cut.c) = 87f42be3f61aa13059391665851895534c30c762
+SHA1 (patch-ex_ex__filter.c) = b1d15ec6129fe427af61d4a2ea726d8565325f02
Index: pkgsrc/editors/nvi2/options.mk
diff -u /dev/null pkgsrc/editors/nvi2/options.mk:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/options.mk      Sun Jun 14 11:44:02 2020
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.1 2020/06/14 11:44:02 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.nvi2
+PKG_SUPPORTED_OPTIONS= iconv wide-curses
+PKG_SUGGESTED_OPTIONS= iconv wide-curses
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Miconv)
+.  include "../../converters/libiconv/buildlink3.mk"
+CMAKE_ARGS+=   -DUSE_ICONV=ON
+.else
+CMAKE_ARGS+=   -DUSE_ICONV=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mwide-curses)
+.  include "../../mk/curses.buildlink3.mk"
+.  if ${CURSES_TYPE} != "ncurses" # XXX: Why is this necessary!?
+CMAKE_ARGS+=   -DUSE_WIDECHAR=ON
+.  else
+CMAKE_ARGS+=   -DUSE_WIDECHAR=OFF
+.  endif
+.else
+CMAKE_ARGS+=   -DUSE_WIDECHAR=OFF
+.endif

Index: pkgsrc/editors/nvi2/patches/patch-cl_cl__screen.c
diff -u /dev/null pkgsrc/editors/nvi2/patches/patch-cl_cl__screen.c:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/patches/patch-cl_cl__screen.c   Sun Jun 14 11:44:02 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-cl_cl__screen.c,v 1.1 2020/06/14 11:44:02 nia Exp $
+
+This is only valid in ncurses
+
+--- cl/cl_screen.c.orig        2015-04-08 21:20:21.000000000 +0000
++++ cl/cl_screen.c
+@@ -409,9 +409,6 @@ cl_vi_end(GS *gp)
+       /* End curses window. */
+       (void)endwin();
+ 
+-      /* Free the SCREEN created by newterm(3X). */
+-      delscreen(set_term(NULL));
+-
+       /*
+        * XXX
+        * The screen TE sequence just got sent.  See the comment in
Index: pkgsrc/editors/nvi2/patches/patch-common_cut.c
diff -u /dev/null pkgsrc/editors/nvi2/patches/patch-common_cut.c:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/patches/patch-common_cut.c      Sun Jun 14 11:44:02 2020
@@ -0,0 +1,12 @@
+$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>
Index: pkgsrc/editors/nvi2/patches/patch-ex_ex__filter.c
diff -u /dev/null pkgsrc/editors/nvi2/patches/patch-ex_ex__filter.c:1.1
--- /dev/null   Sun Jun 14 11:44:02 2020
+++ pkgsrc/editors/nvi2/patches/patch-ex_ex__filter.c   Sun Jun 14 11:44:02 2020
@@ -0,0 +1,12 @@
+$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>