1 files changed, 27 insertions, 6 deletions
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index 6150598b..1f832f00 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ BUILD=${BUILD:-1}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -m32 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -m32 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -71,7 +71,15 @@ cd cmake-build
   --prefix=/usr \
   --docdir=/doc/$PKGNAM-$VERSION \
   --qt-gui \
-  --system-libs
+  --system-curl \
+  --system-expat \
+  --no-system-jsoncpp \
+  --system-zlib \
+  --system-bzip2 \
+  --system-libarchive
+#  --system-libs
+#  --sphinx-man \
+
 
 # Build
 CFLAGS="$SLKCFLAGS" \
@@ -80,12 +88,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --docdir=/doc/$PKGNAM-$VERSION \
   --qt-gui \
-  --system-libs \
+  --system-curl \
+  --system-expat \
+  --no-system-jsoncpp \
+  --system-zlib \
+  --system-bzip2 \
+  --system-libarchive \
   --build=$ARCH-slackware-linux
+#  --system-libs \
+#  --sphinx-man \
+
 
 make $NUMJOBS || make || exit 1
 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
+)
+
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
 if [ -r ../ChangeLog.txt ]; then