1 files changed, 10 insertions, 31 deletions
diff --git a/libraries/Botan/Botan.SlackBuild b/libraries/Botan/Botan.SlackBuild
index 1d7d5af422..211ccc7234 100644
--- a/libraries/Botan/Botan.SlackBuild
+++ b/libraries/Botan/Botan.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Botan
 
-# Copyright (c) 2010-2015  Markus Reichelt, Stolberg (Rhld.), DE
+# Copyright (c) 2010-2016  Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -26,28 +26,27 @@
 # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
 
 PRGNAM=Botan
-VERSION=${VERSION:-1.10.9}
+VERSION=${VERSION:-1.11.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-#this kludge is required, courtesy of upstream
-PRGNAMI=botan
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
     *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+PRGNAMI=botan
+
 CWD=$(pwd)
 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"
@@ -78,39 +77,19 @@ find -L . \
 LDFLAGS="$LDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure.py \
+python configure.py \
   --prefix=/usr \
   --docdir=doc \
   --libdir=lib$LIBDIRSUFFIX \
-  --with-boost-python \
+  --destdir=$PKG/usr \
   --with-doxygen
 
 make
-make check
-LD_PRELOAD="./libbotan-1.10.so" ./check --test
-make -f Makefile.python
-make -f Makefile.python install \
-  PYTHON_ROOT=/usr/lib$LIBDIRSUFFIX/python2.7/config \
-  PYTHON_SITE_PACKAGE_DIR=$PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages
-make install DESTDIR=$PKG/usr
+make install
 
 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
 
-# Fix some stupid permissions before we move stuff.
-find doc -type d -exec chmod 0755 {} \;
-find doc -type f -exec chmod 0644 {} \;
-
-mv $PKG/usr/doc/$PRGNAMI-$VERSION/doxygen/  $PKG/usr/doc/$PRGNAMI-$VERSION/html/
-
-cp -a \
-  doc/examples/ \
-  $PKG/usr/doc/$PRGNAMI-$VERSION/
-
-cp -a \
-  doc/*.el \
-  $PKG/usr/doc/$PRGNAMI-$VERSION/manual/
-
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAMI-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install