2 files changed, 18 insertions, 8 deletions
diff --git a/haskell/haskell-cryptonite/haskell-cryptonite.SlackBuild b/haskell/haskell-cryptonite/haskell-cryptonite.SlackBuild
index 2a09c30328..c04b358e09 100644
--- a/haskell/haskell-cryptonite/haskell-cryptonite.SlackBuild
+++ b/haskell/haskell-cryptonite/haskell-cryptonite.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for haskell-cryptonite
 
@@ -22,10 +22,13 @@
 #  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)
+
 PRGNAM=haskell-cryptonite
-VERSION=${VERSION:-0.25}
+VERSION=${VERSION:-0.29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
 
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,7 +99,7 @@ runghc Setup copy --destdir=$PKG
 runghc Setup register --gen-pkg-config
 
 PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
-PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | sed "s/[[:space:]][[:space:]]*/ /" | cut -d" " -f2 )
 mkdir -p $PKG/$PKGCONFD
 mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
@@ -105,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/haskell/haskell-cryptonite/haskell-cryptonite.info b/haskell/haskell-cryptonite/haskell-cryptonite.info
index a14d5418f2..635908617b 100644
--- a/haskell/haskell-cryptonite/haskell-cryptonite.info
+++ b/haskell/haskell-cryptonite/haskell-cryptonite.info
@@ -1,8 +1,8 @@
 PRGNAM="haskell-cryptonite"
-VERSION="0.25"
+VERSION="0.29"
 HOMEPAGE="https://hackage.haskell.org/package/cryptonite"
-DOWNLOAD="https://hackage.haskell.org/package/cryptonite-0.25/cryptonite-0.25.tar.gz"
-MD5SUM="edff732f06070fee9d5d16aedf7aa172"
+DOWNLOAD="https://hackage.haskell.org/package/cryptonite-0.29/cryptonite-0.29.tar.gz"
+MD5SUM="4e749e627aab5710f568ad197101b244"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="haskell-memory"