Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 editors/bvi/BUILD       |    2 --
 editors/bvi/DEPENDS     |    1 +
 editors/bvi/DETAILS     |   20 ++++++++------------
 editors/bvi/HISTORY     |    5 +++++
 editors/nvi/DETAILS     |    1 +
 editors/nvi/HISTORY     |    5 +++++
 editors/nvi/PRE_BUILD   |    2 ++
 editors/nvi/nexrc.patch |   11 +++++++++++
 8 files changed, 33 insertions(+), 14 deletions(-)

New commits:
commit 1d1613551a557c3b065a3c547dae165dd0c9ef2c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    bvi: => 1.4.0

commit 314c064954f213ee70203ad95340770f65d78cb3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    nvi: fix segfaults on config parsing errors

diff --git a/editors/bvi/BUILD b/editors/bvi/BUILD
deleted file mode 100755
index 8140ec6..0000000
--- a/editors/bvi/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-sedit  "s:ncurses/term.h:term.h:"  bmore.h
-default_build
diff --git a/editors/bvi/DEPENDS b/editors/bvi/DEPENDS
new file mode 100755
index 0000000..5764a9c
--- /dev/null
+++ b/editors/bvi/DEPENDS
@@ -0,0 +1 @@
+depends ncurses
diff --git a/editors/bvi/DETAILS b/editors/bvi/DETAILS
index 595f720..623dd00 100755
--- a/editors/bvi/DETAILS
+++ b/editors/bvi/DETAILS
@@ -1,21 +1,17 @@
            SPELL=bvi
-         VERSION=1.3.2
+         VERSION=1.4.0
           SOURCE=${SPELL}-${VERSION}.src.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-   SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/bvi/${SOURCE}
-     
SOURCE_HASH=sha512:eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c
+   
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://bvi.sourceforge.net/
       LICENSE[0]=GPL
          ENTERED=20010923
-         UPDATED=20040617
         KEYWORDS="editors"
-SHORT="Editor for binary files using common vi commands"
+           SHORT="editor for binary files using common vi commands"
 
 cat << EOF
-
-bvi is a display-oriented binary editor based on the vi
-texteditor. It uses commands similar to the commands of
-vi, with some changes and extensions dependent of their
-different tasks.
-
+bvi is a display-oriented binary editor based on the vi texteditor. It uses
+commands similar to the commands of vi, with some changes and extensions
+dependent of their different tasks.
 EOF
diff --git a/editors/bvi/HISTORY b/editors/bvi/HISTORY
index dc386ad..ab62f32 100644
--- a/editors/bvi/HISTORY
+++ b/editors/bvi/HISTORY
@@ -1,3 +1,8 @@
+2017-08-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.4.0
+       * DEPENDS: added, for missing ncurses dependency
+       * BUILD: dropped, no longer needed
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/editors/nvi/DETAILS b/editors/nvi/DETAILS
index 01aca15..90f7ad1 100755
--- a/editors/nvi/DETAILS
+++ b/editors/nvi/DETAILS
@@ -1,5 +1,6 @@
            SPELL=nvi
          VERSION=1.79
+      PATCHLEVEL=1
           SOURCE=${SPELL}-${VERSION}.tar.gz
    
SOURCE_URL[0]=https://sites.google.com/a/bostic.com/keithbostic/files/${SOURCE}
    SOURCE_URL[1]=https://www.cpan.org/src/misc/${SOURCE}
diff --git a/editors/nvi/HISTORY b/editors/nvi/HISTORY
index c91161a..f31717f 100644
--- a/editors/nvi/HISTORY
+++ b/editors/nvi/HISTORY
@@ -1,3 +1,8 @@
+2017-08-24 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * PRE_BUILD: apply the patch
+       * nexrc.patch: added, to fix segfaults on config parsing errors
+
 2017-08-20 Vlad Glagolev <stealth AT sourcemage.org>
        * CONFIGURE, INSTALL: do symlinking for ex
        * PROVIDES: added EX provider
diff --git a/editors/nvi/PRE_BUILD b/editors/nvi/PRE_BUILD
index c78c70c..5332e63 100755
--- a/editors/nvi/PRE_BUILD
+++ b/editors/nvi/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
+patch -p1 < "${SPELL_DIRECTORY}/nexrc.patch" &&
+
 sedit "s:\[ -f VI.pm \] &&:\[ ! -f VI.pm \] || \(:" build/Makefile.in
diff --git a/editors/nvi/nexrc.patch b/editors/nvi/nexrc.patch
new file mode 100644
index 0000000..a33ced4
--- /dev/null
+++ b/editors/nvi/nexrc.patch
@@ -0,0 +1,11 @@
+--- nvi-1.79.orig/ex/ex.c
++++ nvi-1.79/ex/ex.c
+@@ -2307,7 +2307,7 @@
+        * underlying file, that's the real problem.
+        */
+       if (sp->ep == NULL) {
+-              ex_emsg(sp, cp->name, EXM_NOFILEYET);
++              ex_emsg(sp, cp ? cp->name : NULL, EXM_NOFILEYET);
+               return;
+       }
+