summaryrefslogtreecommitdiffstats
path: root/desktop/wmxss/wmxss.SlackBuild
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2016-08-16 03:43:04 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-20 07:50:03 +0700
commit787c93b8a8208711b3f5cba99e89e1f736e7874e (patch)
tree3c8cfb7d93a08dcb489fa0dd4c031fb704fb3b1c /desktop/wmxss/wmxss.SlackBuild
parent9ea8ca2f3e46cddd21def8169693e13e39442e93 (diff)
downloadslackbuilds-787c93b8a8208711b3f5cba99e89e1f736e7874e.tar.gz
slackbuilds-787c93b8a8208711b3f5cba99e89e1f736e7874e.tar.xz
desktop/wmxss: New maintainer, minor fixes.
Diffstat (limited to 'desktop/wmxss/wmxss.SlackBuild')
-rw-r--r--desktop/wmxss/wmxss.SlackBuild37
1 files changed, 21 insertions, 16 deletions
diff --git a/desktop/wmxss/wmxss.SlackBuild b/desktop/wmxss/wmxss.SlackBuild
index 34032420ee..e100a4d239 100644
--- a/desktop/wmxss/wmxss.SlackBuild
+++ b/desktop/wmxss/wmxss.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for wmxss
#
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,23 @@
# 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>
+
+# 20160816 bkw:
+# - BUILD=2
+# - took over as maintainer
+# - actually build with SLKCFLAGS
+# - add /usr/libexec/xscreensaver to $PATH before executing the -e
+# command, to allow the example (from "wmxss --help") to actually work.
+
PRGNAM=wmxss
VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,19 +78,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cd Src
-
-# This archive is very dirty!
-make clean
-
-# Let's compile!
-make
+# lazy typist patch: search in /usr/libexec/xscreensaver first.
+patch -p1 < $CWD/libexecpath.diff
-# Copies over compiled binary
-install -D -m 0755 wmxss $PKG/usr/bin/wmxss
+# This archive is very dirty:
+rm -f Src/$PRGNAM Src/*.o
-# Need to do this for the license file
-cd ../
+make -C Src all CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+install -s -m 0755 Src/wmxss $PKG/usr/bin/wmxss
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION