3 files changed, 56 insertions, 44 deletions
diff --git a/development/ocaml/configure.patch b/development/ocaml/configure.patch
index a57b19fb56..4809a26c64 100644
--- a/development/ocaml/configure.patch
+++ b/development/ocaml/configure.patch
@@ -1,13 +1,12 @@
---- configure_old	2014-05-23 22:45:22.000000000 +0200
-+++ configure	2014-05-23 22:45:31.000000000 +0200
-@@ -1612,6 +1612,10 @@
-     nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
- esac
- 
-+# Add additional flags from the environment
-+bytecccompopts="$bytecccompopts $CFLAGS"
-+nativecccompopts="$nativecccompopts $CFLAGS"
-+
- # Finish generated files
- 
- cclibs="$cclibs $mathlib"
+diff -Naur ocaml-4.13.1.orig/configure ocaml-4.13.1/configure
+--- ocaml-4.13.1.orig/configure	2021-09-30 17:40:11.000000000 +0200
++++ ocaml-4.13.1/configure	2022-02-15 16:03:05.417656000 +0100
+@@ -12758,7 +12758,7 @@
+     internal_cflags="-Wno-unused $cc_warnings \
+ -fexcess-precision=standard"
+         # TODO: see whether the code can be fixed to avoid -Wno-unused
+-        common_cflags="-O2 -fno-strict-aliasing -fwrapv -mms-bitfields"
++        common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv -mms-bitfields"
+         internal_cppflags='-D__USE_MINGW_ANSI_STDIO=0 -DUNICODE -D_UNICODE'
+         internal_cppflags="$internal_cppflags -DWINDOWS_UNICODE="
+         internal_cppflags="${internal_cppflags}\$(WINDOWS_UNICODE)" ;; #(
diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild
index 1f0ea4e709..a882b4e60b 100644
--- a/development/ocaml/ocaml.SlackBuild
+++ b/development/ocaml/ocaml.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ocaml
 
 # Copyright 2007-2014 Ferenc Deak <ferenc.deak@gmail.com>
 # Copyright 2014 Markus Hutmacher <mailing@markhu.de>
+# Copyright 2016-2022 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220415 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions, remove useless INSTALL doc.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ocaml
-VERSION=${VERSION:-4.03.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-4.13.1}
+MANVER=${MANVER:-4.13}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -57,6 +69,11 @@ fi
 
 set -e
 
+fixperms() {
+  find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+          \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,37 +81,33 @@ rm -rf $PRGNAM-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+fixperms
 
-patch < $CWD/configure.patch
+sed "s|@CFLAGS@|$SLKCFLAGS|" $CWD/configure.patch | patch -p1
 
-CFLAGS="$SLKCFLAGS" ./configure \
+./configure \
   --prefix /usr \
   --libdir /usr/lib${LIBDIRSUFFIX}/ocaml \
-  --host $ARCH-slackware-linux
+  --mandir /usr/man \
+  --disable-force-safe-string
 
-make -j1 world.opt
-make -j1 install \
-  PREFIX=$PKG/usr \
-  LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}/ocaml
+make world.opt
+make DESTDIR=$PKG install
+gzip -9 $PKG/usr/man/man*/*
 
 find $PKG | xargs 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 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes INSTALL* LICENSE README* VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-tar -xvf $CWD/ocaml-4.03-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Changes LICENSE README* VERSION $PKGDOC
+cd $PKGDOC
+tar -xvf $CWD/ocaml-$MANVER-refman-html.tar.gz --no-same-owner
+fixperms
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/development/ocaml/ocaml.info b/development/ocaml/ocaml.info
index 620db74149..f627a9f78f 100644
--- a/development/ocaml/ocaml.info
+++ b/development/ocaml/ocaml.info
@@ -1,12 +1,12 @@
 PRGNAM="ocaml"
-VERSION="4.03.0"
+VERSION="4.13.1"
 HOMEPAGE="http://caml.inria.fr"
-DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03.0.tar.xz \
-          http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman-html.tar.gz"
-MD5SUM="89f62881e03dfad0cf04991fbc03f955 \
-        d3e44d3984d029d2e88ba219ad8e24c2"
+DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.1.tar.xz \
+          http://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13-refman-html.tar.gz"
+MD5SUM="52f91ba31fbfad426bf57b00ef3a34c1 \
+        513fcf9adc3a85268aa42f0552d8e971"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Hutmacher"
-EMAIL="mailing@markhu.de"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"