Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Oct 2024 11:03:47 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7cccd95f18ed - main - devel/ocaml-ounit: Update to 2.2.7
Message-ID:  <202410131103.49DB3l2Z075796@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=7cccd95f18edd06d58c30ebc3925fc4e31149789

commit 7cccd95f18edd06d58c30ebc3925fc4e31149789
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-10-13 10:59:02 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-10-13 11:03:42 +0000

    devel/ocaml-ounit: Update to 2.2.7
    
    Assign maintainership to submitter [1]
    
    PR:             282026, 262794
---
 devel/ocaml-ounit/Makefile                         |  44 +++---
 devel/ocaml-ounit/distinfo                         |   5 +-
 .../files/patch-src_lib_ounit2_advanced_dune       |   8 ++
 devel/ocaml-ounit/files/patch-src_lib_ounit2_dune  |  11 ++
 devel/ocaml-ounit/pkg-plist                        | 152 +++++++++++++++++++--
 5 files changed, 184 insertions(+), 36 deletions(-)

diff --git a/devel/ocaml-ounit/Makefile b/devel/ocaml-ounit/Makefile
index 79475f6783fe..acad8e346edb 100644
--- a/devel/ocaml-ounit/Makefile
+++ b/devel/ocaml-ounit/Makefile
@@ -1,34 +1,40 @@
 PORTNAME=	ounit
-PORTVERSION=	1.0.3
-PORTREVISION=	5
+DISTVERSION=	2.2.7
 CATEGORIES=	devel
-MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
+MASTER_SITES=	https://github.com/gildor478/${PORTNAME}/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	OCaml unit test framework
-WWW=		http://home.wanadoo.nl/maas/ocaml
+WWW=		https://gildor478.github.io/ounit
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENCE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		gmake
+USES=		ocaml:dune tar:tbz
 USE_OCAML=	yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
-OCAML_PKGDIRS=	oUnit
-ALL_TARGET=	all allopt testall doc
-MAKE_ENV=	OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib
+OCAML_PACKAGES=	ounit2
+DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${OCAML_DOCSDIR}
+PORTDOCS=	${OCAML_PACKAGES:@p@\
+		$p/CHANGES.md $p/LICENSE.txt $p/README.md $p/odoc-pages/index.mld@}
 
 OPTIONS_DEFINE=	DOCS
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/style.css ${STAGEDIR}${DOCSDIR}
-	${FIND} ${WRKSRC}/doc -type f -name "*.html" -exec \
-		${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/^(version v${DISTVERSION})/(version ${DISTVERSION})/" \
+		${WRKSRC}/dune-project
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ounit2/advanced/oUnitAdvanced.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ounit2/oUnit.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ounit2/threads/oUnitThreads.cmxs
+
+do-test:
+	@(cd ${TEST_WRKSRC} && \
+		${SETENVI} ${WRK_ENV} ${TEST_ENV} ${DUNE_ENV} ${DUNE_CMD} build ${DUNE_ARGS} @runtest)
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-ounit/distinfo b/devel/ocaml-ounit/distinfo
index 59030c7eede5..a5b80ddaf80c 100644
--- a/devel/ocaml-ounit/distinfo
+++ b/devel/ocaml-ounit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ounit-1.0.3.tar.gz) = 27c5084d67dcf600f7f8cc85e15bd828cefebdedbf3c39817d00541157a6fed8
-SIZE (ounit-1.0.3.tar.gz) = 13572
+TIMESTAMP = 1728735414
+SHA256 (ounit-2.2.7.tbz) = 90f6e63bd1240a51d8b9b2f722059bd79ce00b5276bdd6238b8f5c613c0e7388
+SIZE (ounit-2.2.7.tbz) = 58024
diff --git a/devel/ocaml-ounit/files/patch-src_lib_ounit2_advanced_dune b/devel/ocaml-ounit/files/patch-src_lib_ounit2_advanced_dune
new file mode 100644
index 000000000000..28d34b3ce4dd
--- /dev/null
+++ b/devel/ocaml-ounit/files/patch-src_lib_ounit2_advanced_dune
@@ -0,0 +1,8 @@
+--- src/lib/ounit2/advanced/dune.orig	2024-10-11 22:19:46 UTC
++++ src/lib/ounit2/advanced/dune
+@@ -11,4 +11,4 @@
+  (name oUnitAdvanced)
+  (public_name ounit2.advanced)
+  (wrapped false)
+- (libraries unix seq stdlib-shims))
++ (libraries unix))
diff --git a/devel/ocaml-ounit/files/patch-src_lib_ounit2_dune b/devel/ocaml-ounit/files/patch-src_lib_ounit2_dune
new file mode 100644
index 000000000000..e5ffca10ae94
--- /dev/null
+++ b/devel/ocaml-ounit/files/patch-src_lib_ounit2_dune
@@ -0,0 +1,11 @@
+--- src/lib/ounit2/dune.orig	2024-10-11 22:19:55 UTC
++++ src/lib/ounit2/dune
+@@ -2,7 +2,7 @@
+  (name oUnit)
+  (public_name ounit2)
+  (wrapped false)
+- (libraries unix seq ounit2.advanced))
++ (libraries unix ounit2.advanced))
+ 
+ (documentation
+  (package ounit2)
diff --git a/devel/ocaml-ounit/pkg-plist b/devel/ocaml-ounit/pkg-plist
index aa58afb5bd29..909b75241ae3 100644
--- a/devel/ocaml-ounit/pkg-plist
+++ b/devel/ocaml-ounit/pkg-plist
@@ -1,15 +1,137 @@
-%%PORTDOCS%%%%DOCSDIR%%/OUnit.html
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index_attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/index_class_types.html
-%%PORTDOCS%%%%DOCSDIR%%/index_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/index_exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/index_extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/index_methods.html
-%%PORTDOCS%%%%DOCSDIR%%/index_module_types.html
-%%PORTDOCS%%%%DOCSDIR%%/index_modules.html
-%%PORTDOCS%%%%DOCSDIR%%/index_types.html
-%%PORTDOCS%%%%DOCSDIR%%/index_values.html
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/type_OUnit.html
+%%OCAML_SITELIBDIR%%/ounit2/META
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAdvanced.a
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAdvanced.cma
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAdvanced.cmxa
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAdvanced.cmxs
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAssert.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAssert.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAssert.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitAssert.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitBracket.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitBracket.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitBracket.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitBracket.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCache.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCache.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCache.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCache.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCheckEnv.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCheckEnv.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCheckEnv.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCheckEnv.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitChooser.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitChooser.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitChooser.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitChooser.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitConf.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitConf.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitConf.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitConf.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCore.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCore.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCore.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitCore.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.cmti
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitDiff.mli
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLogger.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLogger.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLogger.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLogger.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerCI.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerCI.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerCI.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerCI.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTML.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTML.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTML.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTML.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTMLData.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTMLData.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTMLData.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerHTMLData.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerJUnit.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerJUnit.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerJUnit.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerJUnit.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerStd.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerStd.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerStd.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitLoggerStd.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPlugin.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPlugin.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPlugin.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPlugin.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPropList.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPropList.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPropList.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitPropList.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitResultSummary.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitResultSummary.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitResultSummary.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitResultSummary.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunner.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunner.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunner.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunner.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunnerProcesses.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunnerProcesses.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunnerProcesses.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitRunnerProcesses.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitShared.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitShared.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitShared.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitShared.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitState.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitState.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitState.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitState.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTest.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTest.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTest.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTest.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTestData.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTestData.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTestData.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitTestData.ml
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitUtils.cmi
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitUtils.cmt
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitUtils.cmx
+%%OCAML_SITELIBDIR%%/ounit2/advanced/oUnitUtils.ml
+%%OCAML_SITELIBDIR%%/ounit2/dune-package
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.a
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cma
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmi
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmt
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmti
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmx
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmxa
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.cmxs
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.ml
+%%OCAML_SITELIBDIR%%/ounit2/oUnit.mli
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.cmi
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.cmt
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.cmti
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.cmx
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.ml
+%%OCAML_SITELIBDIR%%/ounit2/oUnit2.mli
+%%OCAML_SITELIBDIR%%/ounit2/opam
+%%OCAML_SITELIBDIR%%/ounit2/threads/.private/oUnitThreads__OUnitRunnerThreads.cmi
+%%OCAML_SITELIBDIR%%/ounit2/threads/.private/oUnitThreads__OUnitRunnerThreads.cmt
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitRunnerThreads.ml
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.a
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cma
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cmi
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cmt
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cmx
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cmxa
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.cmxs
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads.ml
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads__.cmi
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads__.cmt
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads__.cmx
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads__.ml
+%%OCAML_SITELIBDIR%%/ounit2/threads/oUnitThreads__OUnitRunnerThreads.cmx



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