From 6ee46302b3e450e57f563808786af9ee4bb4cd1c Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sun, 16 Oct 2016 22:06:53 +0700
Subject: development/nvi: Remove --enable-threads parameter.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/nvi/nvi.SlackBuild | 21 +++++++++------------
 development/nvi/slack-desc     |  4 ++--
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'development/nvi')

diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild
index c208be4d77..6ee6d5cb8b 100644
--- a/development/nvi/nvi.SlackBuild
+++ b/development/nvi/nvi.SlackBuild
@@ -24,12 +24,12 @@
 
 PRGNAM=nvi
 VERSION=${VERSION:-1.81.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,10 +65,10 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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
@@ -81,7 +81,6 @@ cd build.unix
     --sysconfdir=/etc \
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --enable-threads \
     --enable-widechar \
     --disable-static \
     --program-prefix="n" \
@@ -100,9 +99,7 @@ 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
+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
diff --git a/development/nvi/slack-desc b/development/nvi/slack-desc
index 29f553c16a..07d0586601 100644
--- a/development/nvi/slack-desc
+++ b/development/nvi/slack-desc
@@ -12,8 +12,8 @@ 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 buffers.
-nvi: Nvi has a very small memory footprint.
+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-65-gdbad