From nobody Wed May 22 17:16:37 2024 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 4Vkydf0S11z5M4cv; Wed, 22 May 2024 17:16:38 +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 4Vkydf021tz4fyS; Wed, 22 May 2024 17:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716398198; 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=Lwa3Kk6L83o1kUWw0jUVpoO2Uj2IldgELl+A1R9GZtg=; b=hIPK6azjt680A602/xb5Cx+JgeMHxt7bmB8IW8pnFht/xocAi9P1+O3c8l4TZUmgGHy5KX sAzXBaJSZqpSJ7DFtFkVbzLU4q1tU+JJjPQtm1xGsN6LhZIbeL0Cixo6ZiPM5F4lEkvE2H wu1hVXBH8darN3Fwh1mm7wmVl0T/1ZvxsMGV/lNnBSq2rkxJkF/9BPbklZULqUl29l/Hu5 szyOCOtQlqNn/V/gPs4mgQSZ+IpmWYuZ/Ei6nlNfG7fLccD3Ax8DjTsuxaO3KOzSnaK8oF DvxZF776h9/RzlOW/pfgP+Dd9GyRjUqoVpMfdq843kCpce7AN9cF9Vg0y+SMlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716398198; a=rsa-sha256; cv=none; b=lO4s4s5DdOFOuM/rC9g3RQWfYuBLi5rT4e91ipY6lj0a9SWK3TFDo7JDuQs4wWnRal1t/d hOFVJDW/mKa54xUT9WhDaqcQB7SHWxlwxrlqdfsscD09Dax8SQBim4eQF/39QAsy308S3p zFf2lMiT/bO5nP+G5sCI3UPivw1F0x3gcClqhbWKWa6+VNbAnpIIf4cLXOcTx0eLWaXWjX e2G8lfG3h6SvV+2PUvp/F/W8u1g0U4KMj18d5HzXoIq7XhlZtRuQnqlvNQ/1Mbp90eerqI 2T7b4I1OsO4hHYiZqE6IrmsKO48ivxKSkaFdbBvb8ZYCmv3aecDc+1TIRQV8Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716398198; 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=Lwa3Kk6L83o1kUWw0jUVpoO2Uj2IldgELl+A1R9GZtg=; b=s5/Zec2awfW+ynNOo7DVQGVr9AtpUXYkGzZEYdKImd3VuP1NF1vJ7H8jnbQ2BTMgUoK/4z Jkd3ibrtlDsgOiK79O2K3A+iuCBQhUiaFL1jElFS1SQMtyS2ce/8xEeqbWGTBKonCPbHeE GgOJBAr3wYgvOooPVpdDPNtpiAAxXjop/obkW3cS3FW8xJw7WmDj7f8PqBE1jbbYiot6s1 d+97zNQEboryY+MvSN10zD5XkyrJxAZF/a5ELYHzARpjFS2LNraiirJEWe46m7CDHGvUXc mTBNwHtjv/K3FxrreM6AuJcg49of3k+AFdWeRtU7y4AklDWNpWKB/lTOx9O/zw== 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 4Vkydd6P4GzFDG; Wed, 22 May 2024 17:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MHGbHV092455; Wed, 22 May 2024 17:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MHGbKe092452; Wed, 22 May 2024 17:16:37 GMT (envelope-from git) Date: Wed, 22 May 2024 17:16:37 GMT Message-Id: <202405221716.44MHGbKe092452@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: bb2bea65dbac - main - ocaml: Updates to ocaml compiler and several ocaml ports 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb2bea65dbac365184f0efd68e9b79201fe5c533 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb2bea65dbac365184f0efd68e9b79201fe5c533 commit bb2bea65dbac365184f0efd68e9b79201fe5c533 Author: Benjamin Jacobs AuthorDate: 2024-05-22 17:06:27 +0000 Commit: Guido Falsi CommitDate: 2024-05-22 17:16:28 +0000 ocaml: Updates to ocaml compiler and several ocaml ports - Update devel/ocaml to 4.14.2 [1] - Specify runtime dependency on GNU AS as full path, this fixes build on armv6 - armv7 [1] [2] - converters/ocaml-base64: Update to 3.5.1, add LICENSE, other improvements - converters/ocaml-jsonm: Strip shared objects [3] - databases/ocaml-dbm: Update to 1.3, move to gitlub, other improvements - devel/menhir: Update to 20231231 - devel/ocaml-base: Unbreak non-x86 [2] - devel/ocaml-camlp-streams: Silence patch and strip commands - devel/ocaml-ipaddr: Update to 5.5.0 - devel/ocaml-lwt: Update to 5.7.0 [4] - devel/ocaml-result: Set package version, strip shared objects [5] - devel/ocaml-sexplib: Resurrect and update to 0.16.0. - devel/ocaml-stdio: Update to 0.17.0 - security/ocaml-cryptokit: Update to 1.19, add LICENSE, other improvements - security/ocaml-ssl: Update to 0.7.0, install stublibs in package directory [6] - x11-toolkits/ocaml-graphics: Reorder Makefile, silence patch command - Bump PORTREVISION on ports requiring it after update. Adding ports: - devel/ocaml-cstruct - devel/ocaml-compiler-libs [7] - devel/ocaml-ppx_derivers [7] - devel/ocaml-ppxlib [7] - devel/ocaml-domain-name - devel/ocaml-ocplib-endian [8] - devel/ocaml-parsexp - devel/ocaml-ppx_sexp_conv - security/ocaml-lwt_ssl [9] Resetting maintainership from michipili@gmail.com due to multiple timeouts and long term unresponsiveness. Assigning maintainership of lang/ocaml to author of this patch. Many thanks to him for his work! PR: 278300 [1], 278791 [2], 277818 [3], 277781 [4], 277775 [6], 277779 [7], 277780 [8], 277782 [9] Approved by: michipili@gmail.com (maintainer timeout) [1], danfe@FreeBSD.org (maintainer timeout) [3] [4] [6], fixit, avoid breakage [5] Differential Revision: https://reviews.freebsd.org/D45254 --- MOVED | 1 - archivers/ocaml-bz2/Makefile | 2 +- archivers/ocaml-zip/Makefile | 2 +- converters/ocaml-base64/Makefile | 44 +- converters/ocaml-base64/distinfo | 5 +- converters/ocaml-base64/pkg-plist | 31 ++ converters/ocaml-jsonm/Makefile | 7 +- databases/ocaml-dbm/Makefile | 37 +- databases/ocaml-dbm/distinfo | 5 +- .../ocaml-dbm/files/3bb91d6-revised-configuration | 127 +++++ databases/ocaml-dbm/files/patch-META | 10 - databases/ocaml-dbm/files/patch-Makefile | 27 - databases/ocaml-dbm/pkg-plist | 19 +- databases/ocaml-mysql/Makefile | 2 +- databases/ocaml-sqlite3/Makefile | 2 +- devel/Makefile | 9 + devel/coccinelle/Makefile | 2 +- devel/menhir/Makefile | 34 +- devel/menhir/distinfo | 6 +- devel/menhir/pkg-plist | 48 +- devel/ocaml-annexlib/Makefile | 2 +- devel/ocaml-astring/Makefile | 1 + devel/ocaml-base/Makefile | 1 + .../files/patch-src_discover_discover.ml | 14 + devel/ocaml-bos/Makefile | 1 + devel/ocaml-calendar/Makefile | 2 +- devel/ocaml-camljava/Makefile | 2 +- devel/ocaml-camlp-streams/Makefile | 4 +- devel/ocaml-camlp4/Makefile | 3 +- devel/ocaml-camlp5/Makefile | 1 + devel/ocaml-camomile/Makefile | 2 +- devel/ocaml-cfg/Makefile | 2 +- devel/ocaml-classes/Makefile | 2 +- devel/ocaml-cmdliner/Makefile | 2 +- devel/ocaml-compiler-libs/Makefile | 36 ++ devel/ocaml-compiler-libs/distinfo | 3 + devel/ocaml-compiler-libs/pkg-descr | 2 + devel/ocaml-compiler-libs/pkg-plist | 43 ++ devel/ocaml-cppo/Makefile | 2 +- devel/ocaml-csexp/Makefile | 2 +- devel/ocaml-cstruct/Makefile | 53 ++ devel/ocaml-cstruct/distinfo | 3 + devel/ocaml-cstruct/pkg-descr | 18 + devel/ocaml-cstruct/pkg-plist | 75 +++ devel/ocaml-domain-name/Makefile | 33 ++ devel/ocaml-domain-name/distinfo | 3 + devel/ocaml-domain-name/pkg-descr | 4 + devel/ocaml-domain-name/pkg-plist | 13 + devel/ocaml-dune/Makefile | 2 +- devel/ocaml-extlib/Makefile | 2 +- devel/ocaml-findlib/Makefile | 2 +- devel/ocaml-fmt/Makefile | 1 + devel/ocaml-fpath/Makefile | 1 + devel/ocaml-ipaddr/Makefile | 47 +- devel/ocaml-ipaddr/distinfo | 6 +- devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml | 33 -- devel/ocaml-ipaddr/pkg-plist | 78 ++- devel/ocaml-lacaml/Makefile | 2 +- devel/ocaml-logs/Makefile | 1 + devel/ocaml-lwt/Makefile | 86 ++-- devel/ocaml-lwt/distinfo | 5 +- devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml | 12 - devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml | 10 - devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli | 10 - devel/ocaml-lwt/pkg-plist | 198 ++++++++ devel/ocaml-magic/Makefile | 2 +- devel/ocaml-mtime/Makefile | 1 + devel/ocaml-ocamlbuild/Makefile | 2 +- devel/ocaml-ocplib-endian/Makefile | 34 ++ devel/ocaml-ocplib-endian/distinfo | 3 + devel/ocaml-ocplib-endian/pkg-descr | 2 + devel/ocaml-ocplib-endian/pkg-plist | 29 ++ devel/ocaml-ounit/Makefile | 2 +- devel/ocaml-parmap/Makefile | 2 +- devel/ocaml-parsexp/Makefile | 35 ++ devel/ocaml-parsexp/distinfo | 3 + devel/ocaml-parsexp/pkg-descr | 2 + devel/ocaml-parsexp/pkg-plist | 127 +++++ devel/ocaml-pcre/Makefile | 2 +- devel/ocaml-pcre2/Makefile | 1 + devel/ocaml-pomap/Makefile | 2 +- devel/ocaml-ppx-tools/Makefile | 2 +- devel/ocaml-ppx_derivers/Makefile | 33 ++ devel/ocaml-ppx_derivers/distinfo | 3 + devel/ocaml-ppx_derivers/pkg-descr | 3 + devel/ocaml-ppx_derivers/pkg-plist | 13 + devel/ocaml-ppx_sexp_conv/Makefile | 41 ++ devel/ocaml-ppx_sexp_conv/distinfo | 3 + devel/ocaml-ppx_sexp_conv/pkg-descr | 2 + devel/ocaml-ppx_sexp_conv/pkg-plist | 95 ++++ devel/ocaml-ppxlib/Makefile | 55 ++ devel/ocaml-ppxlib/distinfo | 3 + devel/ocaml-ppxlib/pkg-descr | 9 + devel/ocaml-ppxlib/pkg-plist | 556 +++++++++++++++++++++ devel/ocaml-re/Makefile | 1 + devel/ocaml-react/Makefile | 2 +- devel/ocaml-res/Makefile | 2 +- devel/ocaml-result/Makefile | 5 +- devel/ocaml-result/files/patch-dune-project | 7 + devel/ocaml-rresult/Makefile | 1 + devel/ocaml-sdl/Makefile | 2 +- devel/ocaml-sem/Makefile | 2 +- devel/ocaml-seq/Makefile | 1 + devel/ocaml-sexplib/Makefile | 41 ++ devel/ocaml-sexplib/distinfo | 3 + devel/ocaml-sexplib/pkg-descr | 2 + devel/ocaml-sexplib/pkg-plist | 129 +++++ devel/ocaml-stdio/Makefile | 7 +- devel/ocaml-stdio/distinfo | 6 +- devel/ocaml-topkg/Makefile | 2 +- devel/ocaml-type_conv/Makefile | 2 +- devel/ocaml-uchar/Makefile | 2 +- devel/ocaml-ulex/Makefile | 2 +- devel/ocaml-uutf/Makefile | 2 +- devel/ocaml-xstr/Makefile | 2 +- devel/ocaml-xstrp4/Makefile | 2 +- ftp/ocaml-ocurl/Makefile | 2 +- graphics/ocaml-cairo/Makefile | 2 +- graphics/ocaml-images/Makefile | 2 +- graphics/ocaml-lablgl/Makefile | 2 +- lang/ocaml/Makefile | 6 +- lang/ocaml/distinfo | 6 +- math/alt-ergo/Makefile | 2 +- math/coq/Makefile | 2 +- math/facile/Makefile | 2 +- math/ocaml-num/Makefile | 2 +- math/ocaml-ocamlgraph/Makefile | 2 +- math/ocaml-zarith/Makefile | 2 +- math/ocamlgsl/Makefile | 4 +- security/Makefile | 1 + security/ocaml-cryptgps/Makefile | 2 +- security/ocaml-cryptokit/Makefile | 23 +- security/ocaml-cryptokit/distinfo | 6 +- security/ocaml-cryptokit/pkg-plist | 21 + security/ocaml-lwt_ssl/Makefile | 33 ++ security/ocaml-lwt_ssl/distinfo | 3 + security/ocaml-lwt_ssl/pkg-descr | 3 + security/ocaml-lwt_ssl/pkg-plist | 13 + security/ocaml-ssl/Makefile | 19 +- security/ocaml-ssl/distinfo | 6 +- security/ocaml-ssl/pkg-plist | 2 +- textproc/ocaml-csv/Makefile | 2 +- textproc/ocaml-expat/Makefile | 2 +- textproc/ocaml-text/Makefile | 2 +- x11-toolkits/ocaml-graphics/Makefile | 14 +- x11-toolkits/ocaml-lablgtk2/Makefile | 2 +- x11-toolkits/ocaml-lablgtk3/Makefile | 1 + x11-toolkits/ocaml-labltk/Makefile | 1 + 148 files changed, 2356 insertions(+), 373 deletions(-) diff --git a/MOVED b/MOVED index 05349357842d..dd093ac741bd 100644 --- a/MOVED +++ b/MOVED @@ -2291,7 +2291,6 @@ www/kristall||2023-07-02|Has expired: Requires older openssl sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs -devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed net/nuster||2023-07-08|Has expired: Does not support OpenSSL 3 and upstream last release was in 2020 devel/godot2-tools|devel/godot-tools|2023-07-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot devel/rubygem-aws-sdk-core3172|devel/rubygem-aws-sdk-core|2023-07-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile index cd67ff53d75e..1e4534fc2922 100644 --- a/archivers/ocaml-bz2/Makefile +++ b/archivers/ocaml-bz2/Makefile @@ -1,6 +1,6 @@ PORTNAME= bz2 PORTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/72/ PKGNAMEPREFIX= ocaml- diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile index 9f974f6bac6b..bbeb8a4736db 100644 --- a/archivers/ocaml-zip/Makefile +++ b/archivers/ocaml-zip/Makefile @@ -1,6 +1,6 @@ PORTNAME= zip PORTVERSION= 1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers PKGNAMEPREFIX= ocaml- DISTNAME= caml${PORTNAME}-${PORTVERSION} diff --git a/converters/ocaml-base64/Makefile b/converters/ocaml-base64/Makefile index d777b064a3b8..b3805c8efe40 100644 --- a/converters/ocaml-base64/Makefile +++ b/converters/ocaml-base64/Makefile @@ -1,7 +1,6 @@ PORTNAME= base64 -PORTVERSION= 2.0.0 +PORTVERSION= 3.5.1 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= converters PKGNAMEPREFIX= ocaml- @@ -9,22 +8,43 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Base64 encoding and decoding in OCaml WWW= https://github.com/mirage/ocaml-base64 -BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild +LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE.md +BUILD_DEPENDS= ${SA_DIR}/bos/META:devel/ocaml-bos \ + ${SA_DIR}/fmt/META:devel/ocaml-fmt \ + ${SA_DIR}/rresult/META:devel/ocaml-rresult +RUN_DEPENDS= ${SA_DIR}/bos/META:devel/ocaml-bos \ + ${SA_DIR}/fmt/META:devel/ocaml-fmt \ + ${SA_DIR}/rresult/META:devel/ocaml-rresult + +USES= ocaml:dune USE_GITHUB= yes GH_ACCOUNT= mirage GH_PROJECT= ocaml-base64 +USE_OCAML= yes + +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} +PORTDOCS= CHANGES.md LICENSE.md README.md + +OPTIONS_DEFINE= DOCS -USES= gmake -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes +SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} -USE_OCAML= yes -USE_OCAML_FINDLIB= yes -USE_OCAMLFIND_PLIST= yes -USE_OCAML_LDCONFIG= yes -DOCSDIR= ${PREFIX}/share/doc/pcre-ocaml +post-patch: + @${REINPLACE_CMD} \ + -e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \ + ${WRKSRC}/dune-project -CONFIGURE_ARGS= --destdir="${DESTDIRNAME}" +post-install: + @(cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}; \ + ${STRIP_CMD} \ + base64/base64.cmxs \ + base64/rfc2045/base64_rfc2045.cmxs) + # this port never shipped stublibs + # cleanup from older port's wrong USE_OCAML_LDCONFIG + @${ECHO_CMD} @postexec ${SED} -i "''" -e \ + "'/^${PREFIX:S#/#\/#g}\/${OCAML_SITELIBDIR:S#/#\/#g}\/base64$$/d'" \ + %D/${OCAML_LDCONF} >> ${TMPPLIST} .include diff --git a/converters/ocaml-base64/distinfo b/converters/ocaml-base64/distinfo index 90df79f170b7..c47a0c185ccb 100644 --- a/converters/ocaml-base64/distinfo +++ b/converters/ocaml-base64/distinfo @@ -1,2 +1,3 @@ -SHA256 (mirage-ocaml-base64-v2.0.0_GH0.tar.gz) = 029b6a7af1493a077dc25c8e0f3534e5f5ff6e4260e3998a9ca3850fb7238c2c -SIZE (mirage-ocaml-base64-v2.0.0_GH0.tar.gz) = 46084 +TIMESTAMP = 1710548595 +SHA256 (mirage-ocaml-base64-v3.5.1_GH0.tar.gz) = f3e8b9be43567689064b419fa5eefd9c758f00b864e9f731a0dbc1b9fecfc768 +SIZE (mirage-ocaml-base64-v3.5.1_GH0.tar.gz) = 18986 diff --git a/converters/ocaml-base64/pkg-plist b/converters/ocaml-base64/pkg-plist new file mode 100644 index 000000000000..c1066460086e --- /dev/null +++ b/converters/ocaml-base64/pkg-plist @@ -0,0 +1,31 @@ +%%OCAML_SITELIBDIR%%/base64/META +%%OCAML_SITELIBDIR%%/base64/base64.a +%%OCAML_SITELIBDIR%%/base64/base64.cma +%%OCAML_SITELIBDIR%%/base64/base64.cmi +%%OCAML_SITELIBDIR%%/base64/base64.cmt +%%OCAML_SITELIBDIR%%/base64/base64.cmti +%%OCAML_SITELIBDIR%%/base64/base64.cmx +%%OCAML_SITELIBDIR%%/base64/base64.cmxa +%%OCAML_SITELIBDIR%%/base64/base64.cmxs +%%OCAML_SITELIBDIR%%/base64/base64.ml +%%OCAML_SITELIBDIR%%/base64/base64.mli +%%OCAML_SITELIBDIR%%/base64/base64__.cmi +%%OCAML_SITELIBDIR%%/base64/base64__.cmt +%%OCAML_SITELIBDIR%%/base64/base64__.cmx +%%OCAML_SITELIBDIR%%/base64/base64__.ml +%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmi +%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmt +%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmx +%%OCAML_SITELIBDIR%%/base64/dune-package +%%OCAML_SITELIBDIR%%/base64/opam +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.a +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cma +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmi +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmt +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmti +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmx +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmxa +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmxs +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.ml +%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.mli +%%OCAML_SITELIBDIR%%/base64/unsafe.ml diff --git a/converters/ocaml-jsonm/Makefile b/converters/ocaml-jsonm/Makefile index b048189e9da7..90c7c549c7bb 100644 --- a/converters/ocaml-jsonm/Makefile +++ b/converters/ocaml-jsonm/Makefile @@ -1,6 +1,6 @@ PORTNAME= jsonm PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= converters MASTER_SITES= https://erratique.ch/software/jsonm/releases/ PKGNAMEPREFIX= ocaml- @@ -33,4 +33,9 @@ do-install: --docdir=${OCAML_DOCSDIR:S,^${PREFIX}/,,} \ --libdir=${OCAML_SITELIBDIR} ${PORTNAME}.install +post-install: + @${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/bin/jsontrip \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonm/jsonm.cmxs + .include diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile index d85b05101b5b..ba9edf623e9b 100644 --- a/databases/ocaml-dbm/Makefile +++ b/databases/ocaml-dbm/Makefile @@ -1,31 +1,40 @@ PORTNAME= dbm -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.3 +DISTVERSIONPREFIX= camldbm- CATEGORIES= databases -MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/728/ PKGNAMEPREFIX= ocaml- -DISTNAME= caml${PORTNAME}-${PORTVERSION} + +EXTRA_PATCHES= ${PATCHDIR}/3bb91d6-revised-configuration:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= OCaml binding to the NDBM and GDBM database library -WWW= https://forge.ocamlcore.org/projects/camldbm/ +WWW= https://github.com/ocaml/dbm -LICENSE= LGPL20 +LICENSE= LGPL20 # with a special exception to clause 6 -CONFLICTS= ocaml-[0-3]* ocaml-nox11-[0-3]* +USE_GITHUB= yes +USE_OCAML= yes +GH_ACCOUNT= ocaml +USE_OCAML_LDCONFIG= yes -USES= tar:tgz +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} HAS_CONFIGURE= yes -USE_OCAML= yes -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} -MAKE_ENV+= DESTDIR="${STAGEDIR}" +MAKE_ENV+= LIBDIR="${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm" \ + STUBLIBDIR="${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm" + +post-patch: + @${REINPLACE_CMD} \ + -E 's/^(LIBDIR|STUBLIBDIR)=/\1?=/' ${WRKSRC}/Makefile + @${REINPLACE_CMD} \ + -e 's/^version =.*/version = "${PORTVERSION}"/' ${WRKSRC}/META pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm \ - ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs + @${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm post-install: - ${INSTALL_DATA} ${WRKSRC}/META \ + @${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm/dllcamldbm.so + @${INSTALL_DATA} ${WRKSRC}/META \ ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm .include diff --git a/databases/ocaml-dbm/distinfo b/databases/ocaml-dbm/distinfo index 4e0c76d57473..cf6e5e81d030 100644 --- a/databases/ocaml-dbm/distinfo +++ b/databases/ocaml-dbm/distinfo @@ -1,2 +1,3 @@ -SHA256 (camldbm-1.0.tgz) = 19741fa7827c306ae43b18170b01f5547326ec7ea6c2f4bd80c93439b5ff538f -SIZE (camldbm-1.0.tgz) = 14397 +TIMESTAMP = 1710705889 +SHA256 (ocaml-dbm-camldbm-1.3_GH0.tar.gz) = 126fd020be0dd13be7e8854fcd3637392ff039c8b865243bb4dad15a954a0da7 +SIZE (ocaml-dbm-camldbm-1.3_GH0.tar.gz) = 14831 diff --git a/databases/ocaml-dbm/files/3bb91d6-revised-configuration b/databases/ocaml-dbm/files/3bb91d6-revised-configuration new file mode 100644 index 000000000000..fc1dcc2275d4 --- /dev/null +++ b/databases/ocaml-dbm/files/3bb91d6-revised-configuration @@ -0,0 +1,127 @@ +From 3bb91d6ffd700f9211a84dd2fc80c428bfcf5510 Mon Sep 17 00:00:00 2001 +From: Xavier Leroy +Date: Wed, 20 Jul 2022 11:18:18 +0200 +Subject: [PATCH] Revised autoconfiguration (#16) + +- Let the C compiler find the ndbm.h or gdbm.h files + (instead of looking for them in specific directories). +- Don't use the gdbm-ndbm.h compatibility mode, it no longer exists. +--- + cldbm.c | 4 +--- + configure | 69 ++++++++++++++++++++++--------------------------------- + 2 files changed, 29 insertions(+), 44 deletions(-) + +diff --git a/cldbm.c b/cldbm.c +index 34e2d37..0fa4d13 100644 +--- a/cldbm.c ++++ b/cldbm.c +@@ -21,9 +21,7 @@ + #include + #include + +-#ifdef DBM_USES_GDBM_NDBM +-#include +-#elif defined DBM_COMPAT ++#ifdef DBM_COMPAT + #include + #else + #include +diff --git a/configure b/configure +index 9a3d094..e049218 100755 +--- a/configure ++++ b/configure +@@ -36,7 +36,7 @@ hasgot() { + fi + echo ' return 0;' + echo '}') > hasgot.c +- ${CC:-cc} -I$1 -o hasgot.exe hasgot.c $3 $4 ++ ${CC:-cc} $1 -o hasgot.exe hasgot.c $3 2>/dev/null + res=$? + rm -f hasgot.c hasgot.exe + return $res +@@ -46,58 +46,45 @@ dbm_include="not found" + dbm_link="not found" + dbm_defines="" + +-for dir in /usr/include /usr/include/db1 /usr/include/gdbm /usr/local/include; do +- if test -f $dir/ndbm.h; then +- dbm_include=$dir +- dbm_defines="-DDBM_COMPAT" +- if hasgot $dir ndbm.h; then +- dbm_link="" +- elif hasgot $dir ndbm.h -lndbm; then +- dbm_link="-lndbm" +- elif hasgot $dir ndbm.h -ldb1; then +- dbm_link="-ldb1" +- elif hasgot $dir ndbm.h -lgdbm; then +- dbm_link="-lgdbm" +- elif hasgot $dir ndbm.h -lgdbm_compat -lgdbm; then +- dbm_link="-lgdbm_compat -lgdbm" ++for include in \ ++ "" \ ++ "-I/usr/include/db1" \ ++ "-I/usr/include/gdbm" \ ++ "-I/usr/local/include" \ ++ "-I/opt/homebrew/include" ; do ++ if hasgot "$include" ndbm.h ""; then ++ dbm_include="$include" ++ dbm_defines="-DDBM_COMPAT" ++ dbm_link="" ++ break ++ elif hasgot "$include" gdbm.h -lgdbm; then ++ dbm_include="$include" ++ dbm_link="-lgdbm" ++ break ++ elif hasgot "$include" ndbm.h -lndbm; then ++ dbm_include="$include" ++ dbm_defines="-DDBM_COMPAT" ++ dbm_link="-lndbm" ++ break ++ elif hasgot "$include" ndbm.h -ldb1; then ++ dbm_include="$include" ++ dbm_defines="-DDBM_COMPAT" ++ dbm_link="-ldb1" ++ break + fi +- break +- fi +- if test -f $dir/gdbm-ndbm.h; then +- dbm_include=$dir +- dbm_defines="-DDBM_COMPAT -DDBM_USES_GDBM_NDBM" +- if hasgot $dir gdbm-ndbm.h -lgdbm_compat -lgdbm; then +- dbm_link="-lgdbm_compat -lgdbm" +- fi +- break +- fi +- if test -f $dir/gdbm.h; then +- dbm_include=$dir +- if hasgot $dir gdbm.h -lgdbm; then +- dbm_link="-lgdbm" +- fi +- break +- fi + done + if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then +- echo "NDBM not found, the \"camldbm\" library cannot be built." ++ echo "NDBM and GDBM not found, the \"camldbm\" library cannot be built." + exit 2 + fi + + echo "Configuration for the \"camldbm\" library:" +-echo " headers found in ......... $dbm_include" +-echo " options for compiling .... $dbm_defines" ++echo " options for compiling .... $dbm_include $dbm_defines" + echo " options for linking ...... $dbm_link" + echo + echo "Configuration successful" + echo + +-if test "$dbm_include" = "/usr/include"; then +- dbm_include="" +-else +- dbm_include="-I$dbm_include" +-fi +- + echo "OCAML_STDLIB=$stdlib" > Makefile.config + echo "DBM_INCLUDES=$dbm_include" >> Makefile.config + echo "DBM_LINK=$dbm_link" >> Makefile.config diff --git a/databases/ocaml-dbm/files/patch-META b/databases/ocaml-dbm/files/patch-META deleted file mode 100644 index 861715dffc1e..000000000000 --- a/databases/ocaml-dbm/files/patch-META +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-META,v 1.1 2013/07/21 17:04:29 jaapb Exp $ - -point to correct directory for library files ---- META.orig 2011-11-22 15:56:49.000000000 +0000 -+++ META -@@ -3,3 +3,4 @@ requires = "" - version = "1.0" - archive(byte) = "dbm.cma" - archive(native) = "dbm.cmxa" -+directory = "^" diff --git a/databases/ocaml-dbm/files/patch-Makefile b/databases/ocaml-dbm/files/patch-Makefile deleted file mode 100644 index c1e15f46971f..000000000000 --- a/databases/ocaml-dbm/files/patch-Makefile +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2012/12/15 10:25:52 jaapb Exp $ - -Install into DESTDIR ---- Makefile.orig 2011-11-22 15:56:49.000000000 +0000 -+++ Makefile -@@ -57,13 +57,14 @@ depend: - $(OCAMLDEP) *.ml *.mli > .depend - - install:: -- if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi -- cp libcamldbm.$(A) $(LIBDIR)/ -- cd $(LIBDIR) && ranlib libcamldbm.$(A) -- cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ -- cp dbm.$(A) $(LIBDIR)/ -- cd $(LIBDIR) && ranlib dbm.$(A) -- if test -f dbm.cmxs; then cp dbm.cmxs $(LIBDIR)/; fi -+ if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) \ -+ $(DESTDIR)/$(STUBLIBDIR)/; fi -+ cp libcamldbm.$(A) $(DESTDIR)/$(LIBDIR)/ -+ cd $(DESTDIR)/$(LIBDIR) && ranlib libcamldbm.$(A) -+ cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)/$(LIBDIR)/ -+ cp dbm.$(A) $(DESTDIR)/$(LIBDIR)/ -+ cd $(DESTDIR)/$(LIBDIR) && ranlib dbm.$(A) -+ if test -f dbm.cmxs; then cp dbm.cmxs $(DESTDIR)/$(LIBDIR)/; fi - - clean:: - rm -f *.cm* *.$(O) *.$(A) *.$(SO) diff --git a/databases/ocaml-dbm/pkg-plist b/databases/ocaml-dbm/pkg-plist index 07d1ce85afd3..e28986fc4c85 100644 --- a/databases/ocaml-dbm/pkg-plist +++ b/databases/ocaml-dbm/pkg-plist @@ -1,9 +1,10 @@ -lib/ocaml/dbm.a -lib/ocaml/dbm.cma -lib/ocaml/dbm.cmi -lib/ocaml/dbm.cmxa -lib/ocaml/dbm.cmxs -lib/ocaml/dbm.mli -lib/ocaml/libcamldbm.a -lib/ocaml/site-lib/dbm/META -lib/ocaml/stublibs/dllcamldbm.so +%%OCAML_SITELIBDIR%%/dbm/META +%%OCAML_SITELIBDIR%%/dbm/dbm.a +%%OCAML_SITELIBDIR%%/dbm/dbm.cma +%%OCAML_SITELIBDIR%%/dbm/dbm.cmi +%%OCAML_SITELIBDIR%%/dbm/dbm.cmx +%%OCAML_SITELIBDIR%%/dbm/dbm.cmxa +%%OCAML_SITELIBDIR%%/dbm/dbm.cmxs +%%OCAML_SITELIBDIR%%/dbm/dbm.mli +%%OCAML_SITELIBDIR%%/dbm/dllcamldbm.so +%%OCAML_SITELIBDIR%%/dbm/libcamldbm.a diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile index 7783983b5fb1..8767d52e7b20 100644 --- a/databases/ocaml-mysql/Makefile +++ b/databases/ocaml-mysql/Makefile @@ -1,6 +1,6 @@ PORTNAME= mysql PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://ygrek.org.ua/p/release/ocaml-mysql/ PKGNAMEPREFIX= ocaml- diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile index a039f89f262f..c9eb0e19baf7 100644 --- a/databases/ocaml-sqlite3/Makefile +++ b/databases/ocaml-sqlite3/Makefile @@ -1,7 +1,7 @@ PORTNAME= sqlite3 PORTVERSION= 4.0.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases PKGNAMEPREFIX= ocaml- diff --git a/devel/Makefile b/devel/Makefile index f442b75c46e2..d16a460dc751 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1717,8 +1717,11 @@ SUBDIR += ocaml-cfg SUBDIR += ocaml-classes SUBDIR += ocaml-cmdliner + SUBDIR += ocaml-compiler-libs SUBDIR += ocaml-cppo SUBDIR += ocaml-csexp + SUBDIR += ocaml-cstruct + SUBDIR += ocaml-domain-name SUBDIR += ocaml-dune SUBDIR += ocaml-extlib SUBDIR += ocaml-findlib @@ -1731,13 +1734,18 @@ SUBDIR += ocaml-magic SUBDIR += ocaml-mtime SUBDIR += ocaml-ocamlbuild + SUBDIR += ocaml-ocplib-endian SUBDIR += ocaml-opam SUBDIR += ocaml-ounit SUBDIR += ocaml-parmap + SUBDIR += ocaml-parsexp SUBDIR += ocaml-pcre SUBDIR += ocaml-pcre2 SUBDIR += ocaml-pomap + SUBDIR += ocaml-ppx_derivers + SUBDIR += ocaml-ppx_sexp_conv SUBDIR += ocaml-ppx-tools + SUBDIR += ocaml-ppxlib SUBDIR += ocaml-re SUBDIR += ocaml-react SUBDIR += ocaml-res @@ -1747,6 +1755,7 @@ SUBDIR += ocaml-sem SUBDIR += ocaml-seq SUBDIR += ocaml-sexplib0 + SUBDIR += ocaml-sexplib SUBDIR += ocaml-stdio SUBDIR += ocaml-topkg SUBDIR += ocaml-type_conv diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index 488e3a5d6de2..f5368a119995 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -1,6 +1,6 @@ PORTNAME= coccinelle PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile index 9dbd0861326b..76edd59710d8 100644 --- a/devel/menhir/Makefile +++ b/devel/menhir/Makefile @@ -1,6 +1,5 @@ PORTNAME= menhir -PORTVERSION= 20170712 -PORTREVISION= 2 +PORTVERSION= 20231231 CATEGORIES= devel MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/ @@ -11,32 +10,23 @@ WWW= http://cristal.inria.fr/~fpottier/menhir LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild - -USES= gmake shebangfix +USES= ocaml:dune +USE_GITLAB= yes USE_OCAML= yes -USE_OCAML_FINDLIB= yes -USE_OCAMLFIND_PLIST= yes -OCAML_PKGDIRS= menhirLib - -SHEBANG_FILES= demos/find-menhir.sh -MAKE_JOBS_UNSAFE= yes +GL_SITE= https://gitlab.inria.fr/ +GL_ACCOUNT= fpottier +OCAML_PACKAGES= menhir menhirLib menhirSdk +DUNE_INSTALL_TARGETS= ${OCAML_PACKAGES} -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} - -PORTDOCS= * +DOCSDIR= ${OCAML_DOCSDIR} +PORTDOCS= ${OCAML_PACKAGES:@p@$p@} OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e \ - 's|doc/menhir|doc/ocaml/menhir| ; \ - s| \($$(bindir)\)| $${DESTDIR}\1| ; \ - s| \($$(libdir)\)| $${DESTDIR}\1| ; \ - s| \($$(docdir)\)| $${DESTDIR}\1| ; \ - s| \($$(mandir)\)| $${DESTDIR}\1|' ${WRKSRC}/Makefile - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/menhir + @${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/menhirLib/menhirLib.cmxs \ + ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/menhirSdk/menhirSdk.cmxs .include diff --git a/devel/menhir/distinfo b/devel/menhir/distinfo index af472811c992..4930ba84d472 100644 --- a/devel/menhir/distinfo +++ b/devel/menhir/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500460606 -SHA256 (menhir-20170712.tar.gz) = ca482d690052343d6cb9452433248a0a92cc8bfc8fa529dc313220c9d7c0d000 -SIZE (menhir-20170712.tar.gz) = 855262 +TIMESTAMP = 1710615133 +SHA256 (menhir-20231231.tar.bz2) = fb76a37b84e28acd3ecf58efea3abc8c7a9a70987a44915837e81093a7853d3a +SIZE (menhir-20231231.tar.bz2) = 1245465 diff --git a/devel/menhir/pkg-plist b/devel/menhir/pkg-plist index 12784fe8b8e0..90eb3a147d50 100644 --- a/devel/menhir/pkg-plist +++ b/devel/menhir/pkg-plist @@ -1,8 +1,50 @@ bin/menhir share/man/man1/menhir.1.gz -%%DATADIR%%/standard.mly +%%OCAML_SITELIBDIR%%/menhir/META +%%OCAML_SITELIBDIR%%/menhir/dune-package +%%OCAML_SITELIBDIR%%/menhirLib/META +%%OCAML_SITELIBDIR%%/menhirLib/dune-package +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.a +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cma +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmi +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmt +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmti +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmx +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmxa +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmxs +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.ml +%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.mli %%OCAML_SITELIBDIR%%/menhirSdk/META +%%OCAML_SITELIBDIR%%/menhirSdk/cmly_api.ml +%%OCAML_SITELIBDIR%%/menhirSdk/cmly_format.ml +%%OCAML_SITELIBDIR%%/menhirSdk/cmly_read.ml +%%OCAML_SITELIBDIR%%/menhirSdk/cmly_read.mli +%%OCAML_SITELIBDIR%%/menhirSdk/dune-package +%%OCAML_SITELIBDIR%%/menhirSdk/keyword.ml +%%OCAML_SITELIBDIR%%/menhirSdk/keyword.mli +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.a +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cma %%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmi -%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmo +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmt %%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmx -%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.o +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmxa +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmxs +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.ml +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmi +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmt +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmx +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmi +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmt +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmx +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmi +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmt +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmti +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmx +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmi +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmt +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmti +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmx +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmi +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmt +%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmx +%%OCAML_SITELIBDIR%%/menhirSdk/version.ml diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile index a2f94062349c..a25d052dccb3 100644 --- a/devel/ocaml-annexlib/Makefile +++ b/devel/ocaml-annexlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= annexlib PORTVERSION= 0.13.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= http://raevnos.pennmush.org/code/extlib/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-astring/Makefile b/devel/ocaml-astring/Makefile index 7166cedc78db..38579029edd3 100644 --- a/devel/ocaml-astring/Makefile +++ b/devel/ocaml-astring/Makefile @@ -1,5 +1,6 @@ PORTNAME= astring PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://erratique.ch/software/astring/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-base/Makefile b/devel/ocaml-base/Makefile index ca035cf7cd06..162106a0d0f0 100644 --- a/devel/ocaml-base/Makefile +++ b/devel/ocaml-base/Makefile @@ -1,6 +1,7 @@ PORTNAME= base PORTVERSION= 0.16.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-base/files/patch-src_discover_discover.ml b/devel/ocaml-base/files/patch-src_discover_discover.ml new file mode 100644 index 000000000000..f2339c100a1d --- /dev/null +++ b/devel/ocaml-base/files/patch-src_discover_discover.ml @@ -0,0 +1,14 @@ +--- src/discover/discover.ml.orig 2024-04-29 15:54:18 UTC ++++ src/discover/discover.ml +@@ -4,7 +4,11 @@ int main(int argc, char ** argv) + {| + int main(int argc, char ** argv) + { ++#if defined(__clang__) && !defined(__x86_64__) && !defined(__i386__) ++#error "-mpopcnt is not for this arch" ++#else + return __builtin_popcount(argc); ++#endif + } + |} + ;; diff --git a/devel/ocaml-bos/Makefile b/devel/ocaml-bos/Makefile index 804d48e750d0..3caa24a626f6 100644 --- a/devel/ocaml-bos/Makefile +++ b/devel/ocaml-bos/Makefile @@ -1,5 +1,6 @@ PORTNAME= bos PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://erratique.ch/software/bos/releases/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-calendar/Makefile b/devel/ocaml-calendar/Makefile index 0e989f411b57..dd88b209b6a2 100644 --- a/devel/ocaml-calendar/Makefile +++ b/devel/ocaml-calendar/Makefile @@ -1,6 +1,6 @@ PORTNAME= calendar PORTVERSION= 2.03.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/915/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index 92fed506eca4..e03acf1fa01d 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -1,6 +1,6 @@ PORTNAME= camljava PORTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel java MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/ PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-camlp-streams/Makefile b/devel/ocaml-camlp-streams/Makefile index 781bcf482bdd..0ce6a0d690ee 100644 --- a/devel/ocaml-camlp-streams/Makefile +++ b/devel/ocaml-camlp-streams/Makefile @@ -21,11 +21,11 @@ PORTDOCS= CHANGES.md LICENSE README.md OPTIONS_DEFINE= DOCS post-patch: - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \ ${WRKSRC}/dune-project post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/camlp_streams.cmxs + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/camlp_streams.cmxs .include diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile index fb5f4d51eb6d..5d6f98a67358 100644 --- a/devel/ocaml-camlp4/Makefile +++ b/devel/ocaml-camlp4/Makefile @@ -1,9 +1,10 @@ PORTNAME= camlp4 PORTVERSION= 4.14+1 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ocaml- -MAINTAINER= michipili@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= System for writing extensible parsers for OCaml WWW= https://github.com/ocaml/camlp4 *** 3389 LINES SKIPPED ***