summaryrefslogtreecommitdiffstats
path: root/desktop/wmxss
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/wmxss')
-rw-r--r--desktop/wmxss/README2
-rw-r--r--desktop/wmxss/wmxss.SlackBuild27
-rw-r--r--desktop/wmxss/wmxss.info6
3 files changed, 21 insertions, 14 deletions
diff --git a/desktop/wmxss/README b/desktop/wmxss/README
index 18feeab60c..3119052dea 100644
--- a/desktop/wmxss/README
+++ b/desktop/wmxss/README
@@ -1,3 +1,5 @@
+wmxss (XScreenSaver DockApp)
+
A simple dockapp frontend for XScreenSaver that can also display XSS
screensavers. Execute like so:
diff --git a/desktop/wmxss/wmxss.SlackBuild b/desktop/wmxss/wmxss.SlackBuild
index e100a4d239..39e5f69f74 100644
--- a/desktop/wmxss/wmxss.SlackBuild
+++ b/desktop/wmxss/wmxss.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for wmxss
#
@@ -22,8 +22,9 @@
# 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>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+# 20210909 bkw: BUILD=3, -fcommon for -current.
# 20160816 bkw:
# - BUILD=2
# - took over as maintainer
@@ -31,10 +32,13 @@
# - add /usr/libexec/xscreensaver to $PATH before executing the -e
# command, to allow the example (from "wmxss --help") to actually work.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=wmxss
VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -44,7 +48,11 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -72,11 +80,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 {} \+
# lazy typist patch: search in /usr/libexec/xscreensaver first.
patch -p1 < $CWD/libexecpath.diff
@@ -84,7 +89,7 @@ patch -p1 < $CWD/libexecpath.diff
# This archive is very dirty:
rm -f Src/$PRGNAM Src/*.o
-make -C Src all CFLAGS="$SLKCFLAGS"
+make -C Src all CFLAGS="$SLKCFLAGS -fcommon"
mkdir -p $PKG/usr/bin
install -s -m 0755 Src/wmxss $PKG/usr/bin/wmxss
@@ -96,4 +101,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/wmxss/wmxss.info b/desktop/wmxss/wmxss.info
index ad616a2720..3c1357a101 100644
--- a/desktop/wmxss/wmxss.info
+++ b/desktop/wmxss/wmxss.info
@@ -1,10 +1,10 @@
PRGNAM="wmxss"
VERSION="0.1"
-HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html"
-DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmxss-0.1.tar.gz"
+HOMEPAGE="https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/other.html"
+DOWNLOAD="https://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmxss-0.1.tar.gz"
MD5SUM="26d4f00c3a3d1b2306ba4924a9fbb0fa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"