Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2024 10:13:45 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b578b71746d1 - main - sysutils/cardano-cli: Actually make the port buildable.
Message-ID:  <202403151013.42FADjU9024456@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b578b71746d14fd3b46f8d4bbd81b31d3c38a750

commit b578b71746d14fd3b46f8d4bbd81b31d3c38a750
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-03-15 08:25:59 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
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 <bsd.port.mk>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403151013.42FADjU9024456>