Updated package to latest version, 1.2.0; updated package to work with

ocaml.mk framework and added patch to support int64 properly (patch from
upstream). Changes include:

* Tue Mar 10 2015 (1.2.0)
  * Get rid of Camlp4 dependency
  * Use mysql_config in configure

* Thu Oct 16 2014 (1.1.3)
  * + OPT_FOUND_ROWS (Dmitry Grebeniuk)
  * configure: build with percona

3 files changed, 54 insertions, 11 deletions

diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
index b66646b6aae..281720c241d 100644
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2016/07/02 09:42:14 jaapb Exp $
 #
 
-DISTNAME=		ocaml-mysql-1.1.2
-PKGREVISION=	2
+VERSION=	1.2.0
+GITHUB_PROJECT=	ocaml-mysql
+GITHUB_TAG=	v${VERSION}
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=		databases
-MASTER_SITES=		http://forge.ocamlcore.org/frs/download.php/1308/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=ygrek/}
 
 MAINTAINER=		jaapb@NetBSD.org
 HOMEPAGE=		http://ocaml-mysql.forge.ocamlcore.org/
@@ -18,6 +20,8 @@ USE_TOOLS+=		gmake
 DOCDIR=			${PREFIX}/share/doc/ocaml-mysql
 INSTALLATION_DIRS=	${DOCDIR}
 
+OCAML_USE_FINDLIB=	yes
+
 .include "../../mk/ocaml.mk"
 
 BUILD_TARGET=	all htdoc
@@ -28,7 +32,5 @@ BUILD_TARGET+=	opt
 post-install:
 	cd ${WRKSRC}/doc/mysql/html && ${INSTALL_DATA} *.html ${DESTDIR}${DOCDIR}
 
-.include "../../devel/ocaml-findlib/buildlink3.mk"
-.include "../../lang/camlp4/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ocaml-mysql/distinfo b/databases/ocaml-mysql/distinfo
index 7806d33f3c9..06d26ec52f4 100644
--- a/databases/ocaml-mysql/distinfo
+++ b/databases/ocaml-mysql/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:56:16 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/07/02 09:42:14 jaapb Exp $
 
-SHA1 (ocaml-mysql-1.1.2.tar.gz) = 17e228ab1063e1feca637de4fe45234adab619aa
-RMD160 (ocaml-mysql-1.1.2.tar.gz) = e36d0d29ce88351694f67d2444c990293a462434
-SHA512 (ocaml-mysql-1.1.2.tar.gz) = 8144e2519d250dcc9d6c533db36a57924c77b93d8eae200dd9c9f8c447c8fa3325cca4b0f0c78f4a5b8ece9d76c02dee41f7d9458ebef8c3b8bcf8cfc322de2b
-Size (ocaml-mysql-1.1.2.tar.gz) = 120030 bytes
+SHA1 (ocaml-mysql-1.2.0.tar.gz) = 4f6060513a00dafc2d635140198a7b5c3defabec
+RMD160 (ocaml-mysql-1.2.0.tar.gz) = 31bb16185eea4e3c7be7ed951dec74e38dc0f9cb
+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
diff --git a/databases/ocaml-mysql/patches/patch-mysql_stubs.c b/databases/ocaml-mysql/patches/patch-mysql_stubs.c
new file mode 100644
index 00000000000..7067ad50f3a
--- /dev/null
+++ b/databases/ocaml-mysql/patches/patch-mysql_stubs.c
@@ -0,0 +1,40 @@
+$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));
+ }