From 97e000b8ce16626a160e2196627fb0c884dbcfbf Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 10 Apr 2021 17:02:43 +0200
Subject: 20210410.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/opam/README          | 13 +++++++------
 system/opam/opam.SlackBuild | 10 +++++-----
 system/opam/opam.info       |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'system/opam')

diff --git a/system/opam/README b/system/opam/README
index 9257895cd0..36b3e185fc 100644
--- a/system/opam/README
+++ b/system/opam/README
@@ -6,15 +6,16 @@ constraints, and a Git-friendly development workflow.
 
 Managing your OCaml installation can be as simple as:
 
-    opam list -a         # List the available packages
-    opam install lwt     # Install LWT
-    opam update          # Update the package list
-    ...
-    opam upgrade         # Upgrade the installed packages to their latest version
+  opam list -a       # List the available packages
+  opam install lwt   # Install LWT
+  opam update        # Update the package list
+  ...
+  opam upgrade       # Upgrade the installed packages to their latest version
 
 
 It has to be initialised. To do it, you can use the following command:
-opam init
+
+  opam init
 
 It is not recommended to run opam as root.
 Apparently it rather installs per-user packages.
diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild
index e7d8270b0d..04464c1032 100644
--- a/system/opam/opam.SlackBuild
+++ b/system/opam/opam.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opam
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,16 +73,16 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make lib-ext
-make
-make install DESTDIR=$PKG
+make -j1 lib-ext
+make -j1
+make -j1 DESTDIR=$PKG 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
diff --git a/system/opam/opam.info b/system/opam/opam.info
index fd986517c7..718cadb372 100644
--- a/system/opam/opam.info
+++ b/system/opam/opam.info
@@ -1,8 +1,8 @@
 PRGNAM="opam"
-VERSION="2.0.1"
+VERSION="2.0.5"
 HOMEPAGE="https://opam.ocaml.org/"
-DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz"
-MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda"
+DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.5/opam-full-2.0.5.tar.gz"
+MD5SUM="3a273029a55529831fdd408d9add2db0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ocaml bubblewrap"
-- 
cgit v1.2.3