git: 3d0558066c27 - main - math/ocaml-zarith: update the version 1.12, take maintainership.

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3d0558066c272d47a90914f45962e02d62117848

commit 3d0558066c272d47a90914f45962e02d62117848
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-01 14:12:12 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-01 14:12:17 +0000

    math/ocaml-zarith: update the version 1.12, take maintainership.
---
 math/ocaml-zarith/Makefile              | 15 +++++++------
 math/ocaml-zarith/distinfo              |  6 +++---
 math/ocaml-zarith/files/patch-configure | 38 ++++++---------------------------
 math/ocaml-zarith/pkg-plist             |  7 ++++++
 4 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile
index 8b5a59046940..90e0cf4cc9ce 100644
--- a/math/ocaml-zarith/Makefile
+++ b/math/ocaml-zarith/Makefile
@@ -1,12 +1,12 @@
 # Created by: John Marino <marino at FreeBSD.org>
 
-PORTNAME=	zarith
-PORTVERSION=	1.4.1
+PORTNAME=	${GH_PROJECT:tl}
+PORTVERSION=	1.12
+DISTVERSIONPREFIX=	release-
 CATEGORIES=	math
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1574/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	OCaml arithmetic library for arbitrary precision integers
 
 LICENSE=	LGPL20
@@ -14,14 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		gmake localbase:ldflags perl5 shebangfix tar:tgz
-USE_PERL5=	build
+USES=		gmake localbase:ldflags tar:tgz
+USE_GITHUB=	yes
+GH_ACCOUNT=	ocaml
+GH_PROJECT=	Zarith
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 OCAMLFIND_LDCONF=	/dev/null
 HAS_CONFIGURE=	yes
 ALL_TARGET=	all
-SHEBANG_FILES=	z_pp.pl
 CONFIGURE_ENV=	DESTDIR=${STAGEDIR}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/math/ocaml-zarith/distinfo b/math/ocaml-zarith/distinfo
index dabb05e4146f..3e2235e7d2c6 100644
--- a/math/ocaml-zarith/distinfo
+++ b/math/ocaml-zarith/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493371663
-SHA256 (zarith-1.4.1.tgz) = 23b6c140aad25385bb0b862b9b9fe8a5c6e6f608d0fac7a688aaede5ea876650
-SIZE (zarith-1.4.1.tgz) = 88831
+TIMESTAMP = 1614762000
+SHA256 (ocaml-Zarith-release-1.12_GH0.tar.gz) = cc32563c3845c86d0f609c86d83bf8607ef12354863d31d3bffc0dacf1ed2881
+SIZE (ocaml-Zarith-release-1.12_GH0.tar.gz) = 93695
diff --git a/math/ocaml-zarith/files/patch-configure b/math/ocaml-zarith/files/patch-configure
index b451ff3514d9..6ce8fe8ee40b 100644
--- a/math/ocaml-zarith/files/patch-configure
+++ b/math/ocaml-zarith/files/patch-configure
@@ -1,17 +1,6 @@
---- configure.orig	2013-06-12 07:13:59 UTC
+--- configure.orig	2021-03-03 09:00:00 UTC
 +++ configure
-@@ -127,6 +127,10 @@ searchbin()
- {
-     if test "x$1" = "x"; then return 0; fi
-     echo_n "binary $1: "
-+    if test -x "$1"; then
-+        echo "found"
-+        return 1
-+    fi
-     IFS=':'
-     for i in $PATH
-     do
-@@ -258,7 +262,7 @@ searchbin ocamlfind
+@@ -268,7 +268,7 @@ searchbin ocamlfind
  if test $? -eq 1 -a $ocamlfind != "no"; then 
      instmeth='findlib'
      if test "$installdir" = "auto"
@@ -20,27 +9,12 @@
  else
      searchbin install
      if test $? -eq 1; then instmeth='install'
-@@ -304,6 +308,14 @@ case $host in
-             arch='i686'
-         fi
- 	;;
-+    i386-*freebsd* | i386-*dragonfly*)
-+        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
-+        arch='i686'
-+        ;;
-+    amd64-*freebsd* | x86_64-*dragonfly*)
-+        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
-+        arch='x86_64'
-+        ;;
-     i386-*darwin* | x86_64-*darwin*)
-         ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef"
-         if test "x$wordsize" = "x64"; then
-@@ -401,7 +413,7 @@ CFLAGS=$ccinc $ccdef $ccopt
- ASFLAGS=$ccdef $asopt
+@@ -365,7 +365,7 @@ OCAMLOPTFLAGS=$mloptflags
+ OCAMLINC=$mlinc
+ CFLAGS=$ccinc $ccdef $ccopt
  LIBS=$cclib
- ARCH=$arch
 -INSTALLDIR=$installdir
 +INSTALLDIR=${DESTDIR}$installdir
- AR=$ar
  INSTALL=install
  OCAMLFIND=ocamlfind
+ INSTMETH=$instmeth
diff --git a/math/ocaml-zarith/pkg-plist b/math/ocaml-zarith/pkg-plist
index 518c0b96ef77..844f3cadc7a0 100644
--- a/math/ocaml-zarith/pkg-plist
+++ b/math/ocaml-zarith/pkg-plist
@@ -1,14 +1,21 @@
 %%OCAML_SITELIBDIR%%/zarith/META
 %%OCAML_SITELIBDIR%%/zarith/big_int_Z.cmi
+%%OCAML_SITELIBDIR%%/zarith/big_int_Z.cmti
+%%OCAML_SITELIBDIR%%/zarith/big_int_Z.cmx
 %%OCAML_SITELIBDIR%%/zarith/big_int_Z.mli
 %%OCAML_SITELIBDIR%%/zarith/dllzarith.so
 %%OCAML_SITELIBDIR%%/zarith/libzarith.a
 %%OCAML_SITELIBDIR%%/zarith/q.cmi
+%%OCAML_SITELIBDIR%%/zarith/q.cmti
+%%OCAML_SITELIBDIR%%/zarith/q.cmx
 %%OCAML_SITELIBDIR%%/zarith/q.mli
 %%OCAML_SITELIBDIR%%/zarith/z.cmi
+%%OCAML_SITELIBDIR%%/zarith/z.cmti
+%%OCAML_SITELIBDIR%%/zarith/z.cmx
 %%OCAML_SITELIBDIR%%/zarith/z.mli
 %%OCAML_SITELIBDIR%%/zarith/zarith.a
 %%OCAML_SITELIBDIR%%/zarith/zarith.cma
 %%OCAML_SITELIBDIR%%/zarith/zarith.cmxa
 %%OCAML_SITELIBDIR%%/zarith/zarith.cmxs
 %%OCAML_SITELIBDIR%%/zarith/zarith.h
+%%OCAML_SITELIBDIR%%/zarith/zarith_top.cma