8 files changed, 17 insertions, 96 deletions

diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile
index b5884fbb534a..5a253ada4a03 100644
--- a/databases/ocaml-sqlite3/Makefile
+++ b/databases/ocaml-sqlite3/Makefile
@@ -6,55 +6,35 @@
 #
 
 PORTNAME=	sqlite3
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	databases
-MASTER_SITES=	http://metamatix.org/~ocaml/
+MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ocaml-sqlite3-port@kotka.de
+MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml bindings to sqlite3 library
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+USE_SQLITE=		yes
+USE_OCAML=		yes
+USE_OCAML_FINDLIB=	yes
+USE_OCAML_LDCONFIG=	yes
+USE_OCAML_PLIST=	yes
 
-WRKSRC=		${WRKDIR}/ocaml-sqlite3
-
-USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CC="${CC}"\
 		CFLAGS="${CFLAGS}"\
 		CPPFLAGS="-UHAVE_ALLOCA_H -I${PREFIX}/include"\
-		LDFLAGS="-L${PREFIX}/lib"
+		LDFLAGS="-L${PREFIX}/lib"\
+		LIBS="${PTHREAD_LIBS}"
 
 USE_BZIP2=	yes
 
-SUB_FILES=	pkg-install pkg-deinstall
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	README style.css *.html
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == amd64
-BROKEN=		Does not build on amd64
-.endif
-
-do-install:
-	@${ECHO_MSG} "==>  Installing port files for ${PKGORIGIN}..."
-	@( cd ${WRKSRC};\
-	   OCAMLFIND_DESTDIR="${PREFIX}/lib/ocaml/site-lib"\
-	   OCAMLFIND_LDCONF="${PREFIX}/lib/ocaml/ld.conf"\
-	   ocamlfind install\
-		sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma\
-		*.cmxa *.a *.cmx *.so;\
-	   OCAMLPATH="${PREFIX}/lib/ocaml/site-lib"\
-	   ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma;\
-	   ${INSTALL_SCRIPT} sqlite3top ${PREFIX}/bin/ocamlsqlite3 )
+post-install:
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "==>  Installing port documentation for ${PKGORIGIN}..."
 	@${MKDIR} ${DOCSDIR}
 	@( cd ${WRKSRC}; ${INSTALL_DATA} README ${DOCSDIR} )
 	@( cd ${WRKSRC}/doc;\
@@ -63,4 +43,4 @@ do-install:
 	   done )
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/ocaml-sqlite3/distinfo b/databases/ocaml-sqlite3/distinfo
index d2aeefb2b6fd..3adb82374948 100644
--- a/databases/ocaml-sqlite3/distinfo
+++ b/databases/ocaml-sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocaml-sqlite3-0.2.0.tar.bz2) = e1c98f9815f63b50c9868484e17bac97
-SHA256 (ocaml-sqlite3-0.2.0.tar.bz2) = ccdd6c7f7ab60ef6896471bd70a2051f551e028000d26f5ed37757b78f3ad80f
-SIZE (ocaml-sqlite3-0.2.0.tar.bz2) = 41852
+MD5 (ocaml-sqlite3-1.0.3.tar.bz2) = 5492312d1d013500250ddffd339bad28
+SHA256 (ocaml-sqlite3-1.0.3.tar.bz2) = 2e8890fb3cf93675d8746f7631a399f8c1aec08617af7ccedf5ec597bcfb6950
+SIZE (ocaml-sqlite3-1.0.3.tar.bz2) = 44085
diff --git a/databases/ocaml-sqlite3/files/patch-Makefile.in b/databases/ocaml-sqlite3/files/patch-Makefile.in
deleted file mode 100644
index e6c9f81bbb8a..000000000000
--- a/databases/ocaml-sqlite3/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Feb 27 21:11:25 2006
-+++ Makefile.in	Mon Feb 27 21:12:12 2006
-@@ -36,7 +36,7 @@
- install: sqlite3.cma sqlite3.cmxa sqlite3top
- 	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx *.so
- 	ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma
--	$(INSTALL) sqlite3top $(bindir)/sqlite3top
-+	$(INSTALL) sqlite3top $(bindir)/ocamlsqlite3
- 
- remove: uninstall
- uninstall:
diff --git a/databases/ocaml-sqlite3/files/patch-sqlite3_stubs.c b/databases/ocaml-sqlite3/files/patch-sqlite3_stubs.c
deleted file mode 100644
index 4daa6553c2ed..000000000000
--- a/databases/ocaml-sqlite3/files/patch-sqlite3_stubs.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sqlite3_stubs.c.orig	Mon Feb 27 20:51:46 2006
-+++ sqlite3_stubs.c	Mon Feb 27 23:23:43 2006
-@@ -24,7 +24,10 @@
- 
- #include <stdio.h>
- #include <string.h> 
-+/* FIXME: This should go into configure script. */
-+#if defined(HAVE_ALLOCA_H)
- #include <alloca.h>
-+#endif
- 
- #include <caml/mlvalues.h>
- #include <caml/memory.h>
diff --git a/databases/ocaml-sqlite3/files/pkg-deinstall.in b/databases/ocaml-sqlite3/files/pkg-deinstall.in
deleted file mode 100644
index d26108142739..000000000000
--- a/databases/ocaml-sqlite3/files/pkg-deinstall.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-#
-
-if [ "x$2" = "xPOST-DEINSTALL" ]; then
-	ldconf="%%PREFIX%%/lib/ocaml/ld.conf"
-
-	cat ${ldconf} | grep -v sqlite3 > ${ldconf}.tmp
-	mv ${ldconf}.tmp ${ldconf}
-fi
-
-exit 0
-
diff --git a/databases/ocaml-sqlite3/files/pkg-install.in b/databases/ocaml-sqlite3/files/pkg-install.in
deleted file mode 100644
index d5f7d26d2f47..000000000000
--- a/databases/ocaml-sqlite3/files/pkg-install.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-#
-
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	ldconf="%%PREFIX%%/lib/ocaml/ld.conf"
-
-	echo "%%PREFIX%%/lib/ocaml/site-lib/sqlite3" >> ${ldconf}
-fi
-
-exit 0
-
diff --git a/databases/ocaml-sqlite3/pkg-descr b/databases/ocaml-sqlite3/pkg-descr
index 29d2b82005d3..d35fbc05c0e8 100644
--- a/databases/ocaml-sqlite3/pkg-descr
+++ b/databases/ocaml-sqlite3/pkg-descr
@@ -8,4 +8,4 @@ This wrapper is written in a way that enables a friendly
 coexistence with the old (version 2) sqlite and its
 ocaml wrapper ocaml-sqlite.
 
-WWW: http://metamatix.org/~ocaml/
+WWW: http://www.ocaml.info/home/ocaml_sources.html
diff --git a/databases/ocaml-sqlite3/pkg-plist b/databases/ocaml-sqlite3/pkg-plist
index a111114cd33a..20573c9235f6 100644
--- a/databases/ocaml-sqlite3/pkg-plist
+++ b/databases/ocaml-sqlite3/pkg-plist
@@ -1,13 +1 @@
-bin/ocamlsqlite3
-lib/ocaml/site-lib/sqlite3/dllsqlite3.so
-lib/ocaml/site-lib/sqlite3/sqlite3.cmx
-lib/ocaml/site-lib/sqlite3/sqlite3.a
-lib/ocaml/site-lib/sqlite3/libsqlite3.a
-lib/ocaml/site-lib/sqlite3/sqlite3.cmxa
-lib/ocaml/site-lib/sqlite3/sqlite3.cma
-lib/ocaml/site-lib/sqlite3/sqlite3.mli
-lib/ocaml/site-lib/sqlite3/sqlite3.cmi
-lib/ocaml/site-lib/sqlite3/META
-@dirrm lib/ocaml/site-lib/sqlite3
-@unexec ocamlfind remove sqlite3 2> /dev/null || true
-@unexec cat %%PREFIX%%/lib/ocaml/ld.conf | grep -v sqlite3 > %%PREFIX%%/lib/ocaml/ld.conf.tmp && mv %%PREFIX%%/lib/ocaml/ld.conf.tmp %%PREFIX%%/lib/ocaml/ld.conf
+bin/sqlite3top