From 6a78d79727ca87479d936e6f69ac67bf907b0d71 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 28 Jun 2020 11:40:19 +0200 Subject: 20200628.1 global branch merge. Signed-off-by: Matteo Bernardini --- development/nvi/README | 5 -- development/nvi/nvi.SlackBuild | 109 -------------------------------------- development/nvi/nvi.info | 10 ---- development/nvi/patches/nvi.diffs | 28 ---------- development/nvi/slack-desc | 19 ------- 5 files changed, 171 deletions(-) delete mode 100644 development/nvi/README delete mode 100644 development/nvi/nvi.SlackBuild delete mode 100644 development/nvi/nvi.info delete mode 100644 development/nvi/patches/nvi.diffs delete mode 100644 development/nvi/slack-desc (limited to 'development/nvi') diff --git a/development/nvi/README b/development/nvi/README deleted file mode 100644 index b44e27d365..0000000000 --- a/development/nvi/README +++ /dev/null @@ -1,5 +0,0 @@ -Nvi is an implementation of the ex/vi text editor. -Nvi supports all the historic ex/vi features except for open mode and the -lisp edit option (it has a fully implemented underlying ex mode). Some -additional features are: extended regular expressions, infinite undo, and -multiple edit buffers. Nvi has a very small memory footprint. diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild deleted file mode 100644 index 6ee6d5cb8b..0000000000 --- a/development/nvi/nvi.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -# Slackware build script for nvi - -# Copyright 2008-2012 Robby Workman Northport, Alabama (USA) -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=nvi -VERSION=${VERSION:-1.81.6} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Apply patches to eliminate bogus "DB_CREATE must be specified to create databases." error message on exit -patch -p1 < $CWD/patches/nvi.diffs - -cd build.unix - CFLAGS="$SLKCFLAGS" \ - ../dist/configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-widechar \ - --disable-static \ - --program-prefix="n" \ - --build=$ARCH-slackware-linux - make -j1 - make -j1 install DESTDIR=$PKG -cd .. - -# These are better as softlinks instead of hardlinks -rm -f $PKG/usr/man/man1/{nex,nview}.1 -ln -s nvi.1 $PKG/usr/man/man1/nex.1 -ln -s nvi.1 $PKG/usr/man/man1/nview.1 - -rm -rf $PKG/usr/man/cat* -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes LICENSE README* TODO docs/html $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/nvi/nvi.info b/development/nvi/nvi.info deleted file mode 100644 index 358c0fa50b..0000000000 --- a/development/nvi/nvi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nvi" -VERSION="1.81.6" -HOMEPAGE="http://freecode.com/projects/nvi" -DOWNLOAD="http://harrier.slackbuilds.org/misc/nvi-1.81.6.tar.bz2" -MD5SUM="88d1e23115ee9f2961186b62e55f5704" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Don Allen" -EMAIL="donaldcallen@gmail.com" diff --git a/development/nvi/patches/nvi.diffs b/development/nvi/patches/nvi.diffs deleted file mode 100644 index 98a45861e7..0000000000 --- a/development/nvi/patches/nvi.diffs +++ /dev/null @@ -1,28 +0,0 @@ -diff -up nvi-1.81.6/common/db.h patched-nvi-1.81.6/common/db.h ---- nvi-1.81.6/common/db.h 2007-11-18 11:41:42.000000000 -0500 -+++ patched-nvi-1.81.6/common/db.h 2014-10-04 08:53:11.000000000 -0400 -@@ -16,7 +16,10 @@ - (env)->remove(env, path, NULL, flags) - #endif - --#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 -+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4 -+#define db_open(db,file,type,flags,mode) \ -+ (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode) -+#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 - #define db_open(db,file,type,flags,mode) \ - (db)->open(db, NULL, file, NULL, type, flags, mode) - #else -diff -up nvi-1.81.6/common/msg.c patched-nvi-1.81.6/common/msg.c ---- nvi-1.81.6/common/msg.c 2007-11-18 11:41:42.000000000 -0500 -+++ patched-nvi-1.81.6/common/msg.c 2014-10-04 08:55:13.000000000 -0400 -@@ -724,7 +724,8 @@ msg_open(SCR *sp, char *file) - p = buf; - } else - p = file; -- if ((sp->db_error = db_create(&db, 0, 0)) != 0 || -+ if (access(p, R_OK) != 0 || -+ (sp->db_error = db_create(&db, 0, 0)) != 0 || - (sp->db_error = db->set_re_source(db, p)) != 0 || - (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) { - if (first) { diff --git a/development/nvi/slack-desc b/development/nvi/slack-desc deleted file mode 100644 index 07d0586601..0000000000 --- a/development/nvi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nvi: nvi (an implementation of the ex/vi text editor) -nvi: -nvi: Nvi is an implementation of the ex/vi text editor. -nvi: Nvi supports all the historic ex/vi features except for open -nvi: mode and the lisp edit option (it has a fully implemented -nvi: underlying ex mode). Some additional features are: -nvi: extended regular expressions, infinite undo, and multiple edit -nvi: buffers. Nvi has a very small memory footprint. -nvi: -nvi: Homepage: http://www.bostic.com/vi/ -nvi: -- cgit v1.2.3