git: d5a8e8c402f9 - main - devel/nimble: Update to 0.16.0

From: Wen Heping <wen_at_FreeBSD.org>
Date: Sat, 27 Jul 2024 06:52:49 UTC
The branch main has been updated by wen:

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

commit d5a8e8c402f99d45c20ff1811dde32aa4d94a9a2
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2024-07-27 04:06:33 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2024-07-27 06:52:18 +0000

    devel/nimble: Update to 0.16.0
    
    PR:             280444
    Reported by:    ports@nicandneal.net(maintainer)
---
 devel/nimble/Makefile | 20 ++++++++++++++++++--
 devel/nimble/distinfo | 12 +++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/devel/nimble/Makefile b/devel/nimble/Makefile
index bf6953e53f52..560a1282d205 100644
--- a/devel/nimble/Makefile
+++ b/devel/nimble/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nimble
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.14.2
+DISTVERSION=	0.16.0
 CATEGORIES=	devel
 
 MAINTAINER=	ports@nicandneal.net
@@ -13,13 +13,29 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 BUILD_DEPENDS=	${LOCALBASE}/nim/bin/nim:lang/nim
 RUN_DEPENDS=	${LOCALBASE}/nim/bin/nim:lang/nim
 
+NIMVER=		2.0.8
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	nim-lang
+GH_PROJECT=	sat:sat checksums:checksums nim:nim
+GH_TAGNAME=	faf1617f44d7632ee9601ebc13887644925dcc01:sat b4c73320253f78e3a265aec6d9e8feb83f97c77b:checksums v${NIMVER}:nim
 
 PLIST_FILES=	bin/nimble
 
+post-extract:
+	# Nim gets extracted with a different name to WRKSRC_nim!
+	${MV} ${WRKDIR}/Nim-${NIMVER} ${WRKSRC_nim}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|import ../dist/sat/src/sat/sat|import "${WRKSRC_sat}"/src/sat/sat|g' ${WRKSRC}/src/nimble.nim
+	@${REINPLACE_CMD} -e 's|import ../../dist/checksums/src/checksums/sha1| import "${WRKSRC_checksums}"/src/checksums/sha1|g' ${WRKSRC}/src/nimblepkg/sha1hashes.nim
+	@${REINPLACE_CMD} -e 's|from "$$nim" / compiler/nimblecmd|from "${WRKSRC_nim}"/compiler/nimblecmd|g' ${WRKSRC}/src/nimblepkg/tools.nim
+	@${REINPLACE_CMD} -e 's|import ../dist/checksums/src/checksums/sha1|import "${WRKSRC_checksums}"/src/checksums/sha1|g' ${WRKSRC_nim}/compiler/nimblecmd.nim
+	@${REINPLACE_CMD} -e 's|import ../../dist/checksums/src/checksums/sha1|import "${WRKSRC_checksums}"/src/checksums/sha1|g' ${WRKSRC}/src/nimblepkg/checksums.nim
+	@${REINPLACE_CMD} -e 's|import ../../dist/sat/src/sat/|import "${WRKSRC_sat}"/src/sat/|g' ${WRKSRC}/src/nimblepkg/nimblesat.nim
+
 do-build:
-	@cd ${WRKSRC} && ${LOCALBASE}/nim/bin/nim c -d:release --noNimblePath --parallelBuild=${MAKE_JOBS_NUMBER} --path:${LOCALBASE}/nim --nimcache:${WRKSRC}/nimcache src/nimble
+	@cd ${WRKSRC} && ${LOCALBASE}/nim/bin/nim c -d:release --noNimblePath -d:nimNimbleBootstrap --parallelBuild=${MAKE_JOBS_NUMBER} --path:${LOCALBASE}/nim --nimcache:${WRKSRC}/nimcache src/nimble
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nimble ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/nimble/distinfo b/devel/nimble/distinfo
index 4a0744ecdd94..0a45ecbc84ad 100644
--- a/devel/nimble/distinfo
+++ b/devel/nimble/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1677159219
-SHA256 (nim-lang-nimble-v0.14.2_GH0.tar.gz) = d94f11c592d49aed6c5a492289f187010eb8c103b2b653252763d2f65a82abac
-SIZE (nim-lang-nimble-v0.14.2_GH0.tar.gz) = 163065
+TIMESTAMP = 1722048869
+SHA256 (nim-lang-nimble-v0.16.0_GH0.tar.gz) = 296e323bb8fb770e09b31f6964f2882c164d042a9e9fce7dfe46c000701556dd
+SIZE (nim-lang-nimble-v0.16.0_GH0.tar.gz) = 631444
+SHA256 (nim-lang-sat-faf1617f44d7632ee9601ebc13887644925dcc01_GH0.tar.gz) = dfb90aa7fa629bb7bd395ae041410362439492600d06978d29ba726c16ef4077
+SIZE (nim-lang-sat-faf1617f44d7632ee9601ebc13887644925dcc01_GH0.tar.gz) = 9736
+SHA256 (nim-lang-checksums-b4c73320253f78e3a265aec6d9e8feb83f97c77b_GH0.tar.gz) = 6d1118eb45b2257f0fb4bc88a62672d13f01bccce536ae6ba5ba67a964649968
+SIZE (nim-lang-checksums-b4c73320253f78e3a265aec6d9e8feb83f97c77b_GH0.tar.gz) = 47342
+SHA256 (nim-lang-nim-v2.0.8_GH0.tar.gz) = 3a408e8342392342db745e26bb6acab2e6acb381db89b2624e8e58a85a1c6656
+SIZE (nim-lang-nim-v2.0.8_GH0.tar.gz) = 4105524