From 8025aa10ceb960b62c9a826fb56eb1ac68ea1ce3 Mon Sep 17 00:00:00 2001 From: Benjamin Jacobs Date: Mon, 11 Mar 2024 22:43:46 +0100 Subject: lang/ocaml: Update to 4.14.1 The 'force-safe-string; setting is NOT enabled, as opposed to the new upstream default. OCaml users are encouraged to migrate to safe strings as soon as possible. - The X11 library isn't part of lang/ocaml anymore, users should install x11-toolkits/ocaml-graphics. - Add new 'ocaml' USES - Bump PORTREVISION on dependent ports, due to ABI Change. The update includes the following updates to existing ports (needed to keep them working): - devel/ocaml-camlp4: Updated to 4.14+1 - devel/ocaml-camlp5: Updated to 8.02.01, homepage updated - devel/ocaml-dune: Patch to allow overriding the stublibs directory, strip binary and shared libraries - devel/ocaml-findlib: Improve port - devel/ocaml-lwt: Fix build with OCaml 4.14 - deve/ocaml-re: Update to 1.11.0, use new dune USES - devel/ocaml-sdl: Fix build with new ocaml - games/freetennis: Fix build, tidy Makefile - graphics/ocaml-images: Updated to 5.0.4, new homepage, use new dune USES, undeprecate - graphics/ocaml-lablgl: Moved into site-lib, dynamic objects stripped, add missing GL dependencies - math/coq: Updated to 8.19.0 - math/ocaml-zarith: strip shared libraries, fixed usage of USE_OCAML_LDCONFIG, use new dune USES - math/teyjus: Fix build - net/unison240: Fix build with new compiler - net/unison248: Fix build with new compiler, add MAKE_JOBS_UNSAFE - net-p2p/mldonkey: Fix build with new compiler, fix build on i386 - sysutils/ledit: Updated to 2.06, install native binary, Use github, fix man page installation - www/geneweb: Build fix for OCaml and Camlp5 updates - x11-toolkits/ocaml-lablgtk2: Fix build with new compiler - x11-toolkits/ocaml-lablgtk3: Updated to 3.1.4, added ocaml-camlp-stream dependency, build fix patch - x11-toolkits/ocaml-labltk: Updated to 8.06.12, Improve Makefile Added the following ports: - devel/ocaml-astring - devel/ocaml-base - devel/ocaml-bos - devel/ocaml-camlp-streams - devel/ocaml-csexp - devel/ocaml-fmt - devel/ocaml-fpath - devel/ocaml-logs - devel/ocaml-mtime - devel/ocaml-pcre2 - devel/ocaml-rresult - devel/ocaml-seq - devel/ocaml-stdio - x11-toolkits/ocaml-graphics PR: 250408 [1], 262781 [1], 262788 [3], 262789 [1], 262792 [1], 263006 [1], 263162 [3], 263206 [2], 276893 [1], 276945 [4], 276953 [1], 277026 [5], 277241 [1], 277242 [1], 277243 [1], 277244 [1], 277245 [1], 277246 [1], 277247 [1], 277248 [1], 277249 [1], 277250 [1], 277251 [1], 277252 [1], 277253 [1], 277254 [1], 277255 [1], 277256 [4], 277257 [1], 277258 [1] Approved by: maintainer timeout [1], yuri (maintainer) [2], overcome by events, fixit [3], madpilot (maintainer) [4] Reviewed by: madpilot Exp-run by: antoine [5] Differential Revision: https://reviews.freebsd.org/D43861 --- devel/ocaml-findlib/Makefile | 25 ++++++++-------------- devel/ocaml-findlib/files/patch-configure | 12 +++++++++++ .../files/patch-src_findlib-toolbox_Makefile | 11 ++++++++++ devel/ocaml-findlib/pkg-plist | 4 ---- 4 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 devel/ocaml-findlib/files/patch-configure create mode 100644 devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile (limited to 'devel/ocaml-findlib') diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 8de85e2b19c5..f61db9ce2bce 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= findlib PORTVERSION= 1.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake USE_OCAML= yes USE_OCAML_CAMLP4=yes -USE_OCAML_FINDLIB=yes -OCAMLFIND_DEPEND= # Avoid dependency loop HAS_CONFIGURE= yes CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/share/man" \ -sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \ @@ -24,7 +22,7 @@ CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/share/man" \ MAKE_ENV= OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= TOOLBOX DOCS @@ -39,21 +37,16 @@ TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} .include post-install: - cd ${STAGEDIR}${PREFIX} && \ + # META files provided by the respective ocaml-* package, + # (those libraries used to be belong in the core ocaml + # compiler package). + @for oldlib in camlp4 graphics labltk ocamlbuild; \ + do ${RM} -r ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/$$oldlib ; done + @(cd ${STAGEDIR}${PREFIX} && \ ${STRIP_CMD} bin/ocamlfind \ ${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} -.endif + ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs) post-install-TOOLBOX-on: ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ diff --git a/devel/ocaml-findlib/files/patch-configure b/devel/ocaml-findlib/files/patch-configure new file mode 100644 index 000000000000..b70bddb841fd --- /dev/null +++ b/devel/ocaml-findlib/files/patch-configure @@ -0,0 +1,12 @@ +--- configure.orig 2024-03-01 00:17:41 UTC ++++ configure +@@ -457,9 +457,7 @@ if [ -d "${ocaml_sitelib}" ] && [ ${ocaml_major} -lt 5 + echo "Installation has: $findlib_installed_meta" + else + previous_config='' +- check_before_install=1 + echo "Querying installation: META list not found" +- echo "make install will double-check installed META files" + fi + else + previous_config='' diff --git a/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile new file mode 100644 index 000000000000..629b264f1aea --- /dev/null +++ b/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile @@ -0,0 +1,11 @@ +--- src/findlib-toolbox/Makefile.orig 2024-03-01 00:20:34 UTC ++++ src/findlib-toolbox/Makefile +@@ -9,7 +9,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.ml + true + + make_wizard$(EXEC_SUFFIX): make_wizard.ml +- ocamlc -o make_wizard$(EXEC_SUFFIX) -I +unix -I +labltk -I ../findlib \ ++ ocamlc -o make_wizard$(EXEC_SUFFIX) -I +unix -I +site-lib/labltk -I ../findlib \ + unix.cma str.cma labltk.cma findlib.cma make_wizard.ml + + install: diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index b30e436e3923..034467e6b8f1 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -3,7 +3,6 @@ bin/safe_camlp4 %%ETCDIR%%.conf %%OCAML_SITELIBDIR%%/bigarray/META %%OCAML_SITELIBDIR%%/bytes/META -%%OCAML_SITELIBDIR%%/camlp4/META %%OCAML_SITELIBDIR%%/compiler-libs/META %%OCAML_SITELIBDIR%%/dynlink/META %%OCAML_SITELIBDIR%%/findlib/META @@ -42,9 +41,6 @@ bin/safe_camlp4 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern %%OCAML_SITELIBDIR%%/findlib/topfind.cmi %%OCAML_SITELIBDIR%%/findlib/topfind.mli -%%OCAML_SITELIBDIR%%/graphics/META -%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META -%%OCAML_SITELIBDIR%%/ocamlbuild/META %%OCAML_SITELIBDIR%%/ocamldoc/META %%OCAML_SITELIBDIR%%/stdlib/META %%OCAML_SITELIBDIR%%/str/META -- cgit v1.2.3