Attachment 233068 Details for Bug 262793 – Upgrade to 1.2.4

[patch] Upgrade to 1.2.4

devel_ocaml-parmap.diff (text/plain), 5.85 KB, created by Thierry Thomas on 2022-04-08 16:13:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2022-04-08 16:13:15 UTC

Size: 5.85 KB

patch

obsolete

>From 920d39ccec35c61c65a136302bcaf932ed2cb9bf Mon Sep 17 00:00:00 2001
>From: Thierry Thomas <thierry@FreeBSD.org>
>Date: Tue, 22 Mar 2022 21:47:50 +0100
>Subject: [PATCH] devel/ocaml-parmap: upgrade to 1.2.4
>
>Release notes at <https://github.com/rdicosmo/parmap/releases>.
>---
> devel/ocaml-parmap/Makefile                | 25 ++++++---
> devel/ocaml-parmap/distinfo                |  6 +--
> devel/ocaml-parmap/files/patch-Makefile.in | 15 ------
> devel/ocaml-parmap/pkg-plist               | 61 ++++++++++++++--------
> 4 files changed, 60 insertions(+), 47 deletions(-)
> delete mode 100644 devel/ocaml-parmap/files/patch-Makefile.in
>
>diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile
>index 9ac948457bff..4ca290a9068b 100644
>--- a/devel/ocaml-parmap/Makefile
>+++ b/devel/ocaml-parmap/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Jean-SÃ©bastien PÃ©dron <dumbbell@FreeBSD.org>
> 
> PORTNAME=	parmap
>-DISTVERSION=	1.0-rc9
>+DISTVERSION=	1.2.4
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -11,19 +11,30 @@ COMMENT=	Minimalistic library allowing to exploit multicore architecture
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
>+BUILD_DEPENDS=	dune:devel/ocaml-dune	\
>+		ocaml-dune-configurator>0:devel/ocaml-dune-configurator
>+RUN_DEPENDS=	ocaml-dune-configurator>0:devel/ocaml-dune-configurator
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	rdicosmo
> 
>-USES=			gmake
>-GNU_CONFIGURE=		yes
> USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
> USE_OCAML_LDCONFIG=	yes
>+OCAML_LDLIBS=		${OCAML_SITELIBDIR}/stublibs
>+
>+INSTALL_ARGS=	--destdir=${STAGEDIR} --libdir=${OCAML_SITELIBDIR}
>+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+
>+OPTIONS_DEFINE=	DOCS
>+
>+do-build:
>+	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune build --release)
>+
>+do-install:
>+	(cd ${WRKSRC} && ${LOCALBASE}/bin/dune install ${INSTALL_ARGS})
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/stublibs/*.so
> 
> .include <bsd.port.mk>
>diff --git a/devel/ocaml-parmap/distinfo b/devel/ocaml-parmap/distinfo
>index 29b6be795de0..af6e572447a0 100644
>--- a/devel/ocaml-parmap/distinfo
>+++ b/devel/ocaml-parmap/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519649954
>-SHA256 (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 8bccdb269e955b7ae6ab981117bfe64abf0f832788e4138c79b83385c9c9e16a
>-SIZE (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 99394
>+TIMESTAMP = 1647975744
>+SHA256 (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 3c8835dc6dfc74bc9ad9b68ba5b3e6287434555bb09a27b3910c73f9b70ce140
>+SIZE (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 47584
>diff --git a/devel/ocaml-parmap/files/patch-Makefile.in b/devel/ocaml-parmap/files/patch-Makefile.in
>deleted file mode 100644
>index f38746ebb422..000000000000
>--- a/devel/ocaml-parmap/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- Makefile.in.orig	2015-02-09 10:42:28 UTC
>-+++ Makefile.in
>-@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install
>- UNINSTALL = $(OCAMLFIND) remove
>- else
>- export OCAMLLIBDIR := lib/ocaml
>--LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR)
>--BINDIR=$(DESTDIR)/bin
>--MANDIR=$(DESTDIR)/man/man3
>-+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR)
>-+BINDIR=$(DESTDIR)$(exec_prefix)/bin
>-+MANDIR=$(DESTDIR)$(prefix)/man/man3
>- INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
>- UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
>- endif
>diff --git a/devel/ocaml-parmap/pkg-plist b/devel/ocaml-parmap/pkg-plist
>index 24182b6a84c4..c9e582da4918 100644
>--- a/devel/ocaml-parmap/pkg-plist
>+++ b/devel/ocaml-parmap/pkg-plist
>@@ -1,22 +1,39 @@
>-lib/ocaml/parmap/META
>-lib/ocaml/parmap/bytearray.cmi
>-lib/ocaml/parmap/bytearray.cmx
>-lib/ocaml/parmap/bytearray.mli
>-lib/ocaml/parmap/libparmap_stubs.a
>-lib/ocaml/parmap/myocamlbuild.cmx
>-lib/ocaml/parmap/parmap_utils.cmi
>-lib/ocaml/parmap/parmap_utils.cmx
>-lib/ocaml/parmap/parmap_utils.mli
>-lib/ocaml/parmap/parmap.a
>-lib/ocaml/parmap/parmap.cma
>-lib/ocaml/parmap/parmap.cmi
>-lib/ocaml/parmap/parmap.cmx
>-lib/ocaml/parmap/parmap.cmxa
>-lib/ocaml/parmap/parmap.cmxs
>-lib/ocaml/parmap/parmap.mli
>-lib/ocaml/parmap/setcore.cmi
>-lib/ocaml/parmap/setcore.cmx
>-lib/ocaml/stublibs/dllparmap_stubs.so
>-lib/ocaml/stublibs/dllparmap_stubs.so.owner
>-man/man3/Parmap.3o.gz
>-@dir %%OCAML_SITELIBDIR%%
>+%%OCAML_SITELIBDIR%%/parmap/META
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.cmt
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.cmti
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.cmx
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.ml
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.mli
>+%%OCAML_SITELIBDIR%%/parmap/dune-package
>+%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a
>+%%OCAML_SITELIBDIR%%/parmap/opam
>+%%OCAML_SITELIBDIR%%/parmap/parmap.a
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cma
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmi
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmt
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmti
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmx
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs
>+%%OCAML_SITELIBDIR%%/parmap/parmap.ml
>+%%OCAML_SITELIBDIR%%/parmap/parmap.mli
>+%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmi
>+%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmt
>+%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmx
>+%%OCAML_SITELIBDIR%%/parmap/parmap_compat.ml
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmt
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmti
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmx
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.ml
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli
>+%%OCAML_SITELIBDIR%%/parmap/setcore.cmi
>+%%OCAML_SITELIBDIR%%/parmap/setcore.cmt
>+%%OCAML_SITELIBDIR%%/parmap/setcore.cmx
>+%%OCAML_SITELIBDIR%%/parmap/setcore.ml
>+%%OCAML_SITELIBDIR%%/stublibs/dllparmap_stubs.so
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%PORTDOCS%%%%DOCSDIR%%/README.md
>+%%PORTDOCS%%%%DOCSDIR%%/odoc-pages/index.mld
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 262793: 232702 | 233068