From 6dd427c825f8f4a89059924525e3b7fcbe7c7051 Mon Sep 17 00:00:00 2001
From: Leonard Schmidt <lems@gmx.net>
Date: Tue, 30 May 2017 21:30:12 +0700
Subject: desktop/ctwm: Updated for version 4.0.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/ctwm/ctwm.SlackBuild   |  30 ++++++++++++++++--------------
 desktop/ctwm/ctwm.info         |   6 +++---
 desktop/ctwm/ctwm.path.diff.gz | Bin 314 -> 0 bytes
 3 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 desktop/ctwm/ctwm.path.diff.gz

(limited to 'desktop')

diff --git a/desktop/ctwm/ctwm.SlackBuild b/desktop/ctwm/ctwm.SlackBuild
index 8ef85ed80e..3ac6ff6da5 100644
--- a/desktop/ctwm/ctwm.SlackBuild
+++ b/desktop/ctwm/ctwm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ctwm
 
-# Copyright 2014, Leonard Schmidt, <lems@gmx.net>
+# Copyright 2014-2017 Leonard Schmidt, <lems@gmx.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ctwm
-VERSION=${VERSION:-3.8.2}
+VERSION=${VERSION:-4.0.0}
 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 +40,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,12 +69,14 @@ 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 {} \;
 
-zcat $CWD/ctwm.path.diff.gz | patch -p1 --verbose
-cp Imakefile.local-template Imakefile.local
-xmkmf -a
-
-make CDEBUGFLAGS="$SLKCFLAGS"
-make install install.man DESTDIR=$PKG
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=/usr		\
+      -DMANDIR=/usr/man				\
+      -DDOCDIR=/usr/doc/$PRGNAM-$VERSION	\
+      -DEXAMPLEDIR=/usr/doc/$PRGNAM-$VERSION ..
+make
+make DESTDIR="$PKG" install
+cd ..
 
 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
@@ -85,9 +87,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 install -D -m0755 $CWD/xinitrc.ctwm $PKG/etc/X11/xinit/xinitrc.ctwm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES PROBLEMS README README.gnome TODO TODO.gnome \
-  example.ctwmrc levitte.ctwmrc peterc.ctwmrc system.ctwmrc.gnome \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.md README.md \
+  examples/example.ctwmrc examples/levitte.ctwmrc	\
+  examples/peterc.ctwmrc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/ctwm/ctwm.info b/desktop/ctwm/ctwm.info
index 2aaa41e2d9..6c40951e49 100644
--- a/desktop/ctwm/ctwm.info
+++ b/desktop/ctwm/ctwm.info
@@ -1,8 +1,8 @@
 PRGNAM="ctwm"
-VERSION="3.8.2"
+VERSION="4.0.0"
 HOMEPAGE="http://ctwm.org"
-DOWNLOAD="http://ctwm.org/dist/ctwm-3.8.2.tar.xz"
-MD5SUM="c53634916b530e5aaff7621d13cf1b06"
+DOWNLOAD="https://www.ctwm.org/dist/ctwm-4.0.0.tar.xz"
+MD5SUM="950c84dd20d32e5d47b1d50c6f328936"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/ctwm/ctwm.path.diff.gz b/desktop/ctwm/ctwm.path.diff.gz
deleted file mode 100644
index 936c334d9b..0000000000
Binary files a/desktop/ctwm/ctwm.path.diff.gz and /dev/null differ
-- 
cgit v1.2.3