Skip to content

Commit ef5ba39

Browse files
pguyotreneeotten
authored andcommitted
libCUDF, ocaml-cudf: update to 0.10
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent aecaf6b commit ef5ba39

File tree

2 files changed

+45
-35
lines changed

2 files changed

+45
-35
lines changed

devel/libCUDF/Portfile

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# -*- 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
22

33
PortSystem 1.0
4+
PortGroup gitlab 1.0
5+
6+
gitlab.setup irill cudf 0.10 v
47

58
name libCUDF
6-
version 0.7
7-
revision 1
9+
revision 0
810
categories devel ocaml
9-
platforms darwin
1011
maintainers {cal @neverpanic} openmaintainer
1112
license LGPL-3+
12-
homepage http://www.mancoosi.org/cudf/
13+
homepage https://www.mancoosi.org/cudf/
1314

1415
description ${name} is a library to manipulate so called CUDF documents.
1516

@@ -18,12 +19,9 @@ long_description {*}${description} A CUDF \
1819
\"upgrade scenario\", as faced by package managers in popular \
1920
package-based FOSS (Free and Open Source Software) distributions.
2021

21-
master_sites https://gforge.inria.fr/frs/download.php/33593/
22-
23-
checksums rmd160 dd9c5097a627856e0e74fe3052c2f5ee1fd1bec5 \
24-
sha256 92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701
25-
26-
worksrcdir cudf-${version}
22+
checksums rmd160 144ed9a93a38fc298849c8b2110b6db645ad6c5f \
23+
sha256 066ba83f4bac30ed3ca6ce345079900226c2065e4715732ecf8a3751dde7ecc8 \
24+
size 47723
2725

2826
use_configure no
2927

@@ -39,44 +37,26 @@ post-patch {
3937
}
4038

4139
subport ocaml-cudf {
42-
PortGroup ocaml 1.0
43-
44-
depends_lib-append port:camlp5 \
45-
port:ocaml-findlib \
46-
port:ocaml-extlib
40+
PortGroup ocaml 1.1
4741

48-
build.target-append opt
42+
ocaml.build_type dune
4943

50-
test.target test
51-
test.run yes
52-
53-
pre-test {
54-
if {[catch {registry_active ocaml-ounit}]} {
55-
ui_error "Testing requires ocaml-ounit, but it isn't installed."
56-
ui_error "Please install the ocaml-ounit port and try again."
57-
error "missing dependency"
58-
}
59-
}
44+
depends_lib-append port:ocaml-extlib
6045

6146
livecheck.type none
6247
}
6348

6449
subport libCUDF {
65-
depends_build-append port:pkgconfig
50+
patchfiles-append patch-c-lib-Makefile.diff
51+
depends_build-append path:bin/pkg-config:pkgconfig
6652
depends_lib-append port:ocaml-cudf \
6753
path:lib/pkgconfig/glib-2.0.pc:glib2
6854
build.pre_args -C c-lib
6955
build.args all opt
70-
71-
post-destroot {
72-
file delete -force ${destroot}${prefix}/lib/ocaml
73-
}
56+
destroot.pre_args -C c-lib
57+
destroot.args install
7458

7559
test.pre_args -C c-lib
7660
test.args test
7761
test.run yes
7862
}
79-
80-
livecheck.type regex
81-
livecheck.url https://gforge.inria.fr/export/rss20_newreleases.php?group_id=4385
82-
livecheck.regex "cudf (\\d+(?:\\.\\d+)*)"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
--- c-lib/Makefile.orig
2+
+++ c-lib/Makefile
3+
@@ -16,7 +16,8 @@ CUDF_LDFLAGS = -L$(OCAML_LIBDIR) -L$(CURDIR)
4+
CUDF_CLIBS = -lcudf -lm -ldl -lunix -lncurses -lglib-2.0
5+
OCAMLC = ocamlfind ocamlc -package unix,extlib
6+
OCAMLOPT = ocamlfind ocamlopt -package unix,extlib
7+
+CUDF_DIR := $(shell ocamlfind query cudf)
8+
9+
INSTALL_STUFF = libcudf.a cudf.h cudf.pc
10+
11+
libcudf.a: cudf-caml.o cudf.o
12+
@@ -27,14 +28,14 @@ libcudf-opt.a: cudf-caml-opt.o cudf.o
13+
ar r $@ $^
14+
15+
cudf_c.cmo: cudf_c.ml
16+
- $(OCAMLC) -linkpkg -I ../_build/install/default/lib/cudf/ ../_build/install/default/lib/cudf/cudf.cma $^
17+
+ $(OCAMLC) -linkpkg -I $(CUDF_DIR) $(CUDF_DIR)/cudf.cma $^
18+
cudf_c.cmx: cudf_c.ml
19+
- $(OCAMLOPT) -linkpkg -I ../_build/install/default/lib/cudf/ ../_build/install/default/lib/cudf/cudf.cmxa $^
20+
+ $(OCAMLOPT) -linkpkg -I $(CUDF_DIR) $(CUDF_DIR)/cudf.cmxa $^
21+
22+
cudf-caml.o: cudf_c.cmo
23+
- $(OCAMLC) -linkpkg -output-obj -o $@ ../_build/install/default/lib/cudf/cudf.cma $^
24+
+ $(OCAMLC) -linkpkg -output-obj -o $@ $(CUDF_DIR)/cudf.cma $^
25+
cudf-caml-opt.o: cudf_c.cmx
26+
- $(OCAMLOPT) -linkpkg -output-obj -o $@ ../_build/install/default/lib/cudf/cudf.cmxa $^
27+
+ $(OCAMLOPT) -linkpkg -output-obj -o $@ $(CUDF_DIR)/cudf.cmxa $^
28+
29+
cudf.o: cudf.c cudf.h cudf-variants.h
30+

0 commit comments

Comments
 (0)