7 files changed, 125 insertions, 38 deletions
diff --git a/desktop/pekwm/README b/desktop/pekwm/README
index 3fc837b08c9a..34bf314c79ca 100644
--- a/desktop/pekwm/README
+++ b/desktop/pekwm/README
@@ -1,2 +1,11 @@
-This window manager doesn't require any packages that aren't
-already provided by Slackware. Just run the SlackBuild and have fun :)
+The Pek Window Manager a lightweight window manager with tabs
+based on aewm++.
+
+-grouping windows in a single frame (tabbed windows);
+-keychains (multi-level keybindings);
+-mouse actions;
+-root- and window-menus and keybindings for all menus;
+-dynamic menus that regenerate on every view from a script output;
+-multi-screen support via both XRandR and Xinerama;
+-support for window placement;
+-theming support with images, shaping and configurable buttons.
diff --git a/desktop/pekwm/doinst.sh b/desktop/pekwm/doinst.sh
index 6d04012eb562..451bc82f7342 100644
--- a/desktop/pekwm/doinst.sh
+++ b/desktop/pekwm/doinst.sh
@@ -11,10 +11,15 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/pekwm/config.new
-config etc/pekwm/start.new
 config etc/pekwm/autoproperties.new
+config etc/pekwm/autoproperties_typerules.new
+config etc/pekwm/config.new
+config etc/pekwm/config_system.new
+config etc/pekwm/keys.new
+config etc/pekwm/menu.new
 config etc/pekwm/mouse.new
+config etc/pekwm/mouse_click.new
+config etc/pekwm/mouse_sloppy.new
+config etc/pekwm/mouse_system.new
+config etc/pekwm/start.new
 config etc/pekwm/vars.new
-config etc/pekwm/menu.new
-config etc/pekwm/keys.new
diff --git a/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild
index 4ee1cb0676bd..a7a779402223 100644
--- a/desktop/pekwm/pekwm.SlackBuild
+++ b/desktop/pekwm/pekwm.SlackBuild
@@ -2,12 +2,32 @@
 
 # Slackware build script for pekwm
 
-# Written by Eugene Suter <easuter at gmail.com>
+# Copyright 2012, Eugene Suter, <easuter at gmail dot com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  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
+#  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;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Eugene M. <damagedone at gmx dot com>
 
 PRGNAM=pekwm
-VERSION=${VERSION:-0.1.11}
+VERSION=${VERSION:-0.1.17}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-_SBo} 
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -20,9 +40,9 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/tmp/SBo}	# For consistency's sake, use this
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -67,24 +87,31 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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 LICENSE ChangeLog README NEWS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+install -D -m0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm
+install -D -m0644 $CWD/pekwm.desktop $PKG/usr/share/xsessions/pekwm.desktop
+install -D -m0644 $CWD/pekwm.desktop $PKG/usr/share/apps/kdm/sessions/pekwm.desktop
 
 for CONF in $PKG/etc/pekwm/* ; do
   mv $CONF $CONF.new
 done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog INSTALL LICENSE NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/desktop/pekwm/pekwm.desktop b/desktop/pekwm/pekwm.desktop
new file mode 100644
index 000000000000..d7a310be34fe
--- /dev/null
+++ b/desktop/pekwm/pekwm.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PekWM
+Comment= Lightweight window manager
+Exec=/usr/bin/pekwm
+Type=XSession
diff --git a/desktop/pekwm/pekwm.info b/desktop/pekwm/pekwm.info
index a27935d7ea3c..e1975a82e145 100644
--- a/desktop/pekwm/pekwm.info
+++ b/desktop/pekwm/pekwm.info
@@ -1,10 +1,10 @@
 PRGNAM="pekwm"
-VERSION="0.1.11"
-HOMEPAGE="http://pekwm.org/projects/pekwm"
-DOWNLOAD="http://www.pekwm.org/projects/pekwm/files/pekwm-0.1.11.tar.bz2"
-MD5SUM="79df6d01c48e6eb1907dcd3a8246410c"
+VERSION="0.1.17"
+HOMEPAGE="https://pekwm.org"
+DOWNLOAD="https://www.pekwm.org/projects/pekwm/files/pekwm-0.1.17.tar.bz2"
+MD5SUM="514c04ff1c6123635c00e57443b5e86f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="nobody"
-EMAIL="nobody"
+MAINTAINER="Eugene M."
+EMAIL="damagedone@gmx.com"
diff --git a/desktop/pekwm/slack-desc b/desktop/pekwm/slack-desc
index f6dafedfed18..9f77684c06b0 100644
--- a/desktop/pekwm/slack-desc
+++ b/desktop/pekwm/slack-desc
@@ -1,11 +1,19 @@
-pekwm: Lightweight window manager for X
-pekwm: 
-pekwm: pekwm is a window manager that once up on a time was based 
-pekwm: on the aewm++ window manager, but it has evolved enough that it 
-pekwm: no longer resembles aewm++ at all. It has a much expanded 
-pekwm: feature-set, including window grouping (similar to ion, pwm, 
-pekwm: or fluxbox), autoproperties, xinerama, keygrabber that supports 
-pekwm: keychains, and much more. 
-pekwm: 
-pekwm: Website: http://pekwm.org/projects/pekwm
-pekwm: License: GNU General Public License (v2)
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+pekwm: pekwm (Lightweight window manager for X)
+pekwm:
+pekwm: The code is based on aewm++ wm, but it has evolved enough that it no
+pekwm: longer resembles aewm++ at all. It also has an expanded feature-set,
+pekwm: including window grouping, auto properties, xinerama and keygrabber
+pekwm: that supports keychains, and much more.
+pekwm:
+pekwm:
+pekwm: Homepage: https://www.pekwm.org
+pekwm:
+pekwm:
diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm
new file mode 100644
index 000000000000..bfbb9d3b70f4
--- /dev/null
+++ b/desktop/pekwm/xinitrc.pekwm
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session dbus-launch --exit-with-session /usr/bin/pekwm
+else
+  exec /usr/bin/pekwm
+fi
+