From nobody Sat Dec 25 20:45:32 2021 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 630AF19159AA; Sat, 25 Dec 2021 20:45:33 +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 4JLwtP11HTz3DKs; Sat, 25 Dec 2021 20:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 02C611DE09; Sat, 25 Dec 2021 20:45:33 +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 1BPKjWMZ014602; Sat, 25 Dec 2021 20:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPKjWvN014601; Sat, 25 Dec 2021 20:45:32 GMT (envelope-from git) Date: Sat, 25 Dec 2021 20:45:32 GMT Message-Id: <202112252045.1BPKjWvN014601@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: e1d740eccccd - main - devel/ocaml-opam: Update to 2.1.2 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: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1d740eccccdf0d3afe982c635c4a5e397881ebd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640465133; 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=IjO+gC3IX3u9JGjtlEfkuHek5htdkg1cwp868uQpk2c=; b=vuxf21qNVscX/0ZWsgExMgZNTD71/9FDyxjxuWN7gH5RcnrQzITa2da4cLrco8mNDP38AG 3HVxReagUaC4zBOh77AjiKVwZE5iQVDnM/gqPViTQO4BWt1VAjIarctOxVSV1bAvHgIUiZ dbqXBW2sqlJ1bjTFZS5PDkkEYpZU0E/25kTl93FOjkE2pD5/j3QWd/+e7uZpG0bY1YI6CQ MrD2lbgIwiHNUFwplJbjSKYYhwwpd72pOOGfkgseCZ1DF5KHgML1N2GE7epIicsaoiyAVt bNwL49butEBf9F7iqHO+T/787mr2Tyq3wnJeu9vTHjdC1GfWFoVHoI8R2gFdow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640465133; a=rsa-sha256; cv=none; b=PkG1577AhVS8Y4vwkk+Q+KPphnYByRg/GTb7D2t1prRh+0YYJT18rGtJSRC1B6llUL4pUg qM20IpNJcJA6nxCrKeQgepnvXIU9aEB3W+lOoZGCYRmKT8zEoxSUS8U1IWJlr2WPZOlhxR 7mo0xpZ6xmyrXdlxhFArhPzRqXTNj2bXOht4P6wxkJyHhvTrISLkSo4USWjoJG/fyEUCX/ VTCuhaXscRHOylpz14SGdXUcJ2f/yccmWBHUUn1Jeewk6Q4gk0M+UYZ3QdO0ZxfJbFGqll cF6WrIHd+CnvAU9qMiNueWuQukpF11IQQFHTcTVSs6AvFGenfJCowU5xGBHWag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1d740eccccdf0d3afe982c635c4a5e397881ebd commit e1d740eccccdf0d3afe982c635c4a5e397881ebd Author: Hannes Mehnert AuthorDate: 2021-12-25 20:45:09 +0000 Commit: Guangyuan Yang CommitDate: 2021-12-25 20:45:09 +0000 devel/ocaml-opam: Update to 2.1.2 Changelog: https://github.com/ocaml/opam/blob/2.1.2/CHANGES PR: 259667 --- devel/ocaml-opam/Makefile | 10 +++-- devel/ocaml-opam/distinfo | 6 +-- .../files/patch-shell_bootstrap-ocaml.sh | 20 ++++++++++ ...-patches_0001-Fix-relocation-ocaml-32-bit.patch | 45 ++++++++++++++++++++++ devel/ocaml-opam/pkg-plist | 2 + 5 files changed, 76 insertions(+), 7 deletions(-) diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 216e1187710e..3a81818bb035 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,8 +1,7 @@ # Created by: J. Giovannangeli PORTNAME= opam -PORTVERSION= 2.0.8 -PORTREVISION= 2 +PORTVERSION= 2.1.2 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- @@ -17,13 +16,12 @@ RUN_DEPENDS= curl:ftp/curl \ gpatch:devel/patch USES= gmake -USE_OCAML= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-checks MAKE_JOBS_UNSAFE= yes -ALL_TARGET= lib-ext all +ALL_TARGET= cold-lib-ext cold-all OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC OPTIONS_DEFAULT= GIT RSYNC @@ -36,7 +34,11 @@ GIT_RUN_DEPENDS= git:devel/git MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} RSYNC_RUN_DEPENDS= rsync:net/rsync +pre-configure: + cd ${WRKSRC} && ${MAKE_CMD} compiler + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam .include diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index 36d20180749e..5fb45c6fecbf 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612798209 -SHA256 (opam-full-2.0.8.tar.gz) = 7b9d29233d9633ef50ba766df2e39112b15cd05c1c6fedf80bcb548debcdd9bd -SIZE (opam-full-2.0.8.tar.gz) = 8006252 +TIMESTAMP = 1640170441 +SHA256 (opam-full-2.1.2.tar.gz) = de1e3efffd5942e0101ef83dcdead548cc65a93e13986aecb4a264a059457ede +SIZE (opam-full-2.1.2.tar.gz) = 9442446 diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh new file mode 100644 index 000000000000..afa9173af3b5 --- /dev/null +++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh @@ -0,0 +1,20 @@ +--- shell/bootstrap-ocaml.sh.orig 2021-12-07 16:13:53 UTC ++++ shell/bootstrap-ocaml.sh +@@ -8,7 +8,6 @@ elif command -v wget > /dev/null; then + CURL=wget + else + echo "This script requires curl or wget" +- exit 1 + fi + BOOTSTRAP_DIR=${BOOTSTRAP_DIR:-bootstrap} + BOOTSTRAP_ROOT=${BOOTSTRAP_ROOT:-..} +@@ -43,6 +42,9 @@ else + mkdir -p ${V} + fi + cd ${V} ++for p in ../../src_ext/ocaml-patches/*.patch; do ++ patch -p1 < $p; ++done; + PATH_PREPEND= + LIB_PREPEND= + INC_PREPEND= 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-Fix-relocation-ocaml-32-bit.patch new file mode 100644 index 000000000000..feb111b6dbbe --- /dev/null +++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch @@ -0,0 +1,45 @@ +--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2021-12-25 16:24:31 UTC ++++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch +@@ -0,0 +1,42 @@ ++diff --git a/configure b/configure ++index b1e287aed..4754e8ab2 100755 ++--- a/configure +++++ b/configure ++@@ -14120,6 +14120,17 @@ case $arch in #( ++ esac ;; ++ esac ++ +++# Disable DT_TEXTREL warnings on Linux i386 +++# See https://github.com/ocaml/ocaml/issues/9800 +++ +++case "$system" in #( +++ linux_elf|bsd_elf) : +++ mksharedlib="$mksharedlib -Wl,-z,notext" +++ mkmaindll="$mkmaindll -Wl,-z,notext" ;; #( +++ *) : +++ ;; +++esac +++ ++ # Assembler ++ ++ if test -n "$host_alias"; then : ++diff --git a/configure.ac b/configure.ac ++index 656ffe20c..1c9694805 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -1070,6 +1070,15 @@ AS_CASE([$arch], ++ [common_cflags="-no-pie $common_cflags"], ++ [])]) ++ +++# Disable DT_TEXTREL warnings on Linux i386 +++# See https://github.com/ocaml/ocaml/issues/9800 +++ +++AS_CASE(["$system"], +++ [linux_elf|bsd_elf], +++ [mksharedlib="$mksharedlib -Wl,-z,notext" +++ mkmaindll="$mkmaindll -Wl,-z,notext"], +++ []) +++ ++ # Assembler ++ ++ AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""]) diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist index 9634444a7d62..5be9bb628de8 100644 --- a/devel/ocaml-opam/pkg-plist +++ b/devel/ocaml-opam/pkg-plist @@ -23,6 +23,8 @@ man/man1/opam-install.1.gz man/man1/opam-installer.1.gz man/man1/opam-list.1.gz man/man1/opam-lint.1.gz +man/man1/opam-lock.1.gz +man/man1/opam-option.1.gz man/man1/opam-pin.1.gz man/man1/opam-reinstall.1.gz man/man1/opam-remove.1.gz