summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Suter <easuter@gmail.com>2010-05-13 00:23:04 +0200
committerErik Hanson <erik@slackbuilds.org>2010-05-13 00:23:04 +0200
commit13fda597655a5cae9ccff94ca73fc64302f9dbc2 (patch)
treec0234b8c352ffe428791c12dc34f3b3ef4068eb1
parent9bc6cf951611957306c0d160b6daa372361a38ea (diff)
downloadslackbuilds-13fda597655a5cae9ccff94ca73fc64302f9dbc2.tar.gz
desktop/pekwm: Updated for version 0.1.11
-rw-r--r--desktop/pekwm/README16
-rw-r--r--desktop/pekwm/doinst.sh20
-rw-r--r--desktop/pekwm/pekwm.SlackBuild67
-rw-r--r--desktop/pekwm/pekwm.info14
-rw-r--r--desktop/pekwm/slack-desc28
-rw-r--r--desktop/pekwm/xinitrc.pekwm26
6 files changed, 84 insertions, 87 deletions
diff --git a/desktop/pekwm/README b/desktop/pekwm/README
index b24c6e4d67..3fc837b08c 100644
--- a/desktop/pekwm/README
+++ b/desktop/pekwm/README
@@ -1,14 +1,2 @@
-pekwm is a small and flexible window manager.
-
-The Pek Window Manager is written by Claes Nsten, the code is based on the
-aewm++ window manager, but it has evolved enough that it no longer resembles
-aewm++ at all. It has a much expanded feature-set, including window grouping
-(similar to ion, pwm, or fluxbox), autoproperties, xinerama, keygrabber that
-supports keychains, and much more.
-
- * Lightweight and Unobtrusive, a window manager shouldn't be noticed.
- * Very configurable, we all work and think in different ways.
- * Automatic properties, for all the lazy people, make things appear as
- they should when starting applications.
- * Chainable Keygrabber, usability for everyone.
-
+This window manager doesn't require any packages that aren't
+already provided by Slackware. Just run the SlackBuild and have fun :)
diff --git a/desktop/pekwm/doinst.sh b/desktop/pekwm/doinst.sh
new file mode 100644
index 0000000000..6d04012eb5
--- /dev/null
+++ b/desktop/pekwm/doinst.sh
@@ -0,0 +1,20 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # 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/mouse.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 6d7e8eacd3..9c11dd9c18 100644
--- a/desktop/pekwm/pekwm.SlackBuild
+++ b/desktop/pekwm/pekwm.SlackBuild
@@ -1,12 +1,11 @@
#!/bin/sh
# Slackware build script for pekwm
-# Written by Vasilis Papavasileiou <el03020 at mail dot ntua dot gr>
-# Modified by the SlackBuilds.org project
-# (assumed to be in the public domain per our submission policy)
+
+# Written by Eugene Suter <easuter at gmail.com>
PRGNAM=pekwm
-VERSION=0.1.5
+VERSION=${VERSION:-0.1.11}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -16,49 +15,71 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# Sorry, no COPYING or LICENSE files in source
-DOCS="README AUTHORS ChangeLog INSTALL NEWS TODO"
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
+set -e # Exit on most errors
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-# for xft-config (not necessary)
-PATH=$PATH:/usr/X11/bin
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --sysconfdir=/usr/share \
- || exit 1
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
)
-# Add xinitrc.pekwm so that pekwm will show up as an option in xwmconfig
-install -D -m 0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm
+( 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
+)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $DOCS $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
+for CONF in $PKG/etc/pekwm/* ; do
+ mv $CONF $CONF.new
+done
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/pekwm/pekwm.info b/desktop/pekwm/pekwm.info
index bc956a5517..981be7c602 100644
--- a/desktop/pekwm/pekwm.info
+++ b/desktop/pekwm/pekwm.info
@@ -1,8 +1,10 @@
PRGNAM="pekwm"
-VERSION="0.1.5"
+VERSION="0.1.11"
HOMEPAGE="http://pekwm.org/projects/pekwm"
-DOWNLOAD="http://pekwm.org/projects/3/files/pekwm-0.1.5.tar.bz2"
-MD5SUM="fe3e0d77250d27963991994f83ccb4ea"
-MAINTAINER="Vasilis Papavasileiou"
-EMAIL="el03020@mail.ntua.gr"
-APPROVED="rworkman"
+DOWNLOAD="http://www.pekwm.org/projects/pekwm/files/pekwm-0.1.11.tar.bz2"
+MD5SUM="79df6d01c48e6eb1907dcd3a8246410c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Eugene Suter"
+EMAIL="easuter@gmail.com"
+APPROVED="Erik Hanson"
diff --git a/desktop/pekwm/slack-desc b/desktop/pekwm/slack-desc
index 1b685c5848..f6dafedfed 100644
--- a/desktop/pekwm/slack-desc
+++ b/desktop/pekwm/slack-desc
@@ -1,19 +1,11 @@
-# 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 ':'.
-
- |-----handy-ruler------------------------------------------------------|
-pekwm: pekwm (A small and flexible window manager)
+pekwm: Lightweight window manager for X
pekwm:
-pekwm: The Pek Window Manager (pekwm) is a small and flexible window manager
-pekwm: that aims to be usable. It supports grouping (a concept first
-pekwm: introduced by pwm), automatic properties, chainable keybindings, and
-pekwm: much more.
-pekwm:
-pekwm: Homepage: http://pekwm.org/
-pekwm:
-pekwm:
-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)
diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm
deleted file mode 100644
index d24b870b51..0000000000
--- a/desktop/pekwm/xinitrc.pekwm
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/usr/X11R6/lib/X11/xinit/.Xresources
-sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
- /usr/X11R6/bin/xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
- /usr/X11R6/bin/xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
- /usr/X11R6/bin/xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
- /usr/X11R6/bin/xmodmap $usermodmap
-fi
-
-exec pekwm