From nobody Fri Mar 15 10:13:45 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 4Tx0T56K2kz5D5Bn; Fri, 15 Mar 2024 10:13:45 +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 4Tx0T55Pvzz41pG; Fri, 15 Mar 2024 10:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710497625; 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=7Z/tYnZ5fjh2/O1oifOBF8n/b0zallas3MxwfM4k964=; b=Q/ouZd9+fENTi+SRA0T8HyCiKc5tNLZAzFe2RKA4YCe09vY1nOxoBmfEt2J9q1nqCz+M9T QW3671x0RW490Tpe2TqMsrs7fMTm5QZM6nYuscufiUkXQ5jzcLluBkuyxMNM7lMpPRy1oS c5UN4AH2dsD6J91Fzb/Fqy1EiI8eamNaPse8/vzkUiywuVLXbJx0HbX9fNtFWBduPn3tyl V9rCiVTVEsOAkbrJNkxK2NDly3zWKOmjNw2b+HHFnxncUZMfPkoIZEMr9QhZwoG+L39oxm 5LIK7neRHpY5OKRLKaHTOCNQOaYLYe9jC3NE3DWCH2fb7Dmc5zNjV1Z5xLaoFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710497625; a=rsa-sha256; cv=none; b=s3/6A6T//XUxA+xxop8Anvn/vRhVgd6RecNAri4vHwh5sAvSN5U7fzAkZkutja9s3JY8/b OVscV1/9TShX0kXBfx6DaQzDI8hTUEvUYIrwj/1rKHITNAcBDv9a2ruEKKKHmD/ATl4eWS DISAaMatP1XRkdemqwXkJg9Et3TpY/Opx+Ub4f40bQx775+njsDEsp+NC6hIWyTMrSkVq6 t1UQFJFcqhyoe4MIkNcEvGgipsxfN0MR1FJrSo68Rdpty+rQZFEFFfYjrg6wpUSExTBKSA YufVFHqcrxUDFrFEN7zN+vv+0z8QtsOw1A9fli1FFmedqpmX9S/evDIm5H8SWw== 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=1710497625; 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=7Z/tYnZ5fjh2/O1oifOBF8n/b0zallas3MxwfM4k964=; b=bHBas0qAnOSdVQ7hTI4rmSCEoXs6RgZCyJQVprdiQXddsJzDc4M7/VBbgkxxNOWmFoBLeD wJ1jjTJvVw76nZjzTUWqnNd786DdWb8zZMx1ICc201YNkuFxrDbgjP61sQsi19u/Fx0xNf 21DSixGrw5qLksY/eTdMDfYu2W3WpZR93VYmZl91kryPrbYzJnWdu8Zm3OA5Sq2opXrQF1 TwjTysNOpvMlhZPhJSk8uCud2KiaYH4dsxfQjsVW/zzANZytTfmfVxuFkBXim6O6hs8ngA acIiFnXsMu1VoE59mFCI5qyPCNI3pxuAQ+06SYzs2+ZWB+8KS8UShZcpUiWESQ== 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 4Tx0T54vTLz16d3; Fri, 15 Mar 2024 10:13:45 +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 42FADjlZ024459; Fri, 15 Mar 2024 10:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FADjU9024456; Fri, 15 Mar 2024 10:13:45 GMT (envelope-from git) Date: Fri, 15 Mar 2024 10:13:45 GMT Message-Id: <202403151013.42FADjU9024456@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b578b71746d1 - main - sysutils/cardano-cli: Actually make the port buildable. 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b578b71746d14fd3b46f8d4bbd81b31d3c38a750 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b578b71746d14fd3b46f8d4bbd81b31d3c38a750 commit b578b71746d14fd3b46f8d4bbd81b31d3c38a750 Author: Gleb Popov AuthorDate: 2024-03-15 08:25:59 +0000 Commit: Gleb Popov CommitDate: 2024-03-15 10:12:34 +0000 sysutils/cardano-cli: Actually make the port buildable. Fixes: e6cdbf1f12b711a49d3a9cd7992b392568cb8c2d Reported by: pkg-fallout --- sysutils/cardano-cli/Makefile | 28 +++++++++++++++++++++++----- sysutils/cardano-cli/distinfo | 20 +++++++++----------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/sysutils/cardano-cli/Makefile b/sysutils/cardano-cli/Makefile index 5171aea5f103..81aad85682c3 100644 --- a/sysutils/cardano-cli/Makefile +++ b/sysutils/cardano-cli/Makefile @@ -13,11 +13,20 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 -USES= cabal +LIB_DEPENDS= libsecp256k1.so:math/secp256k1 \ + libblst.so:security/blst + +USES= autoreconf:build cabal gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= IntersectMBO +GH_TUPLE= IntersectMBO:libsodium:${LIBSODIUM_HASH}:sodium + +LIBSODIUM_HASH= dbb48cce5429cb6585c9034f002568964f1ce567 + +LIBS_PREFIX= ${WRKDIR}/libs_install + USE_CABAL= Diff-0.5_1 \ FailT-0.1.2.0 \ Glob-0.10.2_3 \ @@ -63,7 +72,7 @@ USE_CABAL= Diff-0.5_1 \ bimap-0.5.0 \ bin-0.1.3_1 \ binary-orphans-1.0.4.1_3 \ - bitvec-1.1.5.0 \ + bitvec-1.1.5.0_1 \ blaze-builder-0.4.2.3 \ boring-0.2.1_1 \ brick-2.3.1 \ @@ -169,7 +178,6 @@ USE_CABAL= Diff-0.5_1 \ fin-0.3_2 \ fingertree-0.1.5.0 \ flat-0.6 \ - foldable1-classes-compat-0.1_4 \ foldl-1.4.15_1 \ formatting-7.2.0 \ foundation-0.0.30 \ @@ -189,7 +197,7 @@ USE_CABAL= Diff-0.5_1 \ hashable-1.4.3.0_1 \ haskell-lexer-1.1.1 \ heapwords-0.1.0.2:chap \ - hedgehog-1.4_3 \ + hedgehog-1.4_4 \ hedgehog-extras-0.6.0.2 \ hedgehog-quickcheck-0.1.1_6 \ hourglass-0.2.12 \ @@ -297,7 +305,7 @@ USE_CABAL= Diff-0.5_1 \ safe-0.3.21_1 \ safe-exceptions-0.1.7.4_1 \ scientific-0.3.7.0_7 \ - selective-0.6_1 \ + selective-0.5 \ semialign-1.3_1 \ semigroupoids-6.0.0.1_1 \ semigroups-0.20 \ @@ -396,4 +404,14 @@ USE_CABAL= Diff-0.5_1 \ CABAL_PROJECT= append CABAL_REPOSITORIES= chap +WITH_LTO= yes + +pre-build: + @${MKDIR} ${PKGCONFIG_LINKDIR} + + cd ${WRKSRC_sodium} && ./autogen.sh + cd ${WRKSRC_sodium} && ./configure --prefix=${LIBS_PREFIX} --with-pthreads --disable-shared + cd ${WRKSRC_sodium} && ${GMAKE} -j${MAKE_JOBS_NUMBER} && ${GMAKE} ${INSTALL_TARGET} + ${MV} ${LIBS_PREFIX}/lib/pkgconfig/libsodium.pc ${PKGCONFIG_LINKDIR} + .include diff --git a/sysutils/cardano-cli/distinfo b/sysutils/cardano-cli/distinfo index 21783e14bcc9..1578e70a2bf8 100644 --- a/sysutils/cardano-cli/distinfo +++ b/sysutils/cardano-cli/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1708026435 +TIMESTAMP = 1710489749 SHA256 (cabal/Diff-0.5/Diff-0.5.tar.gz) = 03cc84dedfb18fa693f0b0b7054d65e92c388d0657cf45ad5e9fbe3fe8b54551 SIZE (cabal/Diff-0.5/Diff-0.5.tar.gz) = 9122 SHA256 (cabal/Diff-0.5/revision/1.cabal) = 9c8a972eead9e079b90c6581fa8ef5755662c10dd075951b32b801145704afbb @@ -131,6 +131,8 @@ SHA256 (cabal/binary-orphans-1.0.4.1/revision/3.cabal) = 9d2bdc3fdbe43fad20d659e SIZE (cabal/binary-orphans-1.0.4.1/revision/3.cabal) = 2482 SHA256 (cabal/bitvec-1.1.5.0/bitvec-1.1.5.0.tar.gz) = 83d27cee5be1d5342ddbf39999d0c8ea54cb433d0891eea5471fbfaa29f8dec5 SIZE (cabal/bitvec-1.1.5.0/bitvec-1.1.5.0.tar.gz) = 40076 +SHA256 (cabal/bitvec-1.1.5.0/revision/1.cabal) = cb3efd76b71a9e8a930f4ce5d8c91adcb63ac0d8dc3d2d4a132d490bd1ecb391 +SIZE (cabal/bitvec-1.1.5.0/revision/1.cabal) = 4920 SHA256 (cabal/blaze-builder-0.4.2.3/blaze-builder-0.4.2.3.tar.gz) = 66291874236b7342adab033e3cddae414a23a2865dfb44095dfc4e0b9d46703b SIZE (cabal/blaze-builder-0.4.2.3/blaze-builder-0.4.2.3.tar.gz) = 60777 SHA256 (cabal/boring-0.2.1/boring-0.2.1.tar.gz) = b1ffddf0f9d50ac8742aa01b270856d57937cc8f7aae783e3b5f3abee7aa3154 @@ -383,10 +385,6 @@ SHA256 (cabal/fingertree-0.1.5.0/fingertree-0.1.5.0.tar.gz) = f3263c92fa8b18f1e1 SIZE (cabal/fingertree-0.1.5.0/fingertree-0.1.5.0.tar.gz) = 20656 SHA256 (cabal/flat-0.6/flat-0.6.tar.gz) = a4324174159b79dabbb155572a33d109ea4bd3b105a6c1c658a36e604e1daf86 SIZE (cabal/flat-0.6/flat-0.6.tar.gz) = 74253 -SHA256 (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = d057c3f358e1a6b72c73519bc64ba6aa959f066c08fed69f73258555ef95ff12 -SIZE (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = 10484 -SHA256 (cabal/foldable1-classes-compat-0.1/revision/4.cabal) = fb4b3cedd33d5c22c573c39baa930c78eaa4feb22d43abb680c3149f8ab9fa4e -SIZE (cabal/foldable1-classes-compat-0.1/revision/4.cabal) = 3782 SHA256 (cabal/foldl-1.4.15/foldl-1.4.15.tar.gz) = 9cb2f105141788cbc6e66480a8f46c13d52666899eec1e2cc3dc4d60f606c0ae SIZE (cabal/foldl-1.4.15/foldl-1.4.15.tar.gz) = 24449 SHA256 (cabal/foldl-1.4.15/revision/1.cabal) = 65d2b3018f778f795d4df96772f0b428cf1853e05298a652e97da183836cfee1 @@ -439,8 +437,8 @@ SHA256 (cabal/heapwords-0.1.0.2.tar.gz) = a0285b2d6ce541a6ea76db152a61a7250b0947 SIZE (cabal/heapwords-0.1.0.2.tar.gz) = 7422 SHA256 (cabal/hedgehog-1.4/hedgehog-1.4.tar.gz) = f54afb31552e0f809030becad349cbfe19a65753a778771dc7314b2a6c41e6eb SIZE (cabal/hedgehog-1.4/hedgehog-1.4.tar.gz) = 77762 -SHA256 (cabal/hedgehog-1.4/revision/3.cabal) = 9195af7e03f6255b087f0a09b4100ba3d805d303aef64b3a8543b2123f7851a2 -SIZE (cabal/hedgehog-1.4/revision/3.cabal) = 4727 +SHA256 (cabal/hedgehog-1.4/revision/4.cabal) = a0f66c28ea6c94d80db4856ee35b1b882e7581a3abc2426e9af287aec2dd1c30 +SIZE (cabal/hedgehog-1.4/revision/4.cabal) = 4727 SHA256 (cabal/hedgehog-extras-0.6.0.2/hedgehog-extras-0.6.0.2.tar.gz) = 6a4abf81b3aecdfd6ce57022241e41f9b484cc0477277b730851ead425f75a12 SIZE (cabal/hedgehog-extras-0.6.0.2/hedgehog-extras-0.6.0.2.tar.gz) = 24459 SHA256 (cabal/hedgehog-quickcheck-0.1.1/hedgehog-quickcheck-0.1.1.tar.gz) = 97b65db815fdfaacc7c4d06a7b9b74680b50264afa03f839c4037dcc875152fc @@ -733,10 +731,8 @@ SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9 SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723 SHA256 (cabal/scientific-0.3.7.0/revision/7.cabal) = 909755ab19b453169ff85281323da1488407776b2360bd9f7afdd219fd306ef2 SIZE (cabal/scientific-0.3.7.0/revision/7.cabal) = 4869 -SHA256 (cabal/selective-0.6/selective-0.6.tar.gz) = 18742e33b17c278e690b29e03ea71575bcaf89f4ca044449f9908bd77ca67c3a -SIZE (cabal/selective-0.6/selective-0.6.tar.gz) = 35470 -SHA256 (cabal/selective-0.6/revision/1.cabal) = 30b336b9ad50b17316b4f2e29ddf0d30f14ea44c9b8299fa2de8a0efd5167eb7 -SIZE (cabal/selective-0.6/revision/1.cabal) = 3579 +SHA256 (cabal/selective-0.5/selective-0.5.tar.gz) = b0fda80309a83d8f9eed9b8798b3c8c6626600154948323a8d80ab8e2c2f8da3 +SIZE (cabal/selective-0.5/selective-0.5.tar.gz) = 34055 SHA256 (cabal/semialign-1.3/semialign-1.3.tar.gz) = 628e43319f584a8dd46c124ee0685cac586e0f6f877c5ceff37c3dbb2e3cc56c SIZE (cabal/semialign-1.3/semialign-1.3.tar.gz) = 10543 SHA256 (cabal/semialign-1.3/revision/1.cabal) = 7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223 @@ -1001,3 +997,5 @@ SHA256 (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 7e43c205e1e1ff5a4b033086ec8cce SIZE (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 369149 SHA256 (cabal/IntersectMBO-cardano-cli-cardano-cli-8.20.1.0_GH0.tar.gz) = f813c50f724832547df55b39fc370f340ecd0296c9ff5299688a0fdb73b6b39b SIZE (cabal/IntersectMBO-cardano-cli-cardano-cli-8.20.1.0_GH0.tar.gz) = 1129093 +SHA256 (cabal/IntersectMBO-libsodium-dbb48cce5429cb6585c9034f002568964f1ce567_GH0.tar.gz) = e4f29ae3c16037e484bb69e3fa22a5565c42adf497f8f88e61ff8d9486ab863e +SIZE (cabal/IntersectMBO-libsodium-dbb48cce5429cb6585c9034f002568964f1ce567_GH0.tar.gz) = 2073757