Disabled META file generation for dbm package; this will be taken care of

by the databases/ocaml-dbm package itself from now on.

4 files changed, 30 insertions, 4 deletions

diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 87eb2382fb1..6e6ca3162c0 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2013/07/05 13:57:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.17 2013/07/06 10:55:38 jaapb Exp $
 #
 
 DISTNAME=		findlib-1.4
 PKGNAME=		ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST
index 53bb96bc77f..502165f5b67 100644
--- a/devel/ocaml-findlib/PLIST
+++ b/devel/ocaml-findlib/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2012/10/08 15:18:21 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/07/06 10:55:38 jaapb Exp $
 bin/ocamlfind
 bin/safe_camlp4
 lib/ocaml/site-lib/bigarray/META
 lib/ocaml/site-lib/camlp4/META
 lib/ocaml/site-lib/compiler-libs/META
-lib/ocaml/site-lib/dbm/META
 lib/ocaml/site-lib/dynlink/META
 lib/ocaml/site-lib/findlib/META
 lib/ocaml/site-lib/findlib/Makefile.config
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index fe8cea66b5d..9838fed2e48 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/07/05 13:57:58 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2013/07/06 10:55:38 jaapb Exp $
 
 SHA1 (findlib-1.4.tar.gz) = 07048076758e4ca892f06ff535d7cab033833bde
 RMD160 (findlib-1.4.tar.gz) = ab81e1521fe51ab69427d791347ad21ad404855a
 Size (findlib-1.4.tar.gz) = 231526 bytes
 SHA1 (patch-Makefile) = 5d096319b0a7b4bebf7e0c6cf987a7ef8c08e823
+SHA1 (patch-configure) = 393bffc3f102b8af9d0cda1616c6e9d133646edd
 SHA1 (patch-src_findlib_Makefile) = be49342260bd27365716f5a05632c98904533276
diff --git a/devel/ocaml-findlib/patches/patch-configure b/devel/ocaml-findlib/patches/patch-configure
new file mode 100644
index 00000000000..9be8e1c1a8a
--- /dev/null
+++ b/devel/ocaml-findlib/patches/patch-configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2013/07/06 10:55:38 jaapb Exp $
+
+Do not install dbm META file even if dbm is present
+--- configure.orig	2013-06-11 07:27:39.000000000 +0000
++++ configure
+@@ -469,13 +469,13 @@ fi
+ 
+ # dbm?
+ 
+-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
+-    echo "dbm: found"
+-    ldbm="dbm"
+-else
+-    echo "dbm: not present (normal since OCaml-4.00)"
++# if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
++#     echo "dbm: found"
++#     ldbm="dbm"
++# else
++#     echo "dbm: not present (normal since OCaml-4.00)"
+     ldbm=""
+-fi
++# fi
+ 
+ 
+ # Generate the META files now.