From nobody Sun Oct 20 18:05:53 2024 X-Original-To: dev-commits-ports-all@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 4XWmZn5Wplz5Zbwp; Sun, 20 Oct 2024 18:05:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWmZn4m91z4MXG; Sun, 20 Oct 2024 18:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729447553; 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=b61sauSQlXpK5pZ+4n7wgHhnz0AX09oCQFgX+kyD+dI=; b=xfyTjSEdxEk3F1hzX4zG3FOP3gvoMdhd6zbrvlHyQqz/S/0sTas+FyIbgPBnkbTGjTBsI3 1PMj76ciOwsAIYeUZ5cJYVq8kdpU1Dvj1Wk1pgrYb+wFilB8HzjBQIOPWkLM56oDmF7q6V lI5xQsIengt1wA/XQSadNY/L/xeb//NmFWf3BwBNOmPXbdzPMMSWv3spIBRZXKtC9ZVnFM tNwThtDMt83JBpVJmCbiy0eoeM/pbVa+PbmapXfGXs8BM0XBnoZz0h/wR07194cD3Fg+H/ ksKDCOMjJdtGBthKf9D+A59mNua5oAqR4FuCN8WunIkPUjTY9AG6sLr56+8BpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729447553; 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=b61sauSQlXpK5pZ+4n7wgHhnz0AX09oCQFgX+kyD+dI=; b=JmUV/KxLsfFXgVvjf0wUVng8tdFCpkJtxuquIcX3X10XCuYeAT0UQrU3faMeHxxWH3IRhI SBZa51r+HW54CdXFt8tzVlw00aSPd2qfP0l9lR+XIdJx+ZjmhgrQurjkCu9awdfGSNe9VW uu/w1jkmVPOAkAH5WFhu9PGtHR2llwf0jm9yGO6bsSs7clcjb/5a6ChVBxeKwlv3Gnl6qH eiZtVQWrPZZDAgkbRb5j2rKVdxRlFnGzHuQ4+z/JtEoG2K/hbCB9+emlOQUT6lZmm8ZIgm 0JfOQNiDso0/n1g7Cy8AWPhFu8SI3k7b2r2NEXPGpLvq0O3Wd/ebYlePXLeuSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729447553; a=rsa-sha256; cv=none; b=Gpj8lgG1HfEUx9dBXLAdEr7ilxhT2RBezX1oVYwzuFs/XmJyl+jrloz7jRjRYr2NPTKJpM 6TLHrd8/eXWvF0P7MN/IDbvs2aWWpHuY3vIjl19s7KlzqfrAGb/1nmJGiOafkjJaUgw/Xm DNZOlioM/+QKuyzFwg7O5OOAaPqp5jJ+f2q0sMM1Mu7dfMVEyc+rZAFEODgwfQ2CoKH0tn ToFIP+t6ipB9VT0lr22LUCRqI1+iXjm4IfmShXpKZY1U6ut4e+p1Nz5aggyqBLudy9Arc5 jMz5o/vgRnwbqXfMcJdlnUZ4sQ3xhSP6G61mgUoPqGyDQ0OOMuMnhkPetR4L6A== 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 4XWmZn4HXxz1BDh; Sun, 20 Oct 2024 18:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49KI5rjY006272; Sun, 20 Oct 2024 18:05:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KI5rWt006269; Sun, 20 Oct 2024 18:05:53 GMT (envelope-from git) Date: Sun, 20 Oct 2024 18:05:53 GMT Message-Id: <202410201805.49KI5rWt006269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 54b36d688589 - main - devel/ocaml-opam: Update to 2.2.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b36d688589b38aefdf684bbcb0e7eee658ac09 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=54b36d688589b38aefdf684bbcb0e7eee658ac09 commit 54b36d688589b38aefdf684bbcb0e7eee658ac09 Author: Hannes Mehnert AuthorDate: 2024-10-20 18:01:51 +0000 Commit: Zsolt Udvari CommitDate: 2024-10-20 18:05:24 +0000 devel/ocaml-opam: Update to 2.2.1 Makefile is adjusted to use --with-vendored-deps for configure, and drop the (cold-)lib-ext target that is not needed anymore. Determine ARCH by bsd.port.pre.mk. Add LICENSE_FILE. Changelog: https://github.com/ocaml/opam/releases/tag/2.2.1 PR: 280227 Approved by: submitter is maintainer --- devel/ocaml-opam/Makefile | 37 +++++++++++----------- devel/ocaml-opam/distinfo | 6 ++-- .../files/patch-shell_bootstrap-ocaml.sh | 4 +-- ...-src__ext_ocaml-patches_0001-arm-powerpc.patch} | 8 ++--- devel/ocaml-opam/pkg-plist | 13 +++++--- 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 6ee5fe018b62..e8b861e2b1d5 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,5 +1,5 @@ PORTNAME= opam -DISTVERSION= 2.1.6 +DISTVERSION= 2.2.1 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- @@ -10,30 +10,19 @@ COMMENT= Source-based package manager for OCaml WWW= https://opam.ocaml.org/ LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= curl:ftp/curl \ - gpatch:devel/patch \ - gmake:devel/gmake + gmake:devel/gmake \ + gpatch:devel/patch USES= gmake -ARCH!= uname -p -.if ${ARCH} == armv6 || ${ARCH} == armv7 -RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -USE_BINUTILS= yes -.endif GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS= --disable-checks +CONFIGURE_ARGS= --with-mccs --with-vendored-deps MAKE_JOBS_UNSAFE= yes -ALL_TARGET= cold-lib-ext cold-all - -LDFLAGS_armv6= -Wl,-z,notext -LDFLAGS_armv7= -Wl,-z,notext -LDFLAGS_powerpc= -Wl,-z,notext -LDFLAGS_i386= -Wl,-z,notext -LDFLAGS+= ${LDFLAGS_${ARCH}} +ALL_TARGET= cold-all NOPRECIOUSMAKEVARS= yes @@ -41,13 +30,23 @@ OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC OPTIONS_DEFAULT= GIT RSYNC NO_OPTIONS_SORT= yes -RSYNC_DESC= Remote repository synchronized with Rsync +RSYNC_DESC= Remote repository synchronized with Rsync DARCS_RUN_DEPENDS= darcs:devel/hs-darcs GIT_RUN_DEPENDS= git:devel/git MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} RSYNC_RUN_DEPENDS= rsync:net/rsync +.include +.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \ + ${ARCH} == powerpc +LDFLAGS+= -Wl,-z,notext +.endif +.if ${ARCH} == armv6 || ${ARCH} == armv7 +RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils +USE_BINUTILS= yes +.endif + pre-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler) @@ -55,4 +54,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam -.include +.include diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index 4b15d663b0ad..607fab395275 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715883550 -SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628 -SIZE (opam-full-2.1.6.tar.gz) = 11704198 +TIMESTAMP = 1729018045 +SHA256 (opam-full-2.2.1.tar.gz) = 07ad3887f61e0bc61a0923faae16fcc141285ece5b248a9e2cd4f902523cc121 +SIZE (opam-full-2.2.1.tar.gz) = 12775920 diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh index a70a0a9b9c99..0aa13d3cc539 100644 --- a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh +++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh @@ -1,9 +1,9 @@ --- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 UTC +++ shell/bootstrap-ocaml.sh @@ -42,6 +42,9 @@ - mkdir -p ${V} + mkdir -p ocaml-${V} fi - cd ${V} + cd ocaml-${V} +for p in ../../src_ext/ocaml-patches/*.patch; do + patch -p1 < $p; +done; diff --git a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch similarity index 80% rename from devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch rename to devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch index 23e6f41d0a99..23d42ded5f29 100644 --- a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch +++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch @@ -1,9 +1,9 @@ ---- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC -+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch +--- src_ext/ocaml-patches/0001-arm-powerpc.patch 2023-05-27 13:17:37 UTC ++++ src_ext/ocaml-patches/0001-arm-powerpc.patch @@ -0,0 +1,32 @@ +--- a/configure.orig 2023-05-27 13:13:22 UTC ++++ a/configure -+@@ -14256,12 +14256,20 @@ case $host in #( ++@@ -14344,12 +14344,20 @@ case $host in #( + arch=amd64; system=win64 ;; #( + powerpc64le*-*-linux*) : + arch=power; model=ppc64le; system=elf ;; #( @@ -24,7 +24,7 @@ + s390x*-*-linux*) : + arch=s390x; model=z10; system=elf ;; #( + # expected to match "gnueabihf" as well as "musleabihf" -+@@ -14281,6 +14289,8 @@ ++@@ -14369,6 +14377,8 @@ + arch=arm; model=armv6; system=linux_eabi ;; #( + armv6*-*-freebsd*) : + arch=arm; model=armv6; system=freebsd ;; #( diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist index dca86ff640d3..8e9a60673323 100644 --- a/devel/ocaml-opam/pkg-plist +++ b/devel/ocaml-opam/pkg-plist @@ -10,6 +10,7 @@ share/man/man1/opam-admin-index.1.gz share/man/man1/opam-admin-lint.1.gz share/man/man1/opam-admin-list.1.gz share/man/man1/opam-admin-make.1.gz +share/man/man1/opam-admin-update-extrafiles.1.gz share/man/man1/opam-admin-upgrade.1.gz share/man/man1/opam-admin.1.gz share/man/man1/opam-clean.1.gz @@ -21,22 +22,24 @@ share/man/man1/opam-info.1.gz share/man/man1/opam-init.1.gz share/man/man1/opam-install.1.gz share/man/man1/opam-installer.1.gz -share/man/man1/opam-list.1.gz share/man/man1/opam-lint.1.gz +share/man/man1/opam-list.1.gz share/man/man1/opam-lock.1.gz share/man/man1/opam-option.1.gz share/man/man1/opam-pin.1.gz share/man/man1/opam-reinstall.1.gz -share/man/man1/opam-remove.1.gz share/man/man1/opam-remote.1.gz +share/man/man1/opam-remove.1.gz share/man/man1/opam-repository.1.gz share/man/man1/opam-search.1.gz -share/man/man1/opam-source.1.gz share/man/man1/opam-show.1.gz +share/man/man1/opam-source.1.gz share/man/man1/opam-switch.1.gz -share/man/man1/opam-update.1.gz -share/man/man1/opam-upgrade.1.gz +share/man/man1/opam-tree.1.gz share/man/man1/opam-uninstall.1.gz share/man/man1/opam-unpin.1.gz +share/man/man1/opam-update.1.gz +share/man/man1/opam-upgrade.1.gz share/man/man1/opam-var.1.gz +share/man/man1/opam-why.1.gz share/man/man1/opam.1.gz