Attachment 257529 Details for Bug 283712 – ocaml-pcre.patch

[patch] ocaml-pcre.patch

ocaml-pcre.patch (text/plain), 4.23 KB, created by Benjamin Jacobs on 2025-02-14 15:07:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Jacobs

Created: 2025-02-14 15:07:02 UTC

Size: 4.23 KB

patch

obsolete

>From c056a2f612869e8f7048604523f38977e71ee2f5 Mon Sep 17 00:00:00 2001
>From: Benjamin Jacobs <freebsd@dev.thsi.be>
>Date: Sun, 5 Jan 2025 12:15:44 +0000
>Subject: [PATCH] devel/ocaml-pcre: Update to 8.0.2, improve port
>
>Switch from USE_GITHUB to MASTER_SITES.
>Update WWW.
>Switch to USES+=ocaml:dune and drop ocaml-findlib dependency.
>Build examples.
>
>PR:             283712
>---
> devel/ocaml-pcre/Makefile  | 31 ++++++++++++-------------------
> devel/ocaml-pcre/distinfo  |  5 +++--
> devel/ocaml-pcre/pkg-plist | 13 +++++++++++--
> 3 files changed, 26 insertions(+), 23 deletions(-)
>
>diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
>index efcc34b0567a..287f195dc192 100644
>--- a/devel/ocaml-pcre/Makefile
>+++ b/devel/ocaml-pcre/Makefile
>@@ -1,31 +1,28 @@
> PORTNAME=	pcre
>-PORTVERSION=	7.2.3
>-DISTVERSIONPREFIX=	v
>-PORTREVISION=	4
>+DISTVERSION=	8.0.2
> CATEGORIES=	devel
>+MASTER_SITES=	https://github.com/mmottl/pcre-ocaml/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Perl compatible regular expressions for Objective Caml
>-WWW=		http://www.ocaml.info/home/ocaml_sources.html #pcre-ocaml
>+WWW=		https://mmottl.github.io/pcre-ocaml/
> 
> LICENSE=	LGPL21
> 
>-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-USES=		ocaml:findlib,ldconfig
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	mmottl
>-GH_PROJECT=	${PORTNAME}-ocaml
>+USES=		ocaml:dune,ldconfig pkgconfig:build tar:tbz
>+DUNE_BUILD_ARGS=	@install
> 
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-PORTEXAMPLES=	cloc count_hash pcregrep subst
>-DOCSDIR=	${PREFIX}/share/doc/pcre-ocaml
>-PORTDOCS=	api
>+PORTEXAMPLES=	cloc.exe count_hash.exe pcregrep.exe subst.exe
>+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+PORTDOCS=	CHANGES.md LICENSE.md README.md
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
>-DOCS_CONFIGURE_OFF=	--disable-docs
>+
>+EXAMPLES_VARS=	${PORTEXAMPLES:@ex@dune_build_args+=examples/${ex}@}
> 
> .include <bsd.port.options.mk>
> 
>@@ -33,12 +30,6 @@ DOCS_CONFIGURE_OFF=	--disable-docs
> USE_BINUTILS=	yes
> .endif
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \
>-	    -e '/datarootdir/s|$$pkg_name|&-ocaml|' \
>-	    ${WRKSRC}/setup.ml
>-	${REINPLACE_CMD} -e 's| safe_string,||' ${WRKSRC}/_tags
>-
> post-install:
> 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
> 	    lib/ocaml/site-lib/pcre/dllpcre_stubs.so \
>@@ -47,5 +38,7 @@ post-install:
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/_build/default/examples && \
>+		${INSTALL_PROGRAM} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>diff --git a/devel/ocaml-pcre/distinfo b/devel/ocaml-pcre/distinfo
>index fc53bbdc76da..c3fbade54eb6 100644
>--- a/devel/ocaml-pcre/distinfo
>+++ b/devel/ocaml-pcre/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (mmottl-pcre-ocaml-v7.2.3_GH0.tar.gz) = 6339694dbeb706c5097180ed1d79b2dae681bf155a4780a7909af49b0e6f4666
>-SIZE (mmottl-pcre-ocaml-v7.2.3_GH0.tar.gz) = 88307
>+TIMESTAMP = 1739528376
>+SHA256 (pcre-8.0.2.tbz) = 2c19d365b98d99c66b6dc50ad7ea03fc7cfe62a0a60c2b7f5f6cf8e5b268bffe
>+SIZE (pcre-8.0.2.tbz) = 41666
>diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist
>index a76b354b4580..82f3642d2c6c 100644
>--- a/devel/ocaml-pcre/pkg-plist
>+++ b/devel/ocaml-pcre/pkg-plist
>@@ -1,8 +1,9 @@
> %%OCAML_SITELIBDIR%%/pcre/META
> %%OCAML_SITELIBDIR%%/pcre/dllpcre_stubs.so
>+%%OCAML_SITELIBDIR%%/pcre/dune-package
> %%OCAML_SITELIBDIR%%/pcre/libpcre_stubs.a
>+%%OCAML_SITELIBDIR%%/pcre/opam
> %%OCAML_SITELIBDIR%%/pcre/pcre.a
>-%%OCAML_SITELIBDIR%%/pcre/pcre.annot
> %%OCAML_SITELIBDIR%%/pcre/pcre.cma
> %%OCAML_SITELIBDIR%%/pcre/pcre.cmi
> %%OCAML_SITELIBDIR%%/pcre/pcre.cmt
>@@ -10,5 +11,13 @@
> %%OCAML_SITELIBDIR%%/pcre/pcre.cmx
> %%OCAML_SITELIBDIR%%/pcre/pcre.cmxa
> %%OCAML_SITELIBDIR%%/pcre/pcre.cmxs
>+%%OCAML_SITELIBDIR%%/pcre/pcre.ml
> %%OCAML_SITELIBDIR%%/pcre/pcre.mli
>-%%OCAML_SITELIBDIR%%/pcre/pcre_compat.cmx
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc.ml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash.ml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dfa_restart.ml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dune
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep.ml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst.ml
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 283712: 256254 | 257529