3 files changed, 59 insertions, 13 deletions
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index 1f832f00..6bd22500 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=cmake
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -34,6 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i586" ]; then
@@ -46,7 +56,6 @@ else
   SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -55,8 +64,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -76,7 +85,7 @@ cd cmake-build
   --no-system-jsoncpp \
   --system-zlib \
   --system-bzip2 \
-  --system-libarchive
+  --system-libarchive || exit 1
 #  --system-libs
 #  --sphinx-man \
 
@@ -93,8 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --no-system-jsoncpp \
   --system-zlib \
   --system-bzip2 \
-  --system-libarchive \
-  --build=$ARCH-slackware-linux
+  --system-libarchive || exit 1
 #  --system-libs \
 #  --sphinx-man \
 
@@ -104,7 +112,7 @@ make install DESTDIR=$PKG || exit 1
 
 # Install preprocessed man pages instead of adding six new python packages:
 ( cd $PKG
-  tar xf $CWD/cmake.manpages.tar.xz
+  tar xf $CWD/cmake.manpages.tar.?z
 )
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/d/cmake/extract-manpages-from-binary.sh b/source/d/cmake/extract-manpages-from-binary.sh
new file mode 100755
index 00000000..59dc561b
--- /dev/null
+++ b/source/d/cmake/extract-manpages-from-binary.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Copyright 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# 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.
+
+# This is a script to extract the manpages from cmake-*-Linux-x86_64.tar.gz
+# and output them as cmake.manpages.tar.xz in the current directory.
+
+rm -rf tmp-manpages
+mkdir tmp-manpages
+tar xf cmake-*-Linux-x86_64.tar.?z
+mv cmake-*-Linux-x86_64/man tmp-manpages
+rm -r cmake-*-Linux-x86_64
+mkdir tmp-manpages/usr
+mv tmp-manpages/man tmp-manpages/usr
+chown -R root:root tmp-manpages
+cd tmp-manpages
+tar cf ../cmake.manpages.tar .
+cd ..
+lzip -9 -f cmake.manpages.tar
+rm -r tmp-manpages
diff --git a/source/d/cmake/slack-desc b/source/d/cmake/slack-desc
index 8fb5c8dd..016e5895 100644
--- a/source/d/cmake/slack-desc
+++ b/source/d/cmake/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
@@ -13,7 +13,7 @@ cmake: and compiler independent configuration files. CMake generates
 cmake: native makefiles and workspaces that can be used in the
 cmake: compiler environment of your choice.
 cmake:
-cmake: CMake's home on the web is:  http://www.cmake.org
+cmake: Homepage: http://www.cmake.org
 cmake:
 cmake:
 cmake: