[pkgsrc/trunk]: pkgsrc/devel/ocaml-findlib Disabled META file generation for ...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a28fcda954c4
branches:  trunk
changeset: 621236:a28fcda954c4
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Sat Jul 06 10:55:38 2013 +0000

description:
Disabled META file generation for dbm package; this will be taken care of
by the databases/ocaml-dbm package itself from now on.

diffstat:

 devel/ocaml-findlib/Makefile                |   3 ++-
 devel/ocaml-findlib/PLIST                   |   3 +--
 devel/ocaml-findlib/distinfo                |   3 ++-
 devel/ocaml-findlib/patches/patch-configure |  25 +++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r b1d936e8f2e9 -r a28fcda954c4 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Sat Jul 06 10:50:41 2013 +0000
+++ b/devel/ocaml-findlib/Makefile      Sat Jul 06 10:55:38 2013 +0000
@@ -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 -r b1d936e8f2e9 -r a28fcda954c4 devel/ocaml-findlib/PLIST
--- a/devel/ocaml-findlib/PLIST Sat Jul 06 10:50:41 2013 +0000
+++ b/devel/ocaml-findlib/PLIST Sat Jul 06 10:55:38 2013 +0000
@@ -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 -r b1d936e8f2e9 -r a28fcda954c4 devel/ocaml-findlib/distinfo
--- a/devel/ocaml-findlib/distinfo      Sat Jul 06 10:50:41 2013 +0000
+++ b/devel/ocaml-findlib/distinfo      Sat Jul 06 10:55:38 2013 +0000
@@ -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 -r b1d936e8f2e9 -r a28fcda954c4 devel/ocaml-findlib/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-findlib/patches/patch-configure       Sat Jul 06 10:55:38 2013 +0000
@@ -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.