Updated version to 1.1.1. Changes:

* Sat May 19 2012 (1.1.1)
  * Support build with ocaml/msvc and ocaml/mingw (Dmitry Grebeniuk)
  * Update build tools (Dmitry Grebeniuk)
  * OCaml 3.12 compatibility
  * Mysql.Prepared: documentation comments
  * Mysql.Prepared.result_metadata (Hezekiah M. Carty)
  * Mysql.quick_connect: optional unix socket path
  * Mysql.quick_connect: optional connection options

* Sat Dec 26 2009 (1.1.0)
  * Project moved to http://ocaml-mysql.forge.ocamlcore.org
  * Fix crash bugs (mainly in GC & threads interaction)
  * Trigger GC less often (Mysql.connect and Mysql.execute)
  * Mysql.real_escape (Debian patch)
  * Mysql.set_charset
  * Preliminary support for prepared statements (Mysql.Prepared)

Changes to the package: changed maintainer from pkgsrc-users to myself;
incorporated upstream move to other address; added license; added native code
build.

4 files changed, 41 insertions, 17 deletions

diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
index 6c23e7b7a3d..3b2718d6d08 100644
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2011/12/06 00:19:22 sbd Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/16 20:12:08 jaapb Exp $
 #
 
-DISTNAME=		ocaml-mysql-1.0.4
-PKGREVISION=		3
+DISTNAME=		ocaml-mysql-1.1.1
 CATEGORIES=		databases
-MASTER_SITES=		http://raevnos.pennmush.org/code/ocaml-mysql/
+MASTER_SITES=		http://forge.ocamlcore.org/frs/download.php/870/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://raevnos.pennmush.org/code/ocaml-mysql/
+MAINTAINER=		jaapb@NetBSD.org
+HOMEPAGE=		http://ocaml-mysql.forge.ocamlcore.org/
 COMMENT=		Ocaml library for MySQL database access
+LICENSE=		gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
@@ -21,9 +19,19 @@ USE_TOOLS+=		gmake
 DOCDIR=			${PREFIX}/share/doc/ocaml-mysql
 INSTALLATION_DIRS=	${DOCDIR}
 
+BUILD_TARGET=	all doc
+PLIST_VARS=	opt
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
+    (${MACHINE_ARCH} == "arm")
+BUILD_TARGET+=	opt
+PLIST.opt=	yes
+.endif
+
 post-install:
-	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC}/doc/mysql/html && ${INSTALL_DATA} *.html ${DESTDIR}${DOCDIR}
 
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../databases/mysql5-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ocaml-mysql/PLIST b/databases/ocaml-mysql/PLIST
index 0f4d2a5a755..879a3759e75 100644
--- a/databases/ocaml-mysql/PLIST
+++ b/databases/ocaml-mysql/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:19 joerg Exp $
+@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
 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
@@ -17,3 +21,4 @@ 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.html
+share/doc/ocaml-mysql/type_Mysql.Prepared.html
diff --git a/databases/ocaml-mysql/distinfo b/databases/ocaml-mysql/distinfo
index fed6757e3b4..1d689346011 100644
--- a/databases/ocaml-mysql/distinfo
+++ b/databases/ocaml-mysql/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2010/02/19 22:22:22 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/09/16 20:12:08 jaapb Exp $
 
-SHA1 (ocaml-mysql-1.0.4.tar.gz) = e8b7c2d84eee9ae798cd5dcd3ba68fc64c321f9b
-RMD160 (ocaml-mysql-1.0.4.tar.gz) = 57b316fdbdd26762916859d04ab0ca15c1365203
-Size (ocaml-mysql-1.0.4.tar.gz) = 119584 bytes
-SHA1 (patch-aa) = b06f338db5887f5656d8d50b6fcfdd4bf2d920e0
-SHA1 (patch-ab) = 4b7768554ec4fe8a01578bc4c63ae52e6fc208d4
-SHA1 (patch-ac) = d7ba178ed64212361f79ce84b9196124f32108fa
+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 (patch-Makefile.in) = 3784060797930543d27612ba97f89db90685c6ba
diff --git a/databases/ocaml-mysql/patches/patch-Makefile.in b/databases/ocaml-mysql/patches/patch-Makefile.in
new file mode 100644
index 00000000000..1d8912ebf45
--- /dev/null
+++ b/databases/ocaml-mysql/patches/patch-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/09/16 20:12:09 jaapb Exp $
+
+Update installation procedure to support DESTDIR
+--- Makefile.in.orig	2012-05-19 18:13:37.000000000 +0000
++++ Makefile.in
+@@ -5,6 +5,7 @@ RESULT=mysql
+ VERSION=@VERSION@
+ 
+ LIBINSTALL_FILES=$(wildcard *.mli *.cmi *.cma *.cmx *.cmxa *.a *.so)
++OCAMLFIND_INSTFLAGS=-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib -ldconf /var/null
+ 
+ CFLAGS=@CFLAGS@ -Wall -Wextra
+ CLIBS=$(foreach lib, @LIBS@, $(subst -l,,${lib}))