Updated devel/ocaml-lwt to version 4.2.1. Minor changes, the most important of which is introducing ocaml 4.08 compatibility. The configure script has also been moved and is now called during compilation.diff -r1.40 -r1.41 pkgsrc/devel/ocaml-lwt/Makefile
(jaapb)
@@ -1,31 +1,26 @@ | @@ -1,31 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.40 2019/03/05 16:56:16 jaapb Exp $ | 1 | # $NetBSD: Makefile,v 1.41 2019/05/13 11:38:45 jaapb Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "Makefile.common" | 4 | .include "Makefile.common" | |
5 | 5 | |||
6 | PKGNAME= ocaml-${DISTNAME} | 6 | PKGNAME= ocaml-${DISTNAME} | |
7 | PKGREVISION= 3 | |||
8 | CATEGORIES= devel | 7 | CATEGORIES= devel | |
9 | 8 | |||
10 | MAINTAINER= jaapb@NetBSD.org | 9 | MAINTAINER= jaapb@NetBSD.org | |
11 | HOMEPAGE= http://www.ocsigen.org/ | 10 | HOMEPAGE= http://www.ocsigen.org/ | |
12 | COMMENT= Cooperative threading library for OCaml | 11 | COMMENT= Cooperative threading library for OCaml | |
13 | 12 | |||
14 | OCAML_FINDLIB_DIRS= lwt stublibs | 13 | OCAML_FINDLIB_DIRS= lwt stublibs | |
15 | DUNE_BUILD_PACKAGES= lwt | 14 | DUNE_BUILD_PACKAGES= lwt | |
16 | 15 | |||
17 | HAS_CONFIGURE= yes | |||
18 | CONFIGURE_ARGS= -use-libev false | |||
19 | ||||
20 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | 16 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | |
21 | 17 | |||
22 | do-configure: | |||
23 | cd ${WRKSRC} && ocaml src/util/configure.ml ${CONFIGURE_ARGS} | |||
24 | ||||
25 | .include "../../mk/ocaml.mk" | 18 | .include "../../mk/ocaml.mk" | |
26 | .include "../../devel/ocaml-cppo/buildlink3.mk" | 19 | .include "../../devel/ocaml-cppo/buildlink3.mk" | |
27 | .include "../../devel/ocaml-findlib/buildlink3.mk" | 20 | .include "../../devel/ocaml-findlib/buildlink3.mk" | |
28 | .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" | 21 | .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" | |
22 | .include "../../devel/ocaml-mmap/buildlink3.mk" | |||
29 | .include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk" | 23 | .include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk" | |
30 | .include "../../devel/ocaml-result/buildlink3.mk" | 24 | .include "../../devel/ocaml-result/buildlink3.mk" | |
25 | .include "../../devel/ocaml-seq/buildlink3.mk" | |||
31 | .include "../../mk/bsd.pkg.mk" | 26 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.6 2018/11/27 17:15:49 jaapb Exp $ | 1 | # $NetBSD: Makefile.common,v 1.7 2019/05/13 11:38:45 jaapb Exp $ | |
2 | 2 | |||
3 | # used by devel/ocaml-lwt_glib/Makefile | 3 | # used by devel/ocaml-lwt_glib/Makefile | |
4 | # used by devel/ocaml-lwt_ppx/Makefile | 4 | # used by devel/ocaml-lwt_ppx/Makefile | |
5 | # used by devel/ocaml-lwt_react/Makefile | 5 | # used by devel/ocaml-lwt_react/Makefile | |
6 | 6 | |||
7 | LWT_VERSION= 4.1.0 | 7 | LWT_VERSION= 4.2.1 | |
8 | DISTNAME= lwt-${LWT_VERSION} | 8 | DISTNAME= lwt-${LWT_VERSION} | |
9 | 9 | |||
10 | LICENSE= mit | 10 | LICENSE= mit | |
11 | 11 | |||
12 | MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} | 12 | MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} | |
13 | GITHUB_PROJECT= lwt | 13 | GITHUB_PROJECT= lwt | |
14 | GITHUB_TAG= ${LWT_VERSION} | 14 | GITHUB_TAG= ${LWT_VERSION} | |
15 | 15 | |||
16 | OCAML_USE_DUNE= yes | 16 | OCAML_USE_DUNE= yes | |
17 | 17 | |||
18 | DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo | 18 | DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo | |
19 | PATCHDIR= ${PKGDIR}/../../devel/ocaml-lwt/patches | 19 | PATCHDIR= ${PKGDIR}/../../devel/ocaml-lwt/patches |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.13 2019/03/05 16:56:16 jaapb Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.14 2019/05/13 11:38:45 jaapb Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= ocaml-lwt | 3 | BUILDLINK_TREE+= ocaml-lwt | |
4 | 4 | |||
5 | .if !defined(OCAML_LWT_BUILDLINK3_MK) | 5 | .if !defined(OCAML_LWT_BUILDLINK3_MK) | |
6 | OCAML_LWT_BUILDLINK3_MK:= | 6 | OCAML_LWT_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.0.0 | 8 | BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.0.0 | |
9 | BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.1.0nb3 | 9 | BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.2.1 | |
10 | BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt | 10 | BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt | |
11 | 11 | |||
12 | #.include "../../devel/libev/buildlink3.mk" | 12 | #.include "../../devel/libev/buildlink3.mk" | |
13 | .endif # OCAML_LWT_BUILDLINK3_MK | 13 | .endif # OCAML_LWT_BUILDLINK3_MK | |
14 | 14 | |||
15 | BUILDLINK_TREE+= -ocaml-lwt | 15 | BUILDLINK_TREE+= -ocaml-lwt |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.21 2018/11/29 11:58:00 jaapb Exp $ | 1 | $NetBSD: distinfo,v 1.22 2019/05/13 11:38:45 jaapb Exp $ | |
2 | 2 | |||
3 | SHA1 (lwt-4.1.0.tar.gz) = 2a780c8be6022967d94e069fa132933a8d14e6ff | 3 | SHA1 (lwt-4.2.1.tar.gz) = bba54c66d8c7dd7b09bc091ed33656276ce73b30 | |
4 | RMD160 (lwt-4.1.0.tar.gz) = 17c0175cb745a30e9786ed78fccb15d9b78ca561 | 4 | RMD160 (lwt-4.2.1.tar.gz) = ed70a120a8c2cf87985ef3153512b63959b60bec | |
5 | SHA512 (lwt-4.1.0.tar.gz) = 28bc51e75d5e4c74171f17aaba86fdefad70f57f9f2023680044d5bf65250d8531501adc85d0422e644c1e318dcee0a4d53f7841c82d9dca9854e8fbb09987f2 | 5 | SHA512 (lwt-4.2.1.tar.gz) = 4289568e9ca0ffc8625caddc0b5c7d79737800106289931927133eeeb79e3c638aad4399b075bf46b339e91a739589983ce546f4dad07f492fd31ce5be5c216d | |
6 | Size (lwt-4.1.0.tar.gz) = 279251 bytes | 6 | Size (lwt-4.2.1.tar.gz) = 286694 bytes | |
7 | SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1 | 7 | SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1 | |
8 | SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518 | 8 | SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518 |