desktop/mh5000: New maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

4 files changed, 44 insertions, 48 deletions

diff --git a/desktop/mh5000/README b/desktop/mh5000/README
index 5c57332bc8..aff171b8d5 100644
--- a/desktop/mh5000/README
+++ b/desktop/mh5000/README
@@ -1,13 +1,7 @@
-A more better background image setter
+mh5000 (X11 background image setter and viewer)
 
-is a background image setter. Just not any ole background setter,
-like all the others. It is a command line based utility where users
-who want to set a background image with maybe a bit more flar then
-other command line background image setters do. It can do so.
-
-Yes, it can still do the plain ole' background settings, or it can set
-one image at whatever size given as well as. It also has the ability
-to change the image at a given time interval. Depending on the commands
-choosen it can keep the same image while changing the color(s) or vice
-versa. Even display a multitude of colors, with or without an image.
-Along with many other options.
+mh5000 is a background image setter. It's capable of scaling,
+cropping, and tiling images, and it supports changing images according
+to a timer (a slideshow). It can choose images randomly or display
+them in order. It can also set the background to solid or gradient
+color patterns.
diff --git a/desktop/mh5000/mh5000.SlackBuild b/desktop/mh5000/mh5000.SlackBuild
index 045317da7f..bbc84e4a30 100644
--- a/desktop/mh5000/mh5000.SlackBuild
+++ b/desktop/mh5000/mh5000.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-#
+
 # Slackware build script for mh5000
 #
 # Copyright 2017  Michael Heras USA
@@ -22,11 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>.
+
+# 20220207 bkw: BUILD=2
+# - take over as maintainer.
+# - actually use the SLKCFLAGS.
+# - move the error image to /usr/share/mh5000 (/etc is a terrible idea).
+# - don't install INSTALL in doc dir.
+# - rewrite README and slack-desc. the spelling and grammar errors
+#   were just too much for me.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mh5000
 VERSION=${VERSION:-1.3.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +48,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
@@ -73,29 +80,24 @@ 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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-make
-
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/etc/mh5000
-install -m755 mh5000 $PKG/usr/bin
-#install needed error image
-install -m755 image/opps_try_001.jpg $PKG/etc/mh5000
-# Install the manpage
-install -Dm644 mh5000.1 $PKG/usr/man/man1/mh5000.1
-
-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 AUTHORS COPYING INSTALL ChangeLog README  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20220207 bkw: permissions are terrifyingly bad!
+find . -type f -exec chmod 644 {} \+
+find . -type d -exec chmod 755 {} \+
+
+# 20220207 bkw: this doesn't belong in /etc
+sed -i 's,/etc/mh5000,/usr/share/mh5000,' img.cpp
+
+make CXX="g++ $SLKCFLAGS"
+
+mkdir -p $PKG/usr/{bin,share/$PRGNAM,man/man1}
+install -s -m0755 $PRGNAM $PKG/usr/bin
+install -m0644 image/* $PKG/usr/share/$PRGNAM
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/mh5000/mh5000.info b/desktop/mh5000/mh5000.info
index d7a6298ad1..e7fc08689b 100644
--- a/desktop/mh5000/mh5000.info
+++ b/desktop/mh5000/mh5000.info
@@ -6,5 +6,5 @@ MD5SUM="fe5c676565dc00ff7e275b3d56139567"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
-MAINTAINER="Mike Heras"
-EMAIL="userxbw@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/mh5000/slack-desc b/desktop/mh5000/slack-desc
index 1a24e810a2..6e81329a89 100644
--- a/desktop/mh5000/slack-desc
+++ b/desktop/mh5000/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-mh5000: mh5000 (Sets and changes background image)
+mh5000: mh5000 (X11 background image setter and viewer)
 mh5000:
-mh5000: A powerful background image setter / changer. Some of what it does.
-mh5000: Can change images on demand. Images can be set to user size
-mh5000: requirements, and with multiple colors. Up to 100 random colors
-mh5000: displayed.
+mh5000: mh5000 is a background image setter. It's capable of scaling,
+mh5000: cropping, and tiling images, and it supports changing images according
+mh5000: to a timer (a slideshow). It can choose images randomly or display
+mh5000: them in order. It can also set the background to solid or gradient
+mh5000: color patterns.
 mh5000:
-mh5000: Homepage: https://sourceforge.net/projects/mh5000/
 mh5000:
 mh5000:
 mh5000: