diff --git a/databases/ocaml-postgresql/Makefile b/databases/ocaml-postgresql/Makefile
index d81d89d735f..e60ebbed6e0 100644
--- a/databases/ocaml-postgresql/Makefile
+++ b/databases/ocaml-postgresql/Makefile
@@ -1,18 +1,16 @@
-# $OpenBSD: Makefile,v 1.19 2011/09/16 08:48:03 espie Exp $
-
-BROKEN-hppa=		ocamldoc hangs build
+# $OpenBSD: Makefile,v 1.20 2012/08/18 21:55:07 avsm Exp $
 
 COMMENT=	Objective Caml bindings for PostgreSQL
 CATEGORIES=	databases
 
-V=		1.4.6
+V=		2.0.2
+NAME =		ocaml-postgresql
 DISTNAME=	postgresql-ocaml-${V}
-PKGNAME=	ocaml-postgresql-${V}
-REVISION=	5
-MASTER_SITES=	http://ocaml.info/ocaml_sources/
+PKGNAME=	${NAME}-${V}
+MASTER_SITES=	https://bitbucket.org/mmottl/postgresql-ocaml/downloads/
 
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
-HOMEPAGE=	http://ocaml.info/home/ocaml_sources.html\#toc9
+HOMEPAGE=	https://bitbucket.org/mmottl/postgresql-ocaml/
 
 # LGPL
 PERMIT_PACKAGE_FTP=	Yes
@@ -21,29 +19,17 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
 MODULES=	lang/ocaml
-NO_REGRESS= 	Yes
-ALL_TARGET=	all ${MODOCAML_NATIVE:S,Yes,allopt,:S,No,,}
-USE_GMAKE=	Yes
 
-BUILD_DEPENDS=	databases/postgresql
-RUN_DEPENDS=	databases/postgresql
-MY_CFLAGS=	${CFLAGS} -I${LOCALBASE}/include/postgresql
-MY_LIBDIRS=	${LOCALBASE]/lib
-EXAMPLES_DIR=	${PREFIX}/share/examples/ocaml-postgresql
-MAKE_ENV=	MY_CFLAGS="${MY_CFLAGS}" MY_LIBDIRS="${MY_LIBDIRS}"
-PGOCAMLDIR=	${PREFIX}/lib/ocaml/postgresql
+WANTLIB =	pq
+BUILD_DEPENDS =	sysutils/findlib
+LIB_DEPENDS=	databases/postgresql
 
-BYTECODE_FILES=	postgresql.cma postgresql.cmi postgresql.mli libpostgresql_stubs.a
-NATIVE_FILES=	postgresql.a postgresql.cmxa
-INST_FILES=	${BYTECODE_FILES} ${MODOCAML_NATIVE:S,Yes,${NATIVE_FILES},:S,No,,}
+CONFIGURE_STYLE =	oasis
 
-do-install:
-	${INSTALL_DATA_DIR} ${PGOCAMLDIR}
-	for i in ${INST_FILES}; do ${INSTALL_DATA} ${WRKBUILD}/lib/$$i ${PGOCAMLDIR}; done
-	${INSTALL_DATA_DIR} ${EXAMPLES_DIR}
-	@cp -R ${WRKSRC}/examples/* ${EXAMPLES_DIR}
-	@echo INCDIRS = ${LOCALBASE}/lib/ocaml/postgresql >> ${EXAMPLES_DIR}/OCamlMakefile
-	@echo LIBDIRS = ${LOCALBASE}/lib >> ${EXAMPLES_DIR}/OCamlMakefile
-	@cat ${WRKSRC}/OCamlMakefile >> ${EXAMPLES_DIR}/OCamlMakefile
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${NAME}
+	${INSTALL_DATA} \
+		${FILESDIR}/README ${WRKDIST}/examples/* \
+		${PREFIX}/share/examples/${NAME}/
 
 .include <bsd.port.mk>
diff --git a/databases/ocaml-postgresql/distinfo b/databases/ocaml-postgresql/distinfo
index 6a848dcab80..552f5bfdbb4 100644
--- a/databases/ocaml-postgresql/distinfo
+++ b/databases/ocaml-postgresql/distinfo
@@ -1,5 +1,2 @@
-MD5 (postgresql-ocaml-1.4.6.tar.gz) = kdVgPcI7GKYNpnaYAF/Vrg==
-RMD160 (postgresql-ocaml-1.4.6.tar.gz) = ANs5dgpzDiqOsi0siipamJOLG4M=
-SHA1 (postgresql-ocaml-1.4.6.tar.gz) = s3/nMJ/KtbykxIroxqWtETTEeqU=
-SHA256 (postgresql-ocaml-1.4.6.tar.gz) = +/lZ4ZIbhIt7ch1aVnTiY+hRkt0HvLK5FsUIzv+vkyE=
-SIZE (postgresql-ocaml-1.4.6.tar.gz) = 37359
+SHA256 (postgresql-ocaml-2.0.2.tar.gz) = uQB+Ry3Sg2qdBEyglUa9O/yR4zEgTZm1XaJh9fD6xo8=
+SIZE (postgresql-ocaml-2.0.2.tar.gz) = 75698
diff --git a/databases/ocaml-postgresql/files/README b/databases/ocaml-postgresql/files/README
new file mode 100644
index 00000000000..cb52d86683e
--- /dev/null
+++ b/databases/ocaml-postgresql/files/README
@@ -0,0 +1,4 @@
+To build the examles use
+ocamlfind ocamlc -thread -linkpkg -package postgresql XXX.ml
+
+prompt_gtk.ml will need -package lablgtk,postgresql
diff --git a/databases/ocaml-postgresql/patches/patch-Makefile b/databases/ocaml-postgresql/patches/patch-Makefile
deleted file mode 100644
index 4a1bc8c1642..00000000000
--- a/databases/ocaml-postgresql/patches/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2004/06/12 22:03:12 avsm Exp $
---- Makefile.orig	2004-06-12 11:19:59.000000000 +0100
-+++ Makefile	2004-06-12 11:20:28.000000000 +0100
-@@ -2,9 +2,12 @@
- 
- EXAMPLES = $(filter-out examples/CVS, $(wildcard examples/*))
- 
--.PHONY: all
-+.PHONY: all allopt
- all:
--	@cd lib && $(MAKE) byte-code-library native-code-library
-+	@cd lib && $(MAKE) byte-code-library
-+
-+allopt:
-+	@cd lib && $(MAKE) native-code-library
- 
- .PHONY:	examples
- examples:
diff --git a/databases/ocaml-postgresql/patches/patch-examples_cursor_Makefile b/databases/ocaml-postgresql/patches/patch-examples_cursor_Makefile
deleted file mode 100644
index d4792bf1ae8..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_cursor_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_cursor_Makefile,v 1.1 2005/05/09 13:51:35 avsm Exp $
---- examples/cursor/Makefile.orig	Sat Apr 23 16:35:37 2005
-+++ examples/cursor/Makefile	Sat Apr 23 16:35:42 2005
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = cursor.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- RESULT  = cursor
- 
diff --git a/databases/ocaml-postgresql/patches/patch-examples_dump_Makefile b/databases/ocaml-postgresql/patches/patch-examples_dump_Makefile
deleted file mode 100644
index 5cf26708ef2..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_dump_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_dump_Makefile,v 1.2 2004/07/23 14:15:04 avsm Exp $
---- examples/dump/Makefile.orig	Wed Jan 28 17:14:59 2004
-+++ examples/dump/Makefile	Fri Jul 23 15:56:07 2004
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = dump.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- RESULT  = dump
- 
diff --git a/databases/ocaml-postgresql/patches/patch-examples_populate_Makefile b/databases/ocaml-postgresql/patches/patch-examples_populate_Makefile
deleted file mode 100644
index d51fd2a04c7..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_populate_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_populate_Makefile,v 1.1.1.1 2004/06/12 22:03:12 avsm Exp $
---- examples/populate/Makefile.orig	2004-06-12 19:14:09.000000000 +0100
-+++ examples/populate/Makefile	2004-06-12 19:14:20.000000000 +0100
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = populate.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- RESULT  = populate
- 
diff --git a/databases/ocaml-postgresql/patches/patch-examples_prompt_Makefile b/databases/ocaml-postgresql/patches/patch-examples_prompt_Makefile
deleted file mode 100644
index 60878ac28cd..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_prompt_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_prompt_Makefile,v 1.1.1.1 2004/06/12 22:03:12 avsm Exp $
---- examples/prompt/Makefile.orig	2004-06-12 19:14:26.000000000 +0100
-+++ examples/prompt/Makefile	2004-06-12 19:14:34.000000000 +0100
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = prompt.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- THREADS = yes
- RESULT  = prompt
diff --git a/databases/ocaml-postgresql/patches/patch-examples_prompt_gtk_Makefile b/databases/ocaml-postgresql/patches/patch-examples_prompt_gtk_Makefile
deleted file mode 100644
index 83c6bae5732..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_prompt_gtk_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_prompt_gtk_Makefile,v 1.1.1.1 2004/06/12 22:03:12 avsm Exp $
---- examples/prompt_gtk/Makefile.orig	2004-06-12 19:14:41.000000000 +0100
-+++ examples/prompt_gtk/Makefile	2004-06-12 19:14:55.000000000 +0100
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = prompt_gtk.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- PACKS   = lablgtk
- OCAMLBLDFLAGS = gtkInit.cmo
diff --git a/databases/ocaml-postgresql/patches/patch-examples_test_lo_Makefile b/databases/ocaml-postgresql/patches/patch-examples_test_lo_Makefile
deleted file mode 100644
index c3e5e012db9..00000000000
--- a/databases/ocaml-postgresql/patches/patch-examples_test_lo_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-examples_test_lo_Makefile,v 1.1.1.1 2004/06/12 22:03:12 avsm Exp $
---- examples/test_lo/Makefile.orig	2004-06-12 19:15:00.000000000 +0100
-+++ examples/test_lo/Makefile	2004-06-12 19:15:06.000000000 +0100
-@@ -1,8 +1,6 @@
--OCAMLMAKEFILE = ../../OCamlMakefile
-+OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = test_lo.ml
--INCDIRS = ../../lib
--LIBDIRS = ../../lib
- LIBS    = postgresql
- RESULT  = test_lo
- 
diff --git a/databases/ocaml-postgresql/patches/patch-lib_Makefile b/databases/ocaml-postgresql/patches/patch-lib_Makefile
deleted file mode 100644
index c8335fdc6d4..00000000000
--- a/databases/ocaml-postgresql/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_Makefile,v 1.2 2005/09/22 13:10:47 avsm Exp $
---- lib/Makefile.orig	Tue May 31 17:00:47 2005
-+++ lib/Makefile	Thu Sep 22 13:46:59 2005
-@@ -1,7 +1,10 @@
- OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES = postgresql.mli postgresql.ml postgresql_stubs.c
--CFLAGS  = -O2
-+CFLAGS  = ${MY_CFLAGS}
-+LIBDIRS = ${MY_LIBDIRS}
-+INSTDIR = ${MY_INSTDIR}
-+STATIC  = Yes
- CLIBS   = pq
- RESULT  = postgresql
- 
diff --git a/databases/ocaml-postgresql/pkg/PFRAG.dynlink-native b/databases/ocaml-postgresql/pkg/PFRAG.dynlink-native
new file mode 100644
index 00000000000..cebc1ab3ea7
--- /dev/null
+++ b/databases/ocaml-postgresql/pkg/PFRAG.dynlink-native
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.1 2012/08/18 21:55:08 avsm Exp $
+@bin lib/ocaml/postgresql/postgresql.cmxs
diff --git a/databases/ocaml-postgresql/pkg/PFRAG.native b/databases/ocaml-postgresql/pkg/PFRAG.native
index 77868dfff36..6ba5000969c 100644
--- a/databases/ocaml-postgresql/pkg/PFRAG.native
+++ b/databases/ocaml-postgresql/pkg/PFRAG.native
@@ -1,3 +1,5 @@
-@comment $OpenBSD: PFRAG.native,v 1.2 2004/07/23 14:15:04 avsm Exp $
+@comment $OpenBSD: PFRAG.native,v 1.3 2012/08/18 21:55:08 avsm Exp $
 lib/ocaml/postgresql/postgresql.a
+lib/ocaml/postgresql/postgresql.cmx
 lib/ocaml/postgresql/postgresql.cmxa
+%%dynlink%%
diff --git a/databases/ocaml-postgresql/pkg/PFRAG.shared b/databases/ocaml-postgresql/pkg/PFRAG.shared
new file mode 100644
index 00000000000..66e3d61f633
--- /dev/null
+++ b/databases/ocaml-postgresql/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2012/08/18 21:55:08 avsm Exp $
+lib/ocaml/stublibs/dllpostgresql_stubs.so
diff --git a/databases/ocaml-postgresql/pkg/PLIST b/databases/ocaml-postgresql/pkg/PLIST
index 36500402071..47ff8ebee9e 100644
--- a/databases/ocaml-postgresql/pkg/PLIST
+++ b/databases/ocaml-postgresql/pkg/PLIST
@@ -1,34 +1,40 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/03/15 11:45:08 ajacoutot Exp $
-lib/ocaml/
+@comment $OpenBSD: PLIST,v 1.6 2012/08/18 21:55:08 avsm Exp $
 lib/ocaml/postgresql/
+lib/ocaml/postgresql/META
 lib/ocaml/postgresql/libpostgresql_stubs.a
 lib/ocaml/postgresql/postgresql.cma
 lib/ocaml/postgresql/postgresql.cmi
 lib/ocaml/postgresql/postgresql.mli
-share/examples/ocaml-postgresql/
-share/examples/ocaml-postgresql/OCamlMakefile
-share/examples/ocaml-postgresql/cursor/
-share/examples/ocaml-postgresql/cursor/Makefile
-@comment share/examples/ocaml-postgresql/cursor/Makefile.orig
-share/examples/ocaml-postgresql/cursor/cursor.ml
-share/examples/ocaml-postgresql/dump/
-share/examples/ocaml-postgresql/dump/Makefile
-@comment share/examples/ocaml-postgresql/dump/Makefile.orig
-share/examples/ocaml-postgresql/dump/dump.ml
-share/examples/ocaml-postgresql/populate/
-share/examples/ocaml-postgresql/populate/Makefile
-@comment share/examples/ocaml-postgresql/populate/Makefile.orig
-share/examples/ocaml-postgresql/populate/populate.ml
-share/examples/ocaml-postgresql/prompt/
-share/examples/ocaml-postgresql/prompt/Makefile
-@comment share/examples/ocaml-postgresql/prompt/Makefile.orig
-share/examples/ocaml-postgresql/prompt/prompt.ml
-share/examples/ocaml-postgresql/prompt_gtk/
-share/examples/ocaml-postgresql/prompt_gtk/Makefile
-@comment share/examples/ocaml-postgresql/prompt_gtk/Makefile.orig
-share/examples/ocaml-postgresql/prompt_gtk/prompt_gtk.ml
-share/examples/ocaml-postgresql/test_lo/
-share/examples/ocaml-postgresql/test_lo/Makefile
-@comment share/examples/ocaml-postgresql/test_lo/Makefile.orig
-share/examples/ocaml-postgresql/test_lo/test_lo.ml
 %%native%%
+%%SHARED%%
+@comment lib/ocaml/stublibs/
+@comment lib/ocaml/stublibs/dllpostgresql_stubs.so.owner
+share/doc/ocaml-postgresql/
+share/doc/ocaml-postgresql/api/
+share/doc/ocaml-postgresql/api/Postgresql.FFormat.html
+share/doc/ocaml-postgresql/api/Postgresql.connection-c.html
+share/doc/ocaml-postgresql/api/Postgresql.html
+share/doc/ocaml-postgresql/api/Postgresql.result-c.html
+share/doc/ocaml-postgresql/api/index.html
+share/doc/ocaml-postgresql/api/index_attributes.html
+share/doc/ocaml-postgresql/api/index_class_types.html
+share/doc/ocaml-postgresql/api/index_classes.html
+share/doc/ocaml-postgresql/api/index_exceptions.html
+share/doc/ocaml-postgresql/api/index_methods.html
+share/doc/ocaml-postgresql/api/index_module_types.html
+share/doc/ocaml-postgresql/api/index_modules.html
+share/doc/ocaml-postgresql/api/index_types.html
+share/doc/ocaml-postgresql/api/index_values.html
+share/doc/ocaml-postgresql/api/style.css
+share/doc/ocaml-postgresql/api/type_Postgresql.FFormat.html
+share/doc/ocaml-postgresql/api/type_Postgresql.connection.html
+share/doc/ocaml-postgresql/api/type_Postgresql.html
+share/doc/ocaml-postgresql/api/type_Postgresql.result.html
+share/examples/ocaml-postgresql/
+share/examples/ocaml-postgresql/README
+share/examples/ocaml-postgresql/cursor.ml
+share/examples/ocaml-postgresql/dump.ml
+share/examples/ocaml-postgresql/populate.ml
+share/examples/ocaml-postgresql/prompt.ml
+share/examples/ocaml-postgresql/prompt_gtk.ml
+share/examples/ocaml-postgresql/test_lo.ml