4 files changed, 45 insertions, 46 deletions
diff --git a/system/vifm/README b/system/vifm/README
index 54e68874e25ef..b4fa881ff4b80 100644
--- a/system/vifm/README
+++ b/system/vifm/README
@@ -1,6 +1,8 @@
+vifm (a ncurses-based file manager with vi-like keybindings)
+
 Vifm is an ncurses-based file manager with vi-like keybindings. If you
 use vi, vifm gives you complete keyboard control over your files without
 having to learn a new set of commands.
 
 Vim users: A vifm.vim plugin is included in /usr/share/vifm/vim/.
-Read the INSTALL file for usage information.
+Read /usr/doc/vifm-$VERSION/README_vim.txt for usage information.
diff --git a/system/vifm/slack-desc b/system/vifm/slack-desc
index 4d046e049485e..aa6575242a7a2 100644
--- a/system/vifm/slack-desc
+++ b/system/vifm/slack-desc
@@ -12,8 +12,8 @@ vifm: If you use vi, vifm gives you complete keyboard control over your
 vifm: files without having to learn a new set of commands.
 vifm: The configuration for vifm sits in ~/.vifm.
 vifm:
-vifm: A vifm.vim plugin is included in /usr/doc/vifm-$VERSION. Read the
-vifm: INSTALL file there for usage information.
+virm: Vim users: A vifm.vim plugin is included in /usr/share/vifm/vim/.
+virm: Read /usr/doc/vifm-$VERSION/README_vim.txt for usage information.
 vifm:
 vifm: Homepage: https://vifm.sourceforge.net
 vifm:
diff --git a/system/vifm/vifm.SlackBuild b/system/vifm/vifm.SlackBuild
index 954455e1b7d9a..1d14ae47c4d04 100644
--- a/system/vifm/vifm.SlackBuild
+++ b/system/vifm/vifm.SlackBuild
@@ -4,12 +4,21 @@
 
 # Originally Written by V'yacheslav Stetskevych
 # Modified by Charles E. Kauffman
+# Modified by B. Watson
 
-# [1-31-18] : Added BETA variable to keep with Slackware's packaging rules.
-#             export VERSION=0.9.1 BETA=beta; sh vifm.SlackBuild
+# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# had no license; modified version is licensed under the WTFPL.
+# See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20200101 bkw:
+# - take over maintenance
+# - update for v0.10.1
+# - get rid of BETA kludge (handle beta versions more gracefully).
+#   script tested with 0.10, 0.10.1-beta, and 0.10.1. I can't be
+#   bothered to support older versions (you're on your own).
 
 PRGNAM=vifm
-VERSION=${VERSION:-0.10}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,28 +49,24 @@ else
   LIBDIRSUFFIX=""
 fi
 
-#  Since vifm's beta naming breaks Slackware's packaging rules,
-#  add the beta suffix, then rename before package creation so
-#  it preserves Slackware's package naming rules.
-if [ "$BETA" != "" ]
-then
-        VERSION=$VERSION-$BETA
-fi
-
 set -e
 
+# Handle potential VERSION=10.1-beta (hyphen not allowed).
+# Accept either -beta or _beta in VERSION, fix it up. I don't
+# plan to ever package a beta version, but if I ever do, the
+# VERSION in the script will have the underscore, not the hyphen.
+SRCVER="$( echo $VERSION | sed 's,_,-,g' )"
+VERSION="$( echo $SRCVER | sed 's,-,_,g' )"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
+cd $PRGNAM-$SRCVER
 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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -70,29 +75,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-# Since datarootdir doesn't work as expected, modify Makefile for png and desktop files.
-sed -i -e 's;dir)/applications;rootdir)/applications;' -e 's;dir)/pixmaps;rootdir)/pixmaps;' src/Makefile
-
 make
-make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.?
 
+DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/* $DOCDIR
+rm -rf $PKG/usr/share/doc
 
-# If this is a beta package, rename the version to preserve
-# Slackware's package naming rules.
-if [ "$BETA" != "" ]
-then
-        VERSION=${VERSION//-/_}
-fi
-
-# Add the version number to the /usr/doc/vifm directory.
-# and move it to the correct location.
-mv $PKG/usr/share/doc $PKG/usr/doc
-mv $PKG/usr/doc/vifm $PKG/usr/doc/$PRGNAM-$VERSION
+# Include only the vim instructions from INSTALL, nobody cares about compile
+# instructions (especially not Windows ones) when using a binary package.
+rm -f $DOCDIR/INSTALL
+sed -n '/^Vim Specific/,$p' INSTALL > $DOCDIR/README_vim.txt
 
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL README TODO THANKS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/vifm/vifm.info b/system/vifm/vifm.info
index e84b6fbca8c07..b006ebeac7279 100644
--- a/system/vifm/vifm.info
+++ b/system/vifm/vifm.info
@@ -1,10 +1,10 @@
 PRGNAM="vifm"
-VERSION="0.10"
+VERSION="0.10.1"
 HOMEPAGE="https://vifm.info"
-DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.tar.bz2"
-MD5SUM="fd50f29c2cbea32ac55d37b470ddc692"
+DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.1.tar.bz2"
+MD5SUM="0afde44205424355ec5f90957971bb07"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Charles E. Kauffman"
-EMAIL="molbolom@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"