Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Aug 2024 19:11:52 GMT
From:      Zsolt Udvari <uzsolt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5743ea29ee31 - main - archivers/ocaml-bz2: update to 0.8.0
Message-ID:  <202408091911.479JBqIf066585@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5743ea29ee31592adc4c561b2161593503346d8e

commit 5743ea29ee31592adc4c561b2161593503346d8e
Author:     Benjamin Jacobs <freebsd@dev.thsi.be>
AuthorDate: 2024-08-09 19:07:21 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-08-09 19:11:36 +0000

    archivers/ocaml-bz2: update to 0.8.0
    
    Use ocaml:dune.
    Add DOCS and EXAMPLES options.
    Update WWW, using GITLAB.
    Submitter takes maintainership.
    Switch to DISTVERSION.
    
    PR:             280294
---
 archivers/ocaml-bz2/Makefile                 | 41 +++++++++++++---------------
 archivers/ocaml-bz2/distinfo                 |  5 ++--
 archivers/ocaml-bz2/files/patch-dune-project | 17 ++++++++++++
 archivers/ocaml-bz2/files/patch-src_dune     | 10 +++++++
 archivers/ocaml-bz2/pkg-plist                | 15 ++++++++++
 5 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile
index 1e4534fc2922..02bbbf0630e0 100644
--- a/archivers/ocaml-bz2/Makefile
+++ b/archivers/ocaml-bz2/Makefile
@@ -1,39 +1,36 @@
 PORTNAME=	bz2
-PORTVERSION=	0.6.0
-PORTREVISION=	5
+DISTVERSION=	0.8.0
 CATEGORIES=	archivers
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/72/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	caml${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	OCaml library to manipulate bz2 files
-WWW=		http://camlbz2.forge.ocamlcore.org
+WWW=		https://gitlab.com/irill/camlbz2
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-OPTIONS_DEFINE=	DOCS
-
-DESTDIRNAME=	DONTUSEIT
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-USE_OCAML=		yes
-USE_OCAML_FINDLIB=	yes
+USES=		ocaml:dune
+USE_GITLAB=	yes
+GL_ACCOUNT=	irill
+GL_PROJECT=	camlbz2
+USE_OCAML=	yes
 USE_OCAML_LDCONFIG=	yes
-USE_OCAML_WASH=		yes
-USE_OCAMLFIND_PLIST=	yes
-USES=		gmake
 
-PORTDOCS=	*
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
+PORTDOCS=	LICENSE README
+PORTEXAMPLES=	bunzip2.ml
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/bz2/dllcamlbz2.so
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/bz2/bz2.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/bz2/dllbz2_stubs.so
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/archivers/ocaml-bz2/distinfo b/archivers/ocaml-bz2/distinfo
index 9b6c33e47053..3f2200c94c3d 100644
--- a/archivers/ocaml-bz2/distinfo
+++ b/archivers/ocaml-bz2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (camlbz2-0.6.0.tar.gz) = 8154b4e4699c48e14b4dd56cf839a0c10345e9860eb967066be040d432ae7388
-SIZE (camlbz2-0.6.0.tar.gz) = 57771
+TIMESTAMP = 1717326878
+SHA256 (camlbz2-0.8.0.tar.bz2) = 76bfddcb8922ead8e7dfab9e1203ff4ae1f1bd7d7d8a1ec802230f49912338f2
+SIZE (camlbz2-0.8.0.tar.bz2) = 16560
diff --git a/archivers/ocaml-bz2/files/patch-dune-project b/archivers/ocaml-bz2/files/patch-dune-project
new file mode 100644
index 000000000000..22a574319397
--- /dev/null
+++ b/archivers/ocaml-bz2/files/patch-dune-project
@@ -0,0 +1,17 @@
+--- dune-project.orig	2024-02-21 17:20:18 UTC
++++ dune-project
+@@ -1,6 +1,6 @@
+ (lang dune 2.8)
+ (name bz2)
+-(version 0.7.1)
++(version 0.8.0)
+ (generate_opam_files true)
+ (formatting (enabled_for ocaml dune))
+ (license "LGPL-3.0-or-later with OCaml-LGPL-linking-exception")
+@@ -15,5 +15,5 @@
+  (name bz2)
+  (synopsis "CamlBZ2 OCaml bindings for the libbz2")
+  (description "This is CamlBZ2, OCaml bindings for the libbz2 (AKA, bzip2)(de)compression library.")
+- (depends "conf-libbz2" "stdlib-shims")
++ (depends "conf-libbz2")
+ )
diff --git a/archivers/ocaml-bz2/files/patch-src_dune b/archivers/ocaml-bz2/files/patch-src_dune
new file mode 100644
index 000000000000..7ccbe54991af
--- /dev/null
+++ b/archivers/ocaml-bz2/files/patch-src_dune
@@ -0,0 +1,10 @@
+--- src/dune.orig	2024-02-21 17:20:18 UTC
++++ src/dune
+@@ -2,7 +2,6 @@
+  (public_name bz2)
+  (synopsis
+   "This is CamlBZ2, OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library.")
+- (libraries stdlib-shims)
+  (c_library_flags -lbz2)
+  (foreign_stubs
+   (language c)
diff --git a/archivers/ocaml-bz2/pkg-plist b/archivers/ocaml-bz2/pkg-plist
new file mode 100644
index 000000000000..b1a79603bb5c
--- /dev/null
+++ b/archivers/ocaml-bz2/pkg-plist
@@ -0,0 +1,15 @@
+%%OCAML_SITELIBDIR%%/bz2/META
+%%OCAML_SITELIBDIR%%/bz2/bz2.a
+%%OCAML_SITELIBDIR%%/bz2/bz2.cma
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmi
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmt
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmti
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmx
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmxa
+%%OCAML_SITELIBDIR%%/bz2/bz2.cmxs
+%%OCAML_SITELIBDIR%%/bz2/bz2.ml
+%%OCAML_SITELIBDIR%%/bz2/bz2.mli
+%%OCAML_SITELIBDIR%%/bz2/dllbz2_stubs.so
+%%OCAML_SITELIBDIR%%/bz2/dune-package
+%%OCAML_SITELIBDIR%%/bz2/libbz2_stubs.a
+%%OCAML_SITELIBDIR%%/bz2/opam



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408091911.479JBqIf066585>