office/vmd: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 32 deletions

diff --git a/office/vmd/README b/office/vmd/README
index 4c02945051681..9c2e5bcd1f4be 100644
--- a/office/vmd/README
+++ b/office/vmd/README
@@ -7,3 +7,7 @@ etc.
 
 This version is patched to ignore img tags, which makes vmd fail to
 parse certain markdown documents.
+
+Note: this works great in the Linux console, konsole, xfce4-terminal,
+and kitty; acceptably well in xterm; and badly in rxvt-unicode. Your
+mileage may vary.
diff --git a/office/vmd/vmd.SlackBuild b/office/vmd/vmd.SlackBuild
index c3c9358515599..568e38eeb9ad7 100644
--- a/office/vmd/vmd.SlackBuild
+++ b/office/vmd/vmd.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for vmd
 
-# Copyright 2019 Ricardo J. Barberis <ricardo.barberis@gmail.com>
+# Copyright 2019 Ricardo J. Barberis
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230807 bkw:
+# - take over maintenance.
+# - simplify script a bit (no package changes so BUILD=1 still).
+# - add note to README about supported terminals.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vmd
@@ -38,9 +44,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
@@ -50,19 +53,7 @@ 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
+# 20230807 bkw: No flags or libdirsuffix needed here.
 
 set -e
 
@@ -73,11 +64,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # Fix required Markdown version
 sed -i -e 's/Markdown==2.6.8/Markdown>=2.6.8, <3/' requirements.txt setup.py
@@ -87,14 +75,10 @@ patch -p1 < $CWD/vmd.img.patch
 
 python3 setup.py install --root=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  LICENSE README.md requirements.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE README.md requirements.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/vmd/vmd.info b/office/vmd/vmd.info
index 3980a0e132b2d..68916b4034020 100644
--- a/office/vmd/vmd.info
+++ b/office/vmd/vmd.info
@@ -6,5 +6,5 @@ MD5SUM="5dba1bf366780eb2e6bd1ce87e664517"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Markdown"
-MAINTAINER="Ricardo J. Barberis"
-EMAIL="ricardo.barberis@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"