[pkgsrc/trunk]: pkgsrc/databases/ocaml-mysql Updated databases/ocaml-mysql to...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/513878d6dd1e
branches:  trunk
changeset: 378515:513878d6dd1e
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed May 04 12:55:21 2022 +0000

description:
Updated databases/ocaml-mysql to version 1.2.4.

This adds support for mariadb, and fixes some minor bugs.

diffstat:

 databases/ocaml-mysql/Makefile                    |  11 +++--
 databases/ocaml-mysql/PLIST                       |  11 +++--
 databases/ocaml-mysql/distinfo                    |   9 ++--
 databases/ocaml-mysql/patches/patch-mysql_stubs.c |  40 -----------------------
 4 files changed, 16 insertions(+), 55 deletions(-)

diffs (123 lines):

diff -r 53f965f9588a -r 513878d6dd1e databases/ocaml-mysql/Makefile
--- a/databases/ocaml-mysql/Makefile    Wed May 04 12:39:37 2022 +0000
+++ b/databases/ocaml-mysql/Makefile    Wed May 04 12:55:21 2022 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.31 2021/06/23 20:33:08 nia Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/04 12:55:21 jaapb Exp $
 #
 
-VERSION=       1.2.0
+VERSION=       1.2.4
 GITHUB_PROJECT=        ocaml-mysql
 GITHUB_TAG=    v${VERSION}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   9
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ygrek/}
 
 MAINTAINER=            jaapb%NetBSD.org@localhost
-HOMEPAGE=              http://ocaml-mysql.forge.ocamlcore.org/
+HOMEPAGE=              https://github.com/ygrek/ocaml-mysql
 COMMENT=               Ocaml library for MySQL database access
 LICENSE=               gnu-lgpl-v2.1
 
@@ -20,7 +19,9 @@
 
 DOCDIR=                        ${PREFIX}/share/doc/ocaml-mysql
 INSTALLATION_DIRS=     ${DOCDIR}
-
+MAKE_JOBS_SAFE=                no
+# parallelism here leads to errors and there's not much that can be done
+# in parallel anyway
 OCAML_USE_FINDLIB=     yes
 
 .include "../../mk/ocaml.mk"
diff -r 53f965f9588a -r 513878d6dd1e databases/ocaml-mysql/PLIST
--- a/databases/ocaml-mysql/PLIST       Wed May 04 12:39:37 2022 +0000
+++ b/databases/ocaml-mysql/PLIST       Wed May 04 12:55:21 2022 +0000
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/09 19:44:07 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/05/04 12:55:21 jaapb Exp $
 ${OCAML_SITELIB}/mysql/META
 ${OCAML_SITELIB}/mysql/dllmysql_stubs.so
-${OCAML_SITELIB}/mysql/libmysql_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/libmysql_stubs.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.a
 ${OCAML_SITELIB}/mysql/mysql.cma
+${OCAML_SITELIB}/mysql/mysql.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.cmxa
-${OCAML_SITELIB}/mysql/mysql.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.cmxs
 ${OCAML_SITELIB}/mysql/mysql.mli
+share/doc/ocaml-mysql/Mysql.Prepared.html
 share/doc/ocaml-mysql/Mysql.html
-share/doc/ocaml-mysql/Mysql.Prepared.html
 share/doc/ocaml-mysql/index.html
 share/doc/ocaml-mysql/index_attributes.html
 share/doc/ocaml-mysql/index_class_types.html
@@ -21,5 +22,5 @@
 share/doc/ocaml-mysql/index_modules.html
 share/doc/ocaml-mysql/index_types.html
 share/doc/ocaml-mysql/index_values.html
+share/doc/ocaml-mysql/type_Mysql.Prepared.html
 share/doc/ocaml-mysql/type_Mysql.html
-share/doc/ocaml-mysql/type_Mysql.Prepared.html
diff -r 53f965f9588a -r 513878d6dd1e databases/ocaml-mysql/distinfo
--- a/databases/ocaml-mysql/distinfo    Wed May 04 12:39:37 2022 +0000
+++ b/databases/ocaml-mysql/distinfo    Wed May 04 12:55:21 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:09:26 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/05/04 12:55:21 jaapb Exp $
 
-BLAKE2s (ocaml-mysql-1.2.0.tar.gz) = fa999a0c3598e2093cf8bfa9d3698ebaae925c2fdff9f4290b9a905f570ea01b
-SHA512 (ocaml-mysql-1.2.0.tar.gz) = a84574339f69ee27d208bfd264213dee7dc2782b56f21b6f18a6440a62b1bf1de7d62a072d32a899a7714d91b81c7816c1761752cf45afa62667eacfea7287f2
-Size (ocaml-mysql-1.2.0.tar.gz) = 99236 bytes
-SHA1 (patch-mysql_stubs.c) = df767db9dddf12efb7f2fe558d563ebe920a92d0
+BLAKE2s (ocaml-mysql-1.2.4.tar.gz) = 0c580f4786637d3c4160487a9c4cdc2f90dea29803310d51fc856d1419f01e3f
+SHA512 (ocaml-mysql-1.2.4.tar.gz) = c864c6e4123a4e2ec439aafe075a2bbb3a0797863a934da35a21b92465619c7e5f58d09525c8d6944a6e6712ed2f57eef94280fbb642c7436b03356dd2f797f3
+Size (ocaml-mysql-1.2.4.tar.gz) = 99473 bytes
diff -r 53f965f9588a -r 513878d6dd1e databases/ocaml-mysql/patches/patch-mysql_stubs.c
--- a/databases/ocaml-mysql/patches/patch-mysql_stubs.c Wed May 04 12:39:37 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-mysql_stubs.c,v 1.1 2016/07/02 09:42:14 jaapb Exp $
-
-Use C99 int64_t (patch from upstream)
---- mysql_stubs.c.orig 2015-03-10 02:55:27.000000000 +0000
-+++ mysql_stubs.c
-@@ -507,15 +507,15 @@ db_fetch (value result)
- }
- 
- EXTERNAL value
--db_to_row(value result, value offset) {
--  int64 off = Int64_val(offset);
-+db_to_row(value result, value offset){
-+  int64_t off = Int64_val(offset);
-   MYSQL_RES *res;
- 
-   res = RESval(result);
-   if (!res) 
-     mysqlfailwith("Mysql.to_row: result did not return fetchable data");
- 
--  if (off < 0 || off > (int64)mysql_num_rows(res)-1)
-+  if (off < 0 || off > (int64_t)mysql_num_rows(res)-1)
-     invalid_argument("Mysql.to_row: offset out of range");
- 
-   mysql_data_seek(res, off);
-@@ -640,13 +640,13 @@ db_size(value result)
- {
-   CAMLparam1(result);
-   MYSQL_RES *res;
--  int64 size;
-+  int64_t size;
- 
-   res = RESval(result);
-   if (!res)
-     size = 0;
-   else
--    size = (int64)(mysql_num_rows(res));
-+    size = (int64_t)(mysql_num_rows(res));
-   
-   CAMLreturn(copy_int64(size));
- }