desktop/bspwm: Updated for version 0.9.2 + new maintainer.

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

6 files changed, 70 insertions, 29 deletions

diff --git a/desktop/bspwm/README b/desktop/bspwm/README
index 081d837df7..bc5113f3ef 100644
--- a/desktop/bspwm/README
+++ b/desktop/bspwm/README
@@ -1,5 +1,9 @@
 bspwm (Binary space partitioning window manager)
 
 bspwm is a tiling window manager that represents windows as the
-leaves of a full binary tree. It is controlled and configured
-via bspc.
+leaves of a full binary tree. It only responds to X events, and
+the messages it receives on a dedicated socket.
+
+bspwm doesn't handle any keyboard or pointer inputs: a third
+party program (e.g. sxhkd) is needed in order to translate
+keyboard and pointer events to bspc invocations.
diff --git a/desktop/bspwm/README.SLACKWARE b/desktop/bspwm/README.SLACKWARE
new file mode 100644
index 0000000000..d339e8e2da
--- /dev/null
+++ b/desktop/bspwm/README.SLACKWARE
@@ -0,0 +1,36 @@
+README.SLACKWARE
+================
+
+Dependencies
+------------
+
+sxhkd is required for keyboard and pointer bindings.
+xterm or rxvt-unicode recommended as terminal emulator.
+
+Configuration
+-------------
+
+You need to create your config files in order to launch bspwm.
+bspwm comes with some examples in /usr/doc/bspwm/examples
+
+If you want to install these examples create ~/.config/bspwm/ 
+and ~/.config/sxhkd and copy bspwmrc and sxhkdrc from 
+/usr/doc/bspwm/examples/ accordingly. You need to change the
+line 7 from sxhkd to match your preferred terminal emulator.
+
+Give both exec permissions with chmod +x ~/.config/bspwm/bspwmrc
+and chmod +x ~/.config/sxhkd/sxhkdrc
+
+Then run xwmconfig to choose your new default window manager.
+
+Panel
+-----
+
+If also you need a panel install:
+
+xdo
+sutils
+xtitle
+bar
+
+Examples also for the panel exists in /usr/doc/bspwm/examples/panel
diff --git a/desktop/bspwm/bspwm.SlackBuild b/desktop/bspwm/bspwm.SlackBuild
index 83c44089bc..7160c3eec8 100644
--- a/desktop/bspwm/bspwm.SlackBuild
+++ b/desktop/bspwm/bspwm.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for bspwm
 
-# Copyright 2013 John Vogel Corning, NY USA
+# Copyright 2013-2016 John Vogel Corning, NY USA
+# Copyright 2017 Panagiotis Nikolaou, Culver City, CA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -13,7 +14,7 @@
 #
 #  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 #  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
@@ -23,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bspwm
-VERSION=${VERSION:-0.8.9}
+VERSION=${VERSION:-0.9.2}
 BUILD=${BUILD:-1}
 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 +41,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"
@@ -60,11 +61,6 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-if [ ! -f $CWD/$PRGNAM-$VERSION.tar.gz ]; then
-	if [ -f $CWD/$VERSION.tar.gz ]; then
-		mv $CWD/$VERSION.tar.gz $CWD/$PRGNAM-$VERSION.tar.gz
-	fi
-fi
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -74,19 +70,25 @@ 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 {} \;
 
+sed -i "s|share/man|man|" Makefile
+sed -i "s|share/doc/bspwm|doc/bspwm-$VERSION|" Makefile
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=/usr MANPREFIX=/usr/man
-make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$PKG install
+make PREFIX=/usr
+make PREFIX=/usr DESTDIR=$PKG install
 
 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/etc/X11/xinit
+cat $CWD/xinitrc.bspwm > $PKG/etc/X11/xinit/xinitrc.bspwm
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.bspwm
+
 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 LICENSE doc/*.md doc/*.txt contrib examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/bspwm/bspwm.info b/desktop/bspwm/bspwm.info
index 92a0a3d507..20ada09028 100644
--- a/desktop/bspwm/bspwm.info
+++ b/desktop/bspwm/bspwm.info
@@ -1,10 +1,10 @@
 PRGNAM="bspwm"
-VERSION="0.8.9"
+VERSION="0.9.2"
 HOMEPAGE="https://github.com/baskerville/bspwm"
-DOWNLOAD="https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz"
-MD5SUM="6f7967a4b64df468f2f29964b77aa9c3"
+DOWNLOAD="https://github.com/baskerville/bspwm/archive/0.9.2/bspwm-0.9.2.tar.gz"
+MD5SUM="b877b2a40156bc2b554fcf5b16ae6b56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sxhkd"
-MAINTAINER="John Vogel"
-EMAIL="jvogel4@stny.rr.com"
+REQUIRES=""
+MAINTAINER="Panagiotis Nikolaou"
+EMAIL="hostmaster@slackonly.com"
diff --git a/desktop/bspwm/slack-desc b/desktop/bspwm/slack-desc
index 0982ff254c..0e6a32d213 100644
--- a/desktop/bspwm/slack-desc
+++ b/desktop/bspwm/slack-desc
@@ -9,11 +9,11 @@
 bspwm: bspwm (Binary space partitioning window manager)
 bspwm:
 bspwm: bspwm is a tiling window manager that represents windows as the
-bspwm: leaves of a full binary tree. It is controlled and configured
-bspwm: via bspc.
-bspwm:
-bspwm: homepage: https://github.com/baskerville/bspwm
-bspwm:
-bspwm:
+bspwm: leaves of a full binary tree. It only responds to X events,
+bspwm: and the messages it receives on a dedicated socket.
+bspwm: bspwm doesn't handle any keyboard or pointer inputs: a third party
+bspwm: program (e.g. sxhkd) is needed in order to translate keyboard and
+bspwm: and pointer events to bspc invocations.
 bspwm:
+bspwm: Homepage: https://github.com/baskerville/bspwm
 bspwm:
diff --git a/desktop/bspwm/xinitrc.bspwm b/desktop/bspwm/xinitrc.bspwm
index fbed6402bb..619aaf0fda 100644
--- a/desktop/bspwm/xinitrc.bspwm
+++ b/desktop/bspwm/xinitrc.bspwm
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap