Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 crypto/scrypt/BUILD     |    7 +++++++
 crypto/scrypt/CONFIGURE |    3 +++
 crypto/scrypt/DEPENDS   |    9 +++++++--
 crypto/scrypt/DETAILS   |   11 +++++------
 crypto/scrypt/HISTORY   |    6 ++++++
 crypto/scrypt/INSTALL   |    5 +++++
 crypto/scrypt/PRE_BUILD |    9 ++++++---
 7 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit 5e5e3cd10fe5c67a326c03e9b6c3bdb7e01c2ce9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    scrypt: => 1.3.0

diff --git a/crypto/scrypt/BUILD b/crypto/scrypt/BUILD
new file mode 100755
index 0000000..e08bfc9
--- /dev/null
+++ b/crypto/scrypt/BUILD
@@ -0,0 +1,7 @@
+OPTS="${SCRYPT_OPTS} ${OPTS}" &&
+
+if is_depends_enabled ${SPELL} meson; then
+  source "${GRIMOIRE}/MESON_FUNCTIONS"
+fi &&
+
+default_build
diff --git a/crypto/scrypt/CONFIGURE b/crypto/scrypt/CONFIGURE
new file mode 100755
index 0000000..9cb818f
--- /dev/null
+++ b/crypto/scrypt/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option SCRYPT_OPTS "Install libscrypt-kdf and development 
headers?" n \
+                                "--enable-libscrypt-kdf" \
+                                "--disable-libscrypt-kdf"
diff --git a/crypto/scrypt/DEPENDS b/crypto/scrypt/DEPENDS
index b2f63d7..f9b5aa6 100755
--- a/crypto/scrypt/DEPENDS
+++ b/crypto/scrypt/DEPENDS
@@ -1,2 +1,7 @@
-source $GRIMOIRE/MESON_DEPENDS
-depends SSL
+depends SSL &&
+
+optional_depends meson "" "" "to build with meson" &&
+
+if is_depends_enabled ${SPELL} meson; then
+  source "${GRIMOIRE}/MESON_DEPENDS"
+fi
diff --git a/crypto/scrypt/DETAILS b/crypto/scrypt/DETAILS
index 159920e..f4f18e7 100755
--- a/crypto/scrypt/DETAILS
+++ b/crypto/scrypt/DETAILS
@@ -1,10 +1,9 @@
-source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=scrypt
-         VERSION=1.2.1
-     
SOURCE_HASH=sha512:ffda0ee90d283985245b77cc1d04b13c52aff78e925f323075d3b2c0439f16bbba1c432de8607820af945e6fa4e3be0e22a422b0b43a1fca0504cee3761004cd
-          SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=https://www.tarsnap.com/scrypt/$SOURCE
+         VERSION=1.3.0
+          SOURCE=${SPELL}-${VERSION}.tgz
+   SOURCE_URL[0]=https://www.tarsnap.com/scrypt/${SOURCE}
+     
SOURCE_HASH=sha256:263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748:UPSTREAM_HASH
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=https://www.tarsnap.com/scrypt.html
          ENTERED=20100528
       LICENSE[0]=BSD
diff --git a/crypto/scrypt/HISTORY b/crypto/scrypt/HISTORY
index ea3847c..68ea362 100644
--- a/crypto/scrypt/HISTORY
+++ b/crypto/scrypt/HISTORY
@@ -1,3 +1,9 @@
+2020-04-06 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.3.0
+       * DEPENDS, PRE_BUILD: made meson optional
+       * BUILD, INSTALL: added, to make meson optional and use SCRYPT_OPTS
+       * CONFIGURE: added, for optional settings
+
 2018-08-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS DEPENDS: adpt to meson
        * PRE_BUILD patches/*: added
diff --git a/crypto/scrypt/INSTALL b/crypto/scrypt/INSTALL
new file mode 100755
index 0000000..ad95033
--- /dev/null
+++ b/crypto/scrypt/INSTALL
@@ -0,0 +1,5 @@
+if is_depends_enabled ${SPELL} meson; then
+  source "${GRIMOIRE}/MESON_FUNCTIONS"
+fi &&
+
+default_install
diff --git a/crypto/scrypt/PRE_BUILD b/crypto/scrypt/PRE_BUILD
index 922c0ab..c6cab93 100755
--- a/crypto/scrypt/PRE_BUILD
+++ b/crypto/scrypt/PRE_BUILD
@@ -1,3 +1,6 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if is_depends_enabled ${SPELL} meson; then
+  apply_patch_dir patches
+fi