Attachment 256262 Details for Bug 283719 – ocaml-extlib.patch

[patch] ocaml-extlib.patch

0001-devel-ocaml-extlib-Update-to-1.8.0-improve-port.patch (text/plain), 8.76 KB, created by Benjamin Jacobs on 2024-12-29 11:30:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Jacobs

Created: 2024-12-29 11:30:51 UTC

Size: 8.76 KB

patch

obsolete

>From e2dc52c3f51f70f9eb1ed71e34429ec180b517bb Mon Sep 17 00:00:00 2001
>From: Benjamin Jacobs <freebsd@dev.thsi.be>
>Date: Tue, 24 Dec 2024 14:37:55 +0000
>Subject: [PATCH] devel/ocaml-extlib: Update to 1.8.0, improve port
>
>Switch from USE_OCAMLFIND_PLIST to a static packing list.
>Switch to USES+=ocaml:dune.
>Strip shared library.
>Drop undue CAMLP4 dependency.
>Add test target.
>---
> devel/ocaml-extlib/Makefile             |  30 +++---
> devel/ocaml-extlib/distinfo             |   6 +-
> devel/ocaml-extlib/files/patch-src_dune |  11 ++
> devel/ocaml-extlib/pkg-plist            | 135 ++++++++++++++++++++++++
> 4 files changed, 163 insertions(+), 19 deletions(-)
> create mode 100644 devel/ocaml-extlib/files/patch-src_dune
> create mode 100644 devel/ocaml-extlib/pkg-plist
>
>diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
>index 2dc6c7cf7468..01ec1d361991 100644
>--- a/devel/ocaml-extlib/Makefile
>+++ b/devel/ocaml-extlib/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	extlib
>-DISTVERSION=	1.7.9
>-PORTREVISION=	3
>+DISTVERSION=	1.8.0
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ygrek/ocaml-extlib/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>@@ -10,32 +9,31 @@ COMMENT=	Complete - yet small - standard library for OCaml
> WWW=		https://github.com/ygrek/ocaml-extlib
> 
> LICENSE=	LGPL21
>-LICENSE_FILE=	${WRKSRC}/../LICENSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BROKEN_mips=	depends on Ocaml(not available for mips)
> 
> BUILD_DEPENDS=	cppo:devel/ocaml-cppo
> 
>-USES=		gmake
>+USES=		ocaml:dune
> 
> USE_OCAML=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
>-MAKE_ARGS=	VERSION="${DISTVERSION}"
>-ALL_TARGET=	all opt doc
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+PORTDOCS=	CHANGES LICENSE README.md
> 
>-WRKSRC_SUBDIR=	src
>+OPTIONS_DEFINE=	DOCS
> 
>-PORTDOCS=	*
>+post-patch:
>+	@${REINPLACE_CMD} -e 's/(name extlib)/&\n(version ${DISTVERSION})/' \
>+		${WRKSRC}/dune-project
> 
>-OPTIONS_DEFINE=	DOCS
>+post-install:
>+	${STRIP_CMD} \
>+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/${PORTNAME}.cmxs
> 
>-post-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
>+do-test:
>+	cd ${TEST_WRKSRC} && \
>+		${SETENVI} ${TEST_ENV} ${DUNE_ENV} ${DUNE_CMD} build ${DUNE_ARGS} @runtest
> 
> .include <bsd.port.mk>
>diff --git a/devel/ocaml-extlib/distinfo b/devel/ocaml-extlib/distinfo
>index f249f41a511f..33f8040c4980 100644
>--- a/devel/ocaml-extlib/distinfo
>+++ b/devel/ocaml-extlib/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1665263042
>-SHA256 (extlib-1.7.9.tar.gz) = 58de4dde016deb00b4f33956ab9697282f4e607c6452e3d38f8e116405ffcdcb
>-SIZE (extlib-1.7.9.tar.gz) = 91090
>+TIMESTAMP = 1735049861
>+SHA256 (extlib-1.8.0.tar.gz) = 964277f001280a8eddfc08e0701d59ca0c6bdc5d052313b3e40e5088f6d45d70
>+SIZE (extlib-1.8.0.tar.gz) = 90143
>diff --git a/devel/ocaml-extlib/files/patch-src_dune b/devel/ocaml-extlib/files/patch-src_dune
>new file mode 100644
>index 000000000000..9d163fc8db31
>--- /dev/null
>+++ b/devel/ocaml-extlib/files/patch-src_dune
>@@ -0,0 +1,11 @@
>+--- src/dune.orig	2024-12-24 20:05:03 UTC
>++++ src/dune
>+@@ -1,7 +1,7 @@
>+ (library
>+  (name extlib)
>+  (public_name extlib)
>+- (modules :standard \ configure install base64 unzip uChar uTF8)
>++ (modules :standard \ configure install)
>+  (flags :standard -w -3-6-9-27-32-33-35-39-50)
>+  (preprocess
>+   (action
>diff --git a/devel/ocaml-extlib/pkg-plist b/devel/ocaml-extlib/pkg-plist
>new file mode 100644
>index 000000000000..850a737bb82d
>--- /dev/null
>+++ b/devel/ocaml-extlib/pkg-plist
>@@ -0,0 +1,135 @@
>+%%OCAML_SITELIBDIR%%/extlib/IO.ml
>+%%OCAML_SITELIBDIR%%/extlib/IO.mli
>+%%OCAML_SITELIBDIR%%/extlib/META
>+%%OCAML_SITELIBDIR%%/extlib/base64.cmi
>+%%OCAML_SITELIBDIR%%/extlib/base64.cmt
>+%%OCAML_SITELIBDIR%%/extlib/base64.cmti
>+%%OCAML_SITELIBDIR%%/extlib/base64.cmx
>+%%OCAML_SITELIBDIR%%/extlib/base64.ml
>+%%OCAML_SITELIBDIR%%/extlib/base64.mli
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.cmi
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.cmt
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.cmti
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.cmx
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.ml
>+%%OCAML_SITELIBDIR%%/extlib/bitSet.mli
>+%%OCAML_SITELIBDIR%%/extlib/dllist.cmi
>+%%OCAML_SITELIBDIR%%/extlib/dllist.cmt
>+%%OCAML_SITELIBDIR%%/extlib/dllist.cmti
>+%%OCAML_SITELIBDIR%%/extlib/dllist.cmx
>+%%OCAML_SITELIBDIR%%/extlib/dllist.ml
>+%%OCAML_SITELIBDIR%%/extlib/dllist.mli
>+%%OCAML_SITELIBDIR%%/extlib/dune-package
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.cmi
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.cmt
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.cmti
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.cmx
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.ml
>+%%OCAML_SITELIBDIR%%/extlib/dynArray.mli
>+%%OCAML_SITELIBDIR%%/extlib/enum.cmi
>+%%OCAML_SITELIBDIR%%/extlib/enum.cmt
>+%%OCAML_SITELIBDIR%%/extlib/enum.cmti
>+%%OCAML_SITELIBDIR%%/extlib/enum.cmx
>+%%OCAML_SITELIBDIR%%/extlib/enum.ml
>+%%OCAML_SITELIBDIR%%/extlib/enum.mli
>+%%OCAML_SITELIBDIR%%/extlib/extArray.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extArray.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extArray.cmti
>+%%OCAML_SITELIBDIR%%/extlib/extArray.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extArray.ml
>+%%OCAML_SITELIBDIR%%/extlib/extArray.mli
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.cmti
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.ml
>+%%OCAML_SITELIBDIR%%/extlib/extBuffer.mli
>+%%OCAML_SITELIBDIR%%/extlib/extBytes.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extBytes.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extBytes.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extBytes.ml
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.cmti
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.ml
>+%%OCAML_SITELIBDIR%%/extlib/extHashtbl.mli
>+%%OCAML_SITELIBDIR%%/extlib/extLib.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extLib.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extLib.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extLib.ml
>+%%OCAML_SITELIBDIR%%/extlib/extList.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extList.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extList.cmti
>+%%OCAML_SITELIBDIR%%/extlib/extList.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extList.ml
>+%%OCAML_SITELIBDIR%%/extlib/extList.mli
>+%%OCAML_SITELIBDIR%%/extlib/extString.cmi
>+%%OCAML_SITELIBDIR%%/extlib/extString.cmt
>+%%OCAML_SITELIBDIR%%/extlib/extString.cmti
>+%%OCAML_SITELIBDIR%%/extlib/extString.cmx
>+%%OCAML_SITELIBDIR%%/extlib/extString.ml
>+%%OCAML_SITELIBDIR%%/extlib/extString.mli
>+%%OCAML_SITELIBDIR%%/extlib/extlib.a
>+%%OCAML_SITELIBDIR%%/extlib/extlib.cma
>+%%OCAML_SITELIBDIR%%/extlib/extlib.cmxa
>+%%OCAML_SITELIBDIR%%/extlib/extlib.cmxs
>+%%OCAML_SITELIBDIR%%/extlib/global.cmi
>+%%OCAML_SITELIBDIR%%/extlib/global.cmt
>+%%OCAML_SITELIBDIR%%/extlib/global.cmti
>+%%OCAML_SITELIBDIR%%/extlib/global.cmx
>+%%OCAML_SITELIBDIR%%/extlib/global.ml
>+%%OCAML_SITELIBDIR%%/extlib/global.mli
>+%%OCAML_SITELIBDIR%%/extlib/iO.cmi
>+%%OCAML_SITELIBDIR%%/extlib/iO.cmt
>+%%OCAML_SITELIBDIR%%/extlib/iO.cmti
>+%%OCAML_SITELIBDIR%%/extlib/iO.cmx
>+%%OCAML_SITELIBDIR%%/extlib/opam
>+%%OCAML_SITELIBDIR%%/extlib/optParse.cmi
>+%%OCAML_SITELIBDIR%%/extlib/optParse.cmt
>+%%OCAML_SITELIBDIR%%/extlib/optParse.cmti
>+%%OCAML_SITELIBDIR%%/extlib/optParse.cmx
>+%%OCAML_SITELIBDIR%%/extlib/optParse.ml
>+%%OCAML_SITELIBDIR%%/extlib/optParse.mli
>+%%OCAML_SITELIBDIR%%/extlib/option.cmi
>+%%OCAML_SITELIBDIR%%/extlib/option.cmt
>+%%OCAML_SITELIBDIR%%/extlib/option.cmti
>+%%OCAML_SITELIBDIR%%/extlib/option.cmx
>+%%OCAML_SITELIBDIR%%/extlib/option.ml
>+%%OCAML_SITELIBDIR%%/extlib/option.mli
>+%%OCAML_SITELIBDIR%%/extlib/pMap.cmi
>+%%OCAML_SITELIBDIR%%/extlib/pMap.cmt
>+%%OCAML_SITELIBDIR%%/extlib/pMap.cmti
>+%%OCAML_SITELIBDIR%%/extlib/pMap.cmx
>+%%OCAML_SITELIBDIR%%/extlib/pMap.ml
>+%%OCAML_SITELIBDIR%%/extlib/pMap.mli
>+%%OCAML_SITELIBDIR%%/extlib/refList.cmi
>+%%OCAML_SITELIBDIR%%/extlib/refList.cmt
>+%%OCAML_SITELIBDIR%%/extlib/refList.cmti
>+%%OCAML_SITELIBDIR%%/extlib/refList.cmx
>+%%OCAML_SITELIBDIR%%/extlib/refList.ml
>+%%OCAML_SITELIBDIR%%/extlib/refList.mli
>+%%OCAML_SITELIBDIR%%/extlib/std.cmi
>+%%OCAML_SITELIBDIR%%/extlib/std.cmt
>+%%OCAML_SITELIBDIR%%/extlib/std.cmti
>+%%OCAML_SITELIBDIR%%/extlib/std.cmx
>+%%OCAML_SITELIBDIR%%/extlib/std.ml
>+%%OCAML_SITELIBDIR%%/extlib/std.mli
>+%%OCAML_SITELIBDIR%%/extlib/uChar.cmi
>+%%OCAML_SITELIBDIR%%/extlib/uChar.cmt
>+%%OCAML_SITELIBDIR%%/extlib/uChar.cmti
>+%%OCAML_SITELIBDIR%%/extlib/uChar.cmx
>+%%OCAML_SITELIBDIR%%/extlib/uChar.ml
>+%%OCAML_SITELIBDIR%%/extlib/uChar.mli
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.cmi
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.cmt
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.cmti
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.cmx
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.ml
>+%%OCAML_SITELIBDIR%%/extlib/uTF8.mli
>+%%OCAML_SITELIBDIR%%/extlib/unzip.cmi
>+%%OCAML_SITELIBDIR%%/extlib/unzip.cmt
>+%%OCAML_SITELIBDIR%%/extlib/unzip.cmti
>+%%OCAML_SITELIBDIR%%/extlib/unzip.cmx
>+%%OCAML_SITELIBDIR%%/extlib/unzip.ml
>+%%OCAML_SITELIBDIR%%/extlib/unzip.mli
>-- 
>2.43.0
>

Flags:

eduardo: maintainer-approval+
eduardo: maintainer-approval+
eduardo: maintainer-approval+

Actions: View | Diff

Attachments on bug 283719: 256262