From 300418911d32aab4e8f983b0c1fcf9b74d0ad737 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 22 Apr 2018 14:06:08 +0200
Subject: Deps: updated cryptopp so I could recompile cryfs

The cryfs package was broken after the recent boost update in -current.
---
 deps/cryfs/cryfs.SlackBuild       | 13 +++++++++++--
 deps/cryptopp/.url                |  2 +-
 deps/cryptopp/cryptopp.SlackBuild | 15 ++++++++++++---
 deps/cryptopp/cryptopp.pc         |  4 ++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/deps/cryfs/cryfs.SlackBuild b/deps/cryfs/cryfs.SlackBuild
index 30902bf..4c789fc 100755
--- a/deps/cryfs/cryfs.SlackBuild
+++ b/deps/cryfs/cryfs.SlackBuild
@@ -24,11 +24,12 @@
 # -----------------------------------------------------------------------------
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=cryfs
 VERSION=${VERSION:-0.9.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -43,6 +44,14 @@ if [ -z "$ARCH" ]; then
   export ARCH
 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
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
   SLKLDFLAGS=""
diff --git a/deps/cryptopp/.url b/deps/cryptopp/.url
index 84ca719..d102016 100644
--- a/deps/cryptopp/.url
+++ b/deps/cryptopp/.url
@@ -1 +1 @@
-https://www.cryptopp.com/cryptopp600.zip
+https://www.cryptopp.com/cryptopp610.zip
diff --git a/deps/cryptopp/cryptopp.SlackBuild b/deps/cryptopp/cryptopp.SlackBuild
index ea31458..52e8660 100755
--- a/deps/cryptopp/cryptopp.SlackBuild
+++ b/deps/cryptopp/cryptopp.SlackBuild
@@ -24,13 +24,14 @@
 # -----------------------------------------------------------------------------
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=cryptopp
-VERSION=${VERSION:-6.0.0}
+VERSION=${VERSION:-6.1.0}
 SRCVER=$(echo $VERSION | tr -d '.')
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -45,6 +46,14 @@ if [ -z "$ARCH" ]; then
   export ARCH
 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
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   SLKLDFLAGS=""
diff --git a/deps/cryptopp/cryptopp.pc b/deps/cryptopp/cryptopp.pc
index 070c226..14dca21 100644
--- a/deps/cryptopp/cryptopp.pc
+++ b/deps/cryptopp/cryptopp.pc
@@ -1,6 +1,6 @@
 prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib@LIBDIRSUFFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib@LIBDIRSUFFIX@
 includedir=${prefix}/include/cryptopp
 
 Name: Crypto++
-- 
cgit v1.2.3