summaryrefslogtreecommitdiffstats
path: root/development/ex-vi/ex-vi.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/ex-vi/ex-vi.SlackBuild')
-rw-r--r--development/ex-vi/ex-vi.SlackBuild35
1 files changed, 16 insertions, 19 deletions
diff --git a/development/ex-vi/ex-vi.SlackBuild b/development/ex-vi/ex-vi.SlackBuild
index d862dd2d2b..cab4116d11 100644
--- a/development/ex-vi/ex-vi.SlackBuild
+++ b/development/ex-vi/ex-vi.SlackBuild
@@ -2,10 +2,12 @@
# Slackware build script for ex-vi
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210830 bkw: build 4, -j1 no longer needed on -current.
+
# 20160726 bkw: build 3
# parallel make (-jN where N > 1) fails on Slack 14.2, add -j1
@@ -22,19 +24,11 @@
# mode. Exceeding TUBELINES just means vi ignores the extra lines at the
# bottom of the terminal.
-# Default to 320x200, which would be enough for a 8x16 console font on a
-# WQXGA 2560x1600 display, or a 2/3-width full-height X terminal on 4K
-# UHDTV (3840x2160). If I don't make this configurable, someone will
-# need it to be. So:
-TUBECOLS=${TUBECOLS:-320}
-TUBELINES=${TUBELINES:-200}
-
-# We now return you to your regularly scheduled programming:
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ex-vi
VERSION=${VERSION:-050325}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -46,9 +40,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -74,6 +65,15 @@ fi
set -e
+# Default to 320x200, which would be enough for a 8x16 console font on a
+# WQXGA 2560x1600 display, or a 2/3-width full-height X terminal on 4K
+# UHDTV (3840x2160). If I don't make this configurable, someone will
+# need it to be. So:
+TUBECOLS=${TUBECOLS:-320}
+TUBELINES=${TUBELINES:-200}
+
+# We now return you to your regularly scheduled programming:
+
TARNAME=ex
rm -rf $PKG
@@ -83,11 +83,8 @@ rm -rf $TARNAME-$VERSION
tar xvf $CWD/$TARNAME-$VERSION.tar.bz2
cd $TARNAME-$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 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Don't install the binary with the sticky bit set. It doesn't do anything
# on Linux, and might set off alarm bells.
@@ -101,7 +98,7 @@ sed -i -e "/^#define/s,\\(TUBESIZE *\\).*$,\\1 $(( TUBECOLS * TUBELINES ))," \
# To avoid conflicts with Slackware's elvis and/or vim, we install to /opt and
# include a login script to set PATH and MANPATH.
-make -j1 all install \
+make all install \
RPMCFLAGS="$SLKCFLAGS" \
MANDIR=/opt/$PRGNAM/man \
PREFIX=/opt/$PRGNAM \