3 files changed, 40 insertions, 44 deletions
diff --git a/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild
index 2e563c5e3d..20961eb959 100644
--- a/desktop/pekwm/pekwm.SlackBuild
+++ b/desktop/pekwm/pekwm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pekwm
 
@@ -24,10 +24,13 @@
 
 # Modified by Eugene M., <damagedone at gmx dot com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pekwm
-VERSION=${VERSION:-0.1.17}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,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}
@@ -62,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,19 +78,20 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 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
@@ -91,13 +99,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-install -Dm0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm
-install -Dm0644 $CWD/pekwm.desktop $PKG/usr/share/xsessions/pekwm.desktop
-install -Dm0644 $CWD/pekwm.desktop $PKG/usr/share/apps/kdm/sessions/pekwm.desktop
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog INSTALL LICENSE NEWS README \
+  AUTHORS INSTALL LICENSE NEWS.md README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -105,5 +111,8 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+install -Dm0755 $CWD/xinitrc.pekwm $PKG/etc/X11/xinit/xinitrc.pekwm
+install -Dm0644 $CWD/pekwm.desktop $PKG/usr/share/applications/pekwm.desktop
+
 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/pekwm/pekwm.info b/desktop/pekwm/pekwm.info
index 250fd35bc1..95487942bc 100644
--- a/desktop/pekwm/pekwm.info
+++ b/desktop/pekwm/pekwm.info
@@ -1,8 +1,8 @@
 PRGNAM="pekwm"
-VERSION="0.1.17"
-HOMEPAGE="https://web.archive.org/web/20171215085950/http://pekwm.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/pekwm-0.1.17.tar.bz2"
-MD5SUM="514c04ff1c6123635c00e57443b5e86f"
+VERSION="0.3.0"
+HOMEPAGE="https://github.com/pekdon/pekwm"
+DOWNLOAD="https://github.com/pekdon/pekwm/releases/download/release-0.3.0/pekwm-0.3.0.tar.gz"
+MD5SUM="8603c12024526cc2ce721478a33b2cda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/pekwm/xinitrc.pekwm b/desktop/pekwm/xinitrc.pekwm
index 8337e08883..d3109b5b69 100644
--- a/desktop/pekwm/xinitrc.pekwm
+++ b/desktop/pekwm/xinitrc.pekwm
@@ -6,22 +6,10 @@ 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
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
 
 # Start the window manager:
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
@@ -29,4 +17,3 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
 else
    exec /usr/bin/pekwm
 fi
-