Ticket #55358: patch-ocaml

File patch-ocaml, 12.3 KB (added by pmetzger (Perry E. Metzger), 7 years ago)

Patches to update Portfiles (and one files/ patch) for OCaml system updates

Line 
1diff --git a/devel/ocaml-findlib/Portfile b/devel/ocaml-findlib/Portfile
2index 77324d0560..a2816a0cd7 100644
3--- a/devel/ocaml-findlib/Portfile
4+++ b/devel/ocaml-findlib/Portfile
5@@ -1,29 +1,31 @@
6 PortSystem 1.0
7 
8 name                ocaml-findlib
9-version             1.5.5
10-revision            3
11+version             1.7.3
12 distname            findlib-${version}
13 categories          devel ml
14-maintainers         nomaintainer
15+maintainers         {@pmetzger piermont.com:perry} openmaintainer
16 platforms           darwin
17 license             MIT
18 description         Objective Caml library management system
19 long_description    The findlib library provides a scheme to manage reusable \
20-                    software components (packages), and includes tools that support \
21-                    this scheme. Packages are collections of OCaml modules for which \
22-                    metainformation can be stored. The packages are kept in the filesystem \
23-                    hierarchy, but with strict directory structure. The library contains \
24-                    functions to look the directory up that stores a package, to query \
25-                    metainformation about a package, and to retrieve dependency information \
26-                    about multiple packages. There is also a tool that allows the user to \
27-                    enter queries on the command-line. In order to simplify compilation and \
28-                    linkage, there are new frontends of the various OCaml compilers that \
29+                    software components (packages), and includes tools that \
30+                    support this scheme. Packages are collections of OCaml \
31+                    modules for which metainformation can be stored. \
32+                    The packages are kept in the filesystem \
33+                    hierarchy, but with strict directory structure. \
34+                    The library contains functions to look the directory up \
35+                    that stores a package, to query metainformation about \
36+                    a package, and to retrieve dependency information \
37+                    about multiple packages. There is also a tool that \
38+                    allows the user to enter queries on the command-line. \
39+                    In order to simplify compilation and linkage, there \
40+                    are new frontends of the various OCaml compilers that \
41                     can directly deal with packages.
42 homepage            http://projects.camlcity.org/projects/findlib.html
43 master_sites        http://download.camlcity.org/download/
44-checksums           rmd160  4dd077e963b7a72ce9bd716ee497f8555b182139 \
45-                    sha256  aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946
46+checksums           rmd160  2b6d492fa4416b597f639c7a8a40e6f1af094d6f \
47+                    sha256  d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b
48 
49 livecheck.type      regex
50 livecheck.regex     "findlib-(.*?).tar.gz"
51diff --git a/devel/ocaml-findlib/files/patch-meta.diff b/devel/ocaml-findlib/files/patch-meta.diff
52index 23ab715116..81ef47000f 100644
53--- a/devel/ocaml-findlib/files/patch-meta.diff
54+++ b/devel/ocaml-findlib/files/patch-meta.diff
55@@ -5,12 +5,12 @@ Index: findlib-1.5.5/configure
56 ===================================================================
57 --- configure.orig
58 +++ configure
59-@@ -515,7 +515,7 @@ fi
60+@@ -559,7 +559,7 @@
61 
62  # Generate the META files now.
63 
64--l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
65-+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lobuild $lcomplibs $lbytes"
66+-l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
67++l="$ldbm dynlink graphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lobuild $lcomplibs $lbytes $lspacetime"
68 
69  for dir in site-lib-src/*; do
70      # We do not really know if $dir is a directory.
71diff --git a/devel/ocaml-ocamlbuild/Portfile b/devel/ocaml-ocamlbuild/Portfile
72new file mode 100644
73index 0000000000..e8f0b48874
74--- /dev/null
75+++ b/devel/ocaml-ocamlbuild/Portfile
76@@ -0,0 +1,34 @@
77+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
78+
79+PortSystem          1.0
80+PortGroup           ocaml 1.0
81+PortGroup           github 1.0
82+
83+github.setup        ocaml ocamlbuild 0.12.0
84+name                ocaml-ocamlbuild
85+categories          devel ml
86+maintainers         {@pmetzger piermont.com:perry} openmaintainer
87+license             {LGPL-2.1 OpenSSLException}
88+description         Caml Preprocessor and Pretty-Printer
89+long_description    \
90+    OCamlbuild is a generic build tool that has built-in rules for \
91+    building OCaml library and programs. \
92+    OCamlbuild was distributed as part of the OCaml distribution for OCaml \
93+    versions between 3.10.0 and 4.02.3. Starting from OCaml 4.03, it is \
94+    released separately.
95+
96+platforms           darwin
97+
98+checksums           rmd160  b626410cfc5c9e2b91edf92d4a5d69892ccfd85a \
99+                    sha256  273eaccd9fb77c215e7e5cd44f530a0905f53f4ad94ef1e486297cd2fa2c0a02
100+
101+configure.pre_args
102+configure.args      OCAMLBUILD_PREFIX=${prefix} \
103+                    OCAMLBUILD_BINDIR=${prefix}/bin \
104+                    OCAMLBUILD_LIBDIR=${prefix}/lib/ocaml \
105+                    OCAML_NATIVE=true
106+configure.cmd       make configure
107+
108+
109+use_parallel_build  no
110+universal_variant   no
111diff --git a/lang/camlp5/Portfile b/lang/camlp5/Portfile
112index f37761fb43..e5c8996254 100644
113--- a/lang/camlp5/Portfile
114+++ b/lang/camlp5/Portfile
115@@ -1,14 +1,15 @@
116 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
117 
118-PortSystem 1.0
119+PortSystem          1.0
120+PortGroup           github 1.0
121 
122-name                camlp5
123-version             6.13
124-revision            1
125+set _version        7.03
126+github.setup        camlp5 camlp5 [string map {. ""} ${_version}] rel
127+version             ${_version}
128 categories          lang ml
129 license             BSD
130 platforms           darwin
131-maintainers         nomaintainer
132+maintainers         {@pmetzger piermont.com:perry} openmaintainer
133 
134 description         Camlp5 is a preprocessor-pretty-printer of OCaml.
135 long_description    Camlp5 is a preprocessor and pretty-printer for \
136@@ -22,11 +23,10 @@ long_description    Camlp5 is a preprocessor and pretty-printer for \
137         stream parsers and lexers pretty print module.  It works as a \
138         shell command and can also be used in the OCaml toplevel.
139 
140-homepage            http://camlp5.gforge.inria.fr/
141-master_sites        ${homepage}distrib/src/
142+homepage            https://camlp5.github.io/
143 
144-checksums           rmd160  cfea137e8a92e48fe51a15a816a6333477e86e43 \
145-                    sha256  d1e948c04079e417d2b616f03f57cda9b6111c563d7ce59a8956ac93772e4aa9
146+checksums           rmd160  34bb2a1a6a8c55d932a60f1f74ed4adcd907c0bf \
147+                    sha256  53eb7451799107d33193ced162ea67024d1a7eb4a2aacd2056dc0cdfc715e4f7
148 
149 depends_build       port:ocaml
150 
151@@ -40,7 +40,3 @@ use_parallel_build  no
152 
153 # ocaml is not universal
154 universal_variant   no
155-
156-livecheck.type  regex
157-livecheck.url   [lindex ${master_sites} 0]
158-livecheck.regex ${name}-(\[0-9.\]+)\\.tgz
159diff --git a/lang/coq/Portfile b/lang/coq/Portfile
160index 0f62d83415..6b7345a98b 100644
161--- a/lang/coq/Portfile
162+++ b/lang/coq/Portfile
163@@ -3,25 +3,27 @@
164 PortSystem          1.0
165 
166 name                coq
167-version             8.5pl3
168+version             8.7.0
169 platforms           darwin
170 categories          lang math
171 license             LGPL-2.1
172-maintainers         piermont.com:perry openmaintainer
173+maintainers         {@pmetzger piermont.com:perry} openmaintainer
174 
175 description         Proof assistant for higher-order logic
176 long_description    Coq is a proof assistant for higher-order logic, \
177                     which allows the development of computer programs \
178                     consistent with their formal specification. It is \
179-                    developed using Objective Caml and Camlp4.
180+                    developed using OCaml and Camlp4.
181 homepage            https://coq.inria.fr/
182 
183 depends_lib         port:ocaml \
184                     port:camlp5
185 
186+depends_build       port:ocaml-findlib
187+
188 master_sites        http://coq.inria.fr/distrib/V${version}/files/
189-checksums           rmd160  f8abeb8a24690f9d4e56ec67a1dd1b4d7381d93d \
190-                    sha256  305b92e05d406d4d0c64f43d4fadb6b89419120a1d4ae4115ed1c5eb8812d33b
191+checksums           rmd160  7e752473b27a2d1a0f95ea3eb258ffba5a5a8d4f \
192+                    sha256  f376207ed051b3fd27c519f44b25eb25f8dddbce22715f68c3cedfd2e4b39297
193 
194 configure.pre_args  -prefix ${prefix}
195 configure.args      -emacslib ${prefix}/share/emacs/site-lisp/ \
196diff --git a/lang/ocaml-camlp4/Portfile b/lang/ocaml-camlp4/Portfile
197index bee77bf122..6dd71a244c 100644
198--- a/lang/ocaml-camlp4/Portfile
199+++ b/lang/ocaml-camlp4/Portfile
200@@ -4,12 +4,11 @@ PortSystem          1.0
201 PortGroup           ocaml 1.0
202 PortGroup           github 1.0
203 
204-github.setup        ocaml camlp4 4.02+6
205+github.setup        ocaml camlp4 4.05+2
206 name                ocaml-camlp4
207 version             [string map {+ -} ${version}]
208-revision            1
209 categories          lang devel ml
210-maintainers         nomaintainer
211+maintainers         {@pmetzger piermont.com:perry} openmaintainer
212 license             {LGPL-2.1 OpenSSLException}
213 description         Caml Preprocessor and Pretty-Printer
214 long_description    \
215@@ -25,11 +24,13 @@ long_description    \
216 
217 platforms           darwin
218 
219-checksums           rmd160  03de86ab0ccec9b7c341f30132cc61caea29f7eb \
220-                    sha256  5a374fd814c61c571ada334f1cdcccd7d67207d61b6fd753551b5baa9b6305fb
221+checksums           rmd160  39daba906c2c3cfcc4f22f0de1f2f43e508b86e2 \
222+                    sha256  a21d17cdc007ee76a67d5a9b2cc5851a5e7e9fcc5d8bccf8855b6ac2e7c2aa25
223 
224 configure.pre_args  --bindir=${prefix}/bin --libdir=${prefix}/lib/ocaml --pkgdir=${ocamlfind_dir}
225 
226+depends_build       port:ocaml-ocamlbuild
227+
228 use_parallel_build  no
229 
230 destroot.target     install install-META
231diff --git a/lang/ocaml/Portfile b/lang/ocaml/Portfile
232index b00bd82330..151e51b4d0 100644
233--- a/lang/ocaml/Portfile
234+++ b/lang/ocaml/Portfile
235@@ -1,26 +1,25 @@
236-PortSystem        1.0
237+PortSystem          1.0
238 
239 name                ocaml
240 epoch               1
241-version             4.02.2
242-revision            1
243+version             4.05.0
244 # When updating ocaml, also update ocaml-camlp4 and camlp5 to compatible versions
245 # (c.f. #26769, #20219, #18292) or increase their revisions to rebuild them.
246 set major_vers      [join [lrange [split ${version} .] 0 1] .]
247 platforms           darwin
248-maintainers         nomaintainer
249+maintainers         {@pmetzger piermont.com:perry} openmaintainer
250 categories          lang ml
251-description         Objective Caml is an implementation of the ML language
252+description         OCaml is an implementation of the ML language
253 license             {QPL LGPL}
254 homepage            http://www.ocaml.org/
255 master_sites        http://caml.inria.fr/pub/distrib/ocaml-${major_vers}/
256-checksums           rmd160  f00ac72bd5a96b28a2ba6dca6b0f9c8c971d9497 \
257-                    sha256  60f923988ab7ae023a0799f9699d7d7a476bf8207ee2c900f92c8288ea363085
258+checksums           rmd160  d54f32412a47988eb6d5bf8521237277bce8af2d \
259+                    sha256  04a527ba14b4d7d1b2ea7b2ae21aefecfa8d304399db94f35a96df1459e02ef9
260 
261 long_description \
262-            Objective Caml is an implementation of the ML language, based on \
263-            the Caml Light dialect extended with a complete class-based object \
264-            system    and a powerful module system in the style of Standard ML.
265+            OCaml, originally named Objective Caml, is an industrial strength \
266+            programming language in the ML family, supporting \
267+            functional, imperative and object-oriented styles.
268 
269 use_xz              yes
270 
271@@ -49,7 +48,7 @@ post-destroot {
272     # Change "ld.conf" to remove ${destroot} in paths.
273     reinplace "s:${destroot}::g" ${destroot}${prefix}/lib/ocaml/ld.conf
274     xinstall -d ${destroot}${docdir}
275-    xinstall -m 0644 -W ${worksrcpath} Changes LICENSE README ${destroot}${docdir}
276+    xinstall -m 0644 -W ${worksrcpath} Changes LICENSE README.adoc ${destroot}${docdir}
277 }
278 
279 # Variants.