system/opam: Updated for version 2.1.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 15 insertions, 19 deletions

diff --git a/system/opam/README b/system/opam/README
index 36b3e185fc09d..35504153786af 100644
--- a/system/opam/README
+++ b/system/opam/README
@@ -6,11 +6,11 @@ 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 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 upgrade      # Upgrade installed packages to their latest version
 
 
 It has to be initialised. To do it, you can use the following command:
diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild
index 7a7d9a9aad1f0..8bb17c3f7ec6c 100644
--- a/system/opam/opam.SlackBuild
+++ b/system/opam/opam.SlackBuild
@@ -21,10 +21,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v2.1.2.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=opam
-VERSION=${VERSION:-2.0.5}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -37,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -94,16 +94,12 @@ 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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+strip $PKG/usr/bin/*
+gzip $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS CHANGES CONTRIBUTING.md LICENSE README.md \
       $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/doc/opam-installer $PKG/usr/doc/$PRGNAM-$VERSION/opam-installer
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/opam/opam.info b/system/opam/opam.info
index 718cadb372ef2..52ff115b3faa6 100644
--- a/system/opam/opam.info
+++ b/system/opam/opam.info
@@ -1,8 +1,8 @@
 PRGNAM="opam"
-VERSION="2.0.5"
+VERSION="2.1.2"
 HOMEPAGE="https://opam.ocaml.org/"
-DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.5/opam-full-2.0.5.tar.gz"
-MD5SUM="3a273029a55529831fdd408d9add2db0"
+DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.1.2/opam-full-2.1.2.tar.gz"
+MD5SUM="801d2244c79d27c414e3306a08c4e564"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ocaml bubblewrap"