Updated package to newest version, 1.1.2 - now uses ocaml.mk. Changes:

* Mysql.Prepared.execute_null (Gregory Bellier)

3 files changed, 22 insertions, 24 deletions

diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
index 4eb2a5e0206..481a2459a30 100644
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2013/11/01 11:30:21 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2014/10/09 19:44:07 jaapb Exp $
 #
 
-DISTNAME=		ocaml-mysql-1.1.1
-PKGREVISION=		4
+DISTNAME=		ocaml-mysql-1.1.2
+PKGNAME=	${DISTNAME} # to avoid prefixing with ocaml-
 CATEGORIES=		databases
-MASTER_SITES=		http://forge.ocamlcore.org/frs/download.php/870/
+MASTER_SITES=		http://forge.ocamlcore.org/frs/download.php/1308/
 
 MAINTAINER=		jaapb@NetBSD.org
 HOMEPAGE=		http://ocaml-mysql.forge.ocamlcore.org/
@@ -18,19 +18,16 @@ USE_TOOLS+=		gmake
 DOCDIR=			${PREFIX}/share/doc/ocaml-mysql
 INSTALLATION_DIRS=	${DOCDIR}
 
+.include "../../mk/ocaml.mk"
+
 BUILD_TARGET=	all htdoc
-PLIST_VARS=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET+=	opt
-PLIST.opt=	yes
 .endif
 
 post-install:
 	cd ${WRKSRC}/doc/mysql/html && ${INSTALL_DATA} *.html ${DESTDIR}${DOCDIR}
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ocaml-mysql/PLIST b/databases/ocaml-mysql/PLIST
index 879a3759e75..044c5bb921e 100644
--- a/databases/ocaml-mysql/PLIST
+++ b/databases/ocaml-mysql/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2012/09/16 20:12:08 jaapb Exp $
-lib/ocaml/site-lib/mysql/META
-lib/ocaml/site-lib/mysql/dllmysql_stubs.so
-lib/ocaml/site-lib/mysql/libmysql_stubs.a
-lib/ocaml/site-lib/mysql/mysql.a
-lib/ocaml/site-lib/mysql/mysql.cma
-lib/ocaml/site-lib/mysql/mysql.cmx
-lib/ocaml/site-lib/mysql/mysql.cmxa
-lib/ocaml/site-lib/mysql/mysql.cmi
-lib/ocaml/site-lib/mysql/mysql.mli
+@comment $NetBSD: PLIST,v 1.4 2014/10/09 19:44:07 jaapb Exp $
+${OCAML_SITELIB}/mysql/META
+${OCAML_SITELIB}/mysql/dllmysql_stubs.so
+${OCAML_SITELIB}/mysql/libmysql_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.a
+${OCAML_SITELIB}/mysql/mysql.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/mysql/mysql.cmxa
+${OCAML_SITELIB}/mysql/mysql.cmi
+${OCAML_SITELIB}/mysql/mysql.mli
 share/doc/ocaml-mysql/Mysql.html
 share/doc/ocaml-mysql/Mysql.Prepared.html
 share/doc/ocaml-mysql/index.html
@@ -15,6 +15,7 @@ share/doc/ocaml-mysql/index_attributes.html
 share/doc/ocaml-mysql/index_class_types.html
 share/doc/ocaml-mysql/index_classes.html
 share/doc/ocaml-mysql/index_exceptions.html
+share/doc/ocaml-mysql/index_extensions.html
 share/doc/ocaml-mysql/index_methods.html
 share/doc/ocaml-mysql/index_module_types.html
 share/doc/ocaml-mysql/index_modules.html
diff --git a/databases/ocaml-mysql/distinfo b/databases/ocaml-mysql/distinfo
index 661b777b3ab..2a59c29936d 100644
--- a/databases/ocaml-mysql/distinfo
+++ b/databases/ocaml-mysql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2014/04/15 06:47:37 hiramatsu Exp $
+$NetBSD: distinfo,v 1.7 2014/10/09 19:44:07 jaapb Exp $
 
-SHA1 (ocaml-mysql-1.1.1.tar.gz) = 387f43df423287a04ce945c65007737982668019
-RMD160 (ocaml-mysql-1.1.1.tar.gz) = 24f38327f05f57ed06c663a938e7fbdea9ff34a4
-Size (ocaml-mysql-1.1.1.tar.gz) = 119676 bytes
+SHA1 (ocaml-mysql-1.1.2.tar.gz) = 17e228ab1063e1feca637de4fe45234adab619aa
+RMD160 (ocaml-mysql-1.1.2.tar.gz) = e36d0d29ce88351694f67d2444c990293a462434
+Size (ocaml-mysql-1.1.2.tar.gz) = 120030 bytes