editors: Add nvi2.

A multibyte fork of the nvi editor for BSD

9 files changed, 119 insertions, 1 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 41e44264a45..bafacd02002 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -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
diff --git a/editors/nvi2/DESCR b/editors/nvi2/DESCR
new file mode 100644
index 00000000000..b67c8c87330
--- /dev/null
+++ b/editors/nvi2/DESCR
@@ -0,0 +1 @@
+A multibyte fork of the nvi editor for BSD
diff --git a/editors/nvi2/Makefile b/editors/nvi2/Makefile
new file mode 100644
index 00000000000..9f453eb0727
--- /dev/null
+++ b/editors/nvi2/Makefile
@@ -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
+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"
diff --git a/editors/nvi2/PLIST b/editors/nvi2/PLIST
new file mode 100644
index 00000000000..ebe1accff7f
--- /dev/null
+++ b/editors/nvi2/PLIST
@@ -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
diff --git a/editors/nvi2/distinfo b/editors/nvi2/distinfo
new file mode 100644
index 00000000000..9b83bcdc06b
--- /dev/null
+++ b/editors/nvi2/distinfo
@@ -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
diff --git a/editors/nvi2/options.mk b/editors/nvi2/options.mk
new file mode 100644
index 00000000000..c51ea7e7d5a
--- /dev/null
+++ b/editors/nvi2/options.mk
@@ -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
diff --git a/editors/nvi2/patches/patch-cl_cl__screen.c b/editors/nvi2/patches/patch-cl_cl__screen.c
new file mode 100644
index 00000000000..1406c4ffa6a
--- /dev/null
+++ b/editors/nvi2/patches/patch-cl_cl__screen.c
@@ -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
diff --git a/editors/nvi2/patches/patch-common_cut.c b/editors/nvi2/patches/patch-common_cut.c
new file mode 100644
index 00000000000..b47715db51d
--- /dev/null
+++ b/editors/nvi2/patches/patch-common_cut.c
@@ -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>
diff --git a/editors/nvi2/patches/patch-ex_ex__filter.c b/editors/nvi2/patches/patch-ex_ex__filter.c
new file mode 100644
index 00000000000..fc9e6673159
--- /dev/null
+++ b/editors/nvi2/patches/patch-ex_ex__filter.c
@@ -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>