From f60fa5eba4a61bdce3f82672ec008bd6e03f6e6f Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 14 Sep 2018 13:52:59 -0400
Subject: desktop/ctwm: Updated for version 4.0.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 desktop/ctwm/ctwm.SlackBuild | 26 ++++++++++----------------
 desktop/ctwm/ctwm.info       |  6 +++---
 2 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'desktop/ctwm')

diff --git a/desktop/ctwm/ctwm.SlackBuild b/desktop/ctwm/ctwm.SlackBuild
index f1d49cea8c..710b101152 100644
--- a/desktop/ctwm/ctwm.SlackBuild
+++ b/desktop/ctwm/ctwm.SlackBuild
@@ -23,10 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20180914 bkw:
+# - update for v4.0.2.
+# - add COPYRIGHT to doc dir.
+# - simplify script a bit.
+
 # 20180802 bkw: take over maintenance, no script changes.
 
 PRGNAM=ctwm
-VERSION=${VERSION:-4.0.1}
+VERSION=${VERSION:-4.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,11 +71,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -83,21 +85,13 @@ cd build
     -DCMAKE_BUILD_TYPE=Release ..
 
   make
-  make install DESTDIR="$PKG"
+  make install/strip DESTDIR="$PKG"
 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
-
-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 -D -m0755 $CWD/xinitrc.ctwm $PKG/etc/X11/xinit/xinitrc.ctwm
 
 mkdir -p $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
+cp -a *.md COPYRIGHT examples/*.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 8efda00b6c..551e3077b5 100644
--- a/desktop/ctwm/ctwm.info
+++ b/desktop/ctwm/ctwm.info
@@ -1,8 +1,8 @@
 PRGNAM="ctwm"
-VERSION="4.0.1"
+VERSION="4.0.2"
 HOMEPAGE="https://www.ctwm.org"
-DOWNLOAD="https://www.ctwm.org/dist/ctwm-4.0.1.tar.xz"
-MD5SUM="973261a72b0db5f91e7bce12dc57a716"
+DOWNLOAD="https://www.ctwm.org/dist/ctwm-4.0.2.tar.xz"
+MD5SUM="18a44cff6dad4e1f93f6cc03832de858"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3