You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
ocaml: update to 5.5.0; cascade ecosystem updates
Version updates required for 5.5: - ocaml-merlin to 5.8-505 - ocaml-camlp4 to 5.5+1 - ocaml-js_of_ocaml to 6.4.0 - ocaml-batteries to 3.11.0 Removed ocaml-ppx_tools which is dead upstream and superseded by ppxlib. Signed-off-by: Paul Guyot <pguyot@kallisys.net>
This commit is contained in:
Paul Guyot
committed by
Perry E. Metzger
Perry E. Metzger
parent
fe0c8c8792
commit
a776172ef6
@@ -5,7 +5,7 @@ PortGroup ocaml 1.0
|
||||
|
||||
name ocaml-mysql
|
||||
version 1.2.4
|
||||
revision 0
|
||||
revision 1
|
||||
categories databases devel ocaml
|
||||
maintainers nomaintainer
|
||||
license LGPL-2.1+
|
||||
@@ -29,6 +29,10 @@ depends_lib-append port:${mariadb_port}
|
||||
post-patch {
|
||||
reinplace "s|mysql_config --|${prefix}/lib/${mariadb_port}/bin/mariadb_config --|g" \
|
||||
${worksrcpath}/configure
|
||||
# OCaml 5.5's ocamlmklib errors on unknown -Wl,... options; drop them from
|
||||
# the flags it receives (the -L paths are kept).
|
||||
reinplace "s|filter-out -l%, @LDFLAGS@|filter-out -l% -Wl%, @LDFLAGS@|" \
|
||||
${worksrcpath}/Makefile.in
|
||||
}
|
||||
|
||||
configure.ld_archflags
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup coccinelle coccinelle 1.3.1
|
||||
github.tarball_from archive
|
||||
revision 2
|
||||
revision 3
|
||||
|
||||
license GPL-2
|
||||
maintainers nomaintainer
|
||||
|
||||
@@ -46,7 +46,7 @@ subport ocaml-cudf {
|
||||
}
|
||||
|
||||
subport libCUDF {
|
||||
revision 1
|
||||
revision 2
|
||||
patchfiles-append patch-c-lib-Makefile.diff \
|
||||
patch-c-lib-Makefile.variants.diff
|
||||
depends_build-append path:bin/pkg-config:pkgconfig
|
||||
|
||||
@@ -4,7 +4,7 @@ PortSystem 1.0
|
||||
|
||||
name omake
|
||||
version 0.10.7
|
||||
revision 1
|
||||
revision 2
|
||||
categories devel
|
||||
maintainers nomaintainer
|
||||
license GPL-2
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
name ott
|
||||
github.setup ott-lang ott 0.34
|
||||
revision 1
|
||||
revision 2
|
||||
categories devel
|
||||
license BSD
|
||||
maintainers gmail.com:ggreif openmaintainer
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
name ledit
|
||||
github.setup chetmurthy ledit 2.08 {}
|
||||
revision 2
|
||||
revision 3
|
||||
categories editors
|
||||
license BSD
|
||||
maintainers nomaintainer
|
||||
|
||||
@@ -4,7 +4,7 @@ PortSystem 1.0
|
||||
PortGroup github 1.0
|
||||
|
||||
github.setup geneweb geneweb 7.1.0-beta2 v
|
||||
revision 5
|
||||
revision 6
|
||||
categories genealogy
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license GPL-2
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup garrigue lablgl 1.07 v
|
||||
github.tarball_from archive
|
||||
revision 1
|
||||
revision 2
|
||||
epoch 1
|
||||
categories graphics ocaml
|
||||
license BSD Tcl/Tk
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup ocaml 1.1
|
||||
PortGroup github 1.0
|
||||
|
||||
github.setup garrigue labltk 8.06.16
|
||||
revision 0
|
||||
revision 1
|
||||
checksums rmd160 b3649b6e321d575bbb342648cc7c684e669c915a \
|
||||
sha256 f816031d6fa024a7ff8cf768205ff24c528ae2c69eca86ad7d7b5ddab4e16022 \
|
||||
size 385188
|
||||
@@ -17,12 +17,14 @@ maintainers nomaintainer
|
||||
description OCaml interface to the Tcl/Tk GUI framework
|
||||
long_description LablTk is an interface to the Tcl/Tk GUI framework. It \
|
||||
allows to develop GUI applications in a speedy and type \
|
||||
safe way. A legacy Camltk interface is included. The \
|
||||
OCamlBrowser library viewer is also part of this project.
|
||||
safe way. A legacy Camltk interface is included.
|
||||
|
||||
homepage https://garrigue.github.io/labltk/
|
||||
github.tarball_from archive
|
||||
|
||||
# The legacy OCamlBrowser tool needs a large port to OCaml 5.5's restructured
|
||||
# typedtree and has no upstream 5.5 fix; build only the Tk library.
|
||||
patchfiles-append patch-no-ocamlbrowser.diff
|
||||
|
||||
depends_lib-append port:tcl \
|
||||
port:tk
|
||||
@@ -39,7 +41,7 @@ pre-destroot {
|
||||
xinstall -m 0755 -d ${destroot}${prefix}/lib/ocaml/stublibs
|
||||
}
|
||||
|
||||
build.target-append opt
|
||||
build.target library libraryopt
|
||||
destroot.destdir INSTALLDIR=${destroot}${prefix}/lib/ocaml/labltk \
|
||||
INSTALLBINDIR=${destroot}${prefix}/bin \
|
||||
STUBLIBDIR=${destroot}${prefix}/lib/ocaml/stublibs
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
Do not build/install the legacy OCamlBrowser tool: it requires a large
|
||||
port to OCaml 5.5's restructured typedtree and has no upstream 5.5 fix.
|
||||
The Tk library (labltk/camltk) is unaffected. Drop browser from install.
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
@@ -84,7 +84,6 @@
|
||||
cd compiler; $(MAKE) install
|
||||
cd jpf; $(MAKE) install
|
||||
cd frx; $(MAKE) install
|
||||
- cd browser; $(MAKE) install
|
||||
if test -f lib/labltk.cmxa; then $(MAKE) installopt; else :; fi
|
||||
|
||||
install-browser:
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup camlp5 camlp5 8.05.01
|
||||
github.tarball_from archive
|
||||
revision 1
|
||||
revision 2
|
||||
categories lang ocaml
|
||||
license BSD
|
||||
maintainers {pmetzger @pmetzger} openmaintainer
|
||||
|
||||
+4
-4
@@ -61,7 +61,7 @@ if {${subport} eq "fstar" || ${subport} eq "karamel"} {
|
||||
subport fstar {
|
||||
github.setup FStarLang FStar 2026.03.24 v
|
||||
epoch 1
|
||||
revision 1
|
||||
revision 2
|
||||
|
||||
license Apache-2
|
||||
description Verification system for effectful programs
|
||||
@@ -140,7 +140,7 @@ subport karamel {
|
||||
github.setup FStarLang karamel c96d44beee92853a4cc8d9c4bc84e8eb452379f4
|
||||
version 2026.03.25
|
||||
epoch 1
|
||||
revision 1
|
||||
revision 2
|
||||
|
||||
license Apache-2
|
||||
description A tool for extracting low-level F* programs to readable C code
|
||||
@@ -221,13 +221,13 @@ if {${subport} eq "kremlin" || ${subport} eq "fstar-devel" ||
|
||||
|
||||
subport kremlin {
|
||||
version 2022.06.08
|
||||
revision 2
|
||||
revision 3
|
||||
replaced_by karamel
|
||||
}
|
||||
|
||||
subport fstar-devel {
|
||||
version 20210824-b95d1ac
|
||||
revision 2
|
||||
revision 3
|
||||
replaced_by fstar
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ PortSystem 1.0
|
||||
PortGroup ocaml 1.0
|
||||
PortGroup github 1.0
|
||||
|
||||
github.setup ocaml camlp4 5.4+1
|
||||
github.setup ocaml camlp4 5.5+1
|
||||
github.tarball_from archive
|
||||
name ocaml-camlp4
|
||||
version [string map {+ -} ${version}]
|
||||
@@ -24,9 +24,9 @@ long_description \
|
||||
4.01.0. Since then it has been replaced by a simpler system which is \
|
||||
easier to maintain and to learn: ppx rewriters and extension points.
|
||||
|
||||
checksums rmd160 9702acda504f635867e3a2b4b1cfc19ba52ca5f5 \
|
||||
sha256 5eb78289bc6bef9d9e46836575303db43f4fdb9d332cea53b138e8f8380ccbb9 \
|
||||
size 653021
|
||||
checksums rmd160 9c6c9500a4d884750bedcca9e169abad10c905e9 \
|
||||
sha256 45f14d312a1f08eaae7368a9eeffce11c2ccb2fafca0d730ac7fd9403e2f5046 \
|
||||
size 653225
|
||||
|
||||
configure.pre_args --bindir=${prefix}/bin --libdir=${prefix}/lib/ocaml --pkgdir=${ocamlfind_dir}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ PortGroup ocaml 1.0
|
||||
|
||||
name ocaml-dypgen
|
||||
version 20120619-1
|
||||
revision 5
|
||||
revision 6
|
||||
categories lang devel ocaml
|
||||
license CeCILL-B
|
||||
maintainers nomaintainer
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
PortGroup ocaml 1.1
|
||||
|
||||
github.setup pdonadeo ocaml-lua 1.8 v
|
||||
revision 1
|
||||
revision 2
|
||||
categories lang devel ocaml
|
||||
license MIT
|
||||
maintainers nomaintainer
|
||||
|
||||
+4
-6
@@ -8,7 +8,7 @@ PortSystem 1.0
|
||||
|
||||
name ocaml
|
||||
epoch 1
|
||||
version 5.4.1
|
||||
version 5.5.0
|
||||
revision 0
|
||||
set major_vers [join [lrange [split ${version} .] 0 1] .]
|
||||
# Note that ppc, ppc64 and i386 on Mac are no longer supported by upstream
|
||||
@@ -20,17 +20,15 @@ license LGPL
|
||||
homepage https://ocaml.org
|
||||
master_sites http://caml.inria.fr/pub/distrib/ocaml-${major_vers}/
|
||||
|
||||
checksums rmd160 a77663dda03d6344e9d7edc37062b00f8ff48880 \
|
||||
sha256 b1e297adc186635540758eb064c7fab025598ae4436f3b9767e5025188b4e0ab \
|
||||
size 4483716
|
||||
checksums rmd160 4b9b1d7f9d48fa867e2c4449633fb5e74e3aed06 \
|
||||
sha256 1a9537c2abda43335cd0af8edbc575bab588a6db68308d7ce8bd9ad80573a477 \
|
||||
size 6609018
|
||||
|
||||
description Compiler and libraries for the OCaml programming language
|
||||
long_description OCaml is an industrial strength programming language \
|
||||
in the ML family, supporting functional, imperative \
|
||||
and object-oriented styles.
|
||||
|
||||
use_xz yes
|
||||
|
||||
universal_variant no
|
||||
|
||||
set docdir ${prefix}/share/doc/${name}
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup rocq-prover rocq 9.2.0 V
|
||||
github.tarball_from releases
|
||||
revision 1
|
||||
revision 2
|
||||
categories lang math
|
||||
license LGPL-2.1
|
||||
maintainers {pmetzger @pmetzger} openmaintainer
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup abella-prover abella 2.0.8.3 v
|
||||
|
||||
revision 2
|
||||
revision 3
|
||||
categories math ocaml
|
||||
maintainers nomaintainer
|
||||
license GPL-3
|
||||
@@ -20,6 +20,9 @@ checksums rmd160 f80f8241eb543d515ed45c43a6cd45c40336595c \
|
||||
size 258223
|
||||
github.tarball_from archive
|
||||
|
||||
# OCaml 5.5 no longer infers first-class module package types in this context.
|
||||
patchfiles-append patch-ocaml55-module-type.diff
|
||||
|
||||
depends_build-append \
|
||||
port:ocaml \
|
||||
port:ocaml-crunch \
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
OCaml 5.5 no longer infers the package type of a first-class module
|
||||
passed as a partially-applied argument; annotate (module X : LP).
|
||||
--- src/depend.ml
|
||||
+++ src/depend.ml
|
||||
@@ -52,7 +52,7 @@
|
||||
| exception Not_found ->
|
||||
Hashtbl.add lp_depend_cache filename None ;
|
||||
let imms = Lp.immediate_depends lpfile in
|
||||
- let deps = filename :: List.flatten_map (lp_dependencies (module Lp)) imms in
|
||||
+ let deps = filename :: List.flatten_map (lp_dependencies (module Lp : LP)) imms in
|
||||
Hashtbl.replace lp_depend_cache filename (Some deps) ;
|
||||
deps
|
||||
|
||||
@@ -76,6 +76,6 @@
|
||||
failwithf "Syntax error%s" (position lexbuf)
|
||||
in
|
||||
let (specs, imports) = spin ~specs:[] ~imports:[] in
|
||||
- let sigfiles = List.flatten_map (lp_dependencies (module LPSig)) specs in
|
||||
- let modfiles = List.flatten_map (lp_dependencies (module LPMod)) specs in
|
||||
+ let sigfiles = List.flatten_map (lp_dependencies (module LPSig : LP)) specs in
|
||||
+ let modfiles = List.flatten_map (lp_dependencies (module LPMod : LP)) specs in
|
||||
(sigfiles @ modfiles, imports)
|
||||
@@ -10,7 +10,7 @@ PortGroup ocaml 1.1
|
||||
github.setup mmottl gsl-ocaml 1.25.1
|
||||
github.tarball_from archive
|
||||
name ocaml-gsl
|
||||
revision 1
|
||||
revision 2
|
||||
categories math science ocaml
|
||||
license GPL-3
|
||||
maintainers nomaintainer
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user