[148127] trunk/dports/devel/ocaml-findlib

[mcalhoun at macports.org]

Revision: 148127
          https://trac.macports.org/changeset/148127
Author:   mcalhoun at macports.org
Date:     2016-04-27 10:53:47 -0700 (Wed, 27 Apr 2016)
Log Message:
-----------
ocaml-findlib: prevent installation of the META file for ocaml-camlp4 (fixes #44929)

Modified Paths:
--------------
    trunk/dports/devel/ocaml-findlib/Portfile

Added Paths:
-----------
    trunk/dports/devel/ocaml-findlib/files/patch-meta.diff

Removed Paths:
-------------
    trunk/dports/devel/ocaml-findlib/files/patch-site-lib-src-camlp4.310-META.in.diff

Modified: trunk/dports/devel/ocaml-findlib/Portfile
===================================================================
--- trunk/dports/devel/ocaml-findlib/Portfile	2016-04-27 17:28:46 UTC (rev 148126)
+++ trunk/dports/devel/ocaml-findlib/Portfile	2016-04-27 17:53:47 UTC (rev 148127)
@@ -4,7 +4,7 @@
 
 name                ocaml-findlib
 version             1.5.5
-revision            2
+revision            3
 distname            findlib-${version}
 categories          devel ml
 maintainers         mww openmaintainer
@@ -32,7 +32,11 @@
 
 depends_lib         port:ocaml
 
-patchfiles          patch-site-lib-src-camlp4.310-META.in.diff
+# see #44929
+# patch modified from https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-ml/findlib/files
+# if labltk is updated, patchfile will have to remove labltk META file as well
+patchfiles-append   patch-meta.diff
+depends_lib-append  port:ocaml-camlp4
 
 configure.args      -bindir ${prefix}/bin \
                     -mandir ${prefix}/share/man \

Added: trunk/dports/devel/ocaml-findlib/files/patch-meta.diff
===================================================================
--- trunk/dports/devel/ocaml-findlib/files/patch-meta.diff	                        (rev 0)
+++ trunk/dports/devel/ocaml-findlib/files/patch-meta.diff	2016-04-27 17:53:47 UTC (rev 148127)
@@ -0,0 +1,16 @@
+Avoid installing META files for labltk and camlp4: Those are provided by their
+respective packages now.
+
+Index: findlib-1.5.5/configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -515,7 +515,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
++l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lobuild $lcomplibs $lbytes"
+ 
+ for dir in site-lib-src/*; do
+     # We do not really know if $dir is a directory.

Deleted: trunk/dports/devel/ocaml-findlib/files/patch-site-lib-src-camlp4.310-META.in.diff
===================================================================
--- trunk/dports/devel/ocaml-findlib/files/patch-site-lib-src-camlp4.310-META.in.diff	2016-04-27 17:28:46 UTC (rev 148126)
+++ trunk/dports/devel/ocaml-findlib/files/patch-site-lib-src-camlp4.310-META.in.diff	2016-04-27 17:53:47 UTC (rev 148127)
@@ -1,10 +0,0 @@
---- site-lib-src/camlp4.310/META.in	2012-06-08 14:14:41.000000000 +0200
-+++ META.in	2012-06-16 18:42:00.000000000 +0200
-@@ -1,6 +1,6 @@
- dnl This file is input of the m4 macro processor.
- `# Specifications for the "camlp4" preprocessor:'
--`requires = ""'
-+`requires = "dynlink"'
- `version = "[distributed with Ocaml]"'
- `description = "Base for Camlp4 syntax extensions"'
- `directory = "+camlp4"'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160427/6102711d/attachment.html>