From nobody Mon Apr 25 06:57:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9401A1A8A9CE; Mon, 25 Apr 2022 06:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KmwnX385lz4vXn; Mon, 25 Apr 2022 06:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650869872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uR0zCNB4SLgeFJ0CMTiSztBf5cNkm9OQHV2xg2KcSsI=; b=Lvm4osT8UkyZFhi9l7FXJtJFrBR3JvREH22TM9mXyWnf76OpyOvOhtMOziYWj6Bvs5l4Qh v8jIZDMSqTfT/yi+c6rVAJwEjw1zJ9CV78j8aazK63NO4xRmMECDuimnnf5wyKbTEtcqZA YCWCqGnMtYxV5qRNLQsxnEPYTtcBjgZO8+JUC7hpE7+T9HWKa54XUdd7kZvRpU0XIO0rLn Z+MYmxbYgxLf5uq3bA6dGBeHycHSevn53VTVtFwhBx6ssFk4jWv0FvkE3op26zhnRIaA/P 50GtfaSsqKrzROwliW6o1y0qcQb+hejr44co9ZGDeDUTKmfdE8xG3MK/VrPJTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47D33161B9; Mon, 25 Apr 2022 06:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23P6vqlA025681; Mon, 25 Apr 2022 06:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P6vqn1025680; Mon, 25 Apr 2022 06:57:52 GMT (envelope-from git) Date: Mon, 25 Apr 2022 06:57:52 GMT Message-Id: <202204250657.23P6vqn1025680@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3a710a0c04d6 - main - devel/ocaml-findlib: the port had been updated to version 1.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a710a0c04d680983779abc5152ad72a4122c833 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650869872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uR0zCNB4SLgeFJ0CMTiSztBf5cNkm9OQHV2xg2KcSsI=; b=G9AWJkWHdl3NUOrX2/7PjaurexLk0PvTdo07HGbW9Y7sBFYhuPALAoHEF6hzl9ltVhnncG DxsPWSp4ZYwnoZANcaU9zP0m9Z58YjMgMJ0jIZ/tmi+gBqFu1Ev+PmGTWC1Xyyqp166H8W T1hjVFvjC1wi+7vJzE4jdrUNKMMBtWRzF3Zv6APqppbRL11dAxU593gobtX7bHcmpCj072 SlOaxGodj7AdAMBA8MiWgtAoz5acjBcbP19yPGjwz19eb4Bb+1oQ81nqY+lnt6mBiNeshc wpW1wVErRyBQO54cEBPZ7FMepq7agCerGeKg84sPKGpCzmiqp4baPzKu6WyqGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650869872; a=rsa-sha256; cv=none; b=jHMcKDrnAMN2l37GXRfxLutZWJOb6taTeUIqxes4LN9BLI/hUCJdj3o1Irgt/3jHA8dPkP Ca/IluGY7AlvXaKPvStkgcgzEAvULPGW/SA8XYRI672iEBv75p6CRqgrvMrS1XYiDsCtls irbBGkoeBhKFLsTd8ujlEjM0GBVvI/PUOCnios/XC1rezB9PISq0AUWcVvP9+XXWedA5XT Fmao65R7rTv5HRO3yXpWoP6xZB2NEVs3+YATxCnTbq+Gbr9fj+sVkJBr6m7LXrqPwmJiK0 WSBlUnr0nsV8di8hxGkRcH7qOdM497l+xNhKrZfdU86j0d/buxEhlE85D8zAFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a710a0c04d680983779abc5152ad72a4122c833 commit 3a710a0c04d680983779abc5152ad72a4122c833 Author: Alexey Dokuchaev AuthorDate: 2022-04-25 06:54:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-25 06:54:24 +0000 devel/ocaml-findlib: the port had been updated to version 1.8.1 - This is not the latest version, but this step lubricates coming next phase of our OCaml stack update - Since we're post-4.06 now, remove support for Num library which is a separate port/package - Detect optionally installed libraries and adjust the packaging list accordingly - Spell `Tk' correctly in the TOOLBOX option description PR: 238904, 262791 --- devel/ocaml-findlib/Makefile | 17 ++++++++--------- devel/ocaml-findlib/distinfo | 6 +++--- devel/ocaml-findlib/files/patch-configure | 12 ------------ devel/ocaml-findlib/files/patch-src_findlib_Makefile | 2 +- devel/ocaml-findlib/pkg-plist | 6 +----- 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index e9d8817fd437..89149dcb09d3 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,7 +1,7 @@ # Created by: ijliao PORTNAME= findlib -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -27,18 +27,11 @@ MAKE_JOBS_UNSAFE= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} PORTDOCS= * -# Num library is not part of OCaml core since v4.06 -.if exists(${LOCALBASE}/lib/ocaml/num.cmi) -PLIST_SUB+= NUM="" -.else -PLIST_SUB+= NUM="@comment " -.endif - OPTIONS_DEFINE= TOOLBOX DOCS OPTIONS_DEFAULT=TOOLBOX OPTIONS_SUB= yes -TOOLBOX_DESC= Include toolbox interface (requires OCaml with TK) +TOOLBOX_DESC= Include toolbox interface (requires OCaml with Tk) TOOLBOX_CONFIGURE_ON= -with-toolbox TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} @@ -51,6 +44,12 @@ post-install: ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs +.if !exists(${LOCALBASE}/lib/ocaml/graphics.cmi) + @${REINPLACE_CMD} -e '/graphics\/META/d' ${TMPPLIST} +.endif +.if !exists(${LOCALBASE}/lib/ocaml/ocamlbuild/ocamlbuildlib.cma) + @${REINPLACE_CMD} -e '/ocamlbuild\/META/d' ${TMPPLIST} +.endif # Spacetime profiling is only available for native code on 64-bit targets .if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpcspe @${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST} diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo index 967f18478c77..f83e1fbb2219 100644 --- a/devel/ocaml-findlib/distinfo +++ b/devel/ocaml-findlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496673173 -SHA256 (findlib-1.7.3.tar.gz) = d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b -SIZE (findlib-1.7.3.tar.gz) = 257703 +TIMESTAMP = 1564402014 +SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303 +SIZE (findlib-1.8.1.tar.gz) = 261544 diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure deleted file mode 100644 index 4b41a7aba575..000000000000 --- a/devel/ocaml-findlib/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig 2016-11-18 13:04:45 UTC -+++ configure -@@ -516,7 +516,8 @@ fi - - # bytes? - --if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then -+if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \ -+ -f "${ocaml_core_stdlib}/stdlib__bytes.cmi" ]; then - echo "bytes: found, installing fake library" - lbytes="bytes" - cbytes=0 diff --git a/devel/ocaml-findlib/files/patch-src_findlib_Makefile b/devel/ocaml-findlib/files/patch-src_findlib_Makefile index ed355991105d..b370954773a3 100644 --- a/devel/ocaml-findlib/files/patch-src_findlib_Makefile +++ b/devel/ocaml-findlib/files/patch-src_findlib_Makefile @@ -18,7 +18,7 @@ + mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" + mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index f9614c2d3703..fe8db7125078 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -35,11 +35,7 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/findlib/topfind.mli %%OCAML_SITELIBDIR%%/graphics/META %%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META -%%NUM%%%%OCAML_SITELIBDIR%%/num-top/META -%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cma -%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top.cmi -%%NUM%%%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi -%%NUM%%%%OCAML_SITELIBDIR%%/num/META +%%OCAML_SITELIBDIR%%/ocamlbuild/META %%OCAML_SITELIBDIR%%/ocamldoc/META %%OCAML_SITELIBDIR%%/raw_spacetime/META %%OCAML_SITELIBDIR%%/stdlib/META