From nobody Mon Nov 28 17:41:21 2022 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 4NLXns5tT8z4jSPL; Mon, 28 Nov 2022 17:41:21 +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 4NLXns53Wcz49wn; Mon, 28 Nov 2022 17:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669657281; 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=PedwDh1E43sqoD3G7iGwspxUjHhkhoia5VOaBtWytvM=; b=qEf3Jywg7tqhqQQaKiJoYSNU9ssJCMfRgB6y0RooGBxMKWSZ4JvbiK+LAIK9g5snRhwU2f rz4jxWrEfArngQEjU4RUqAH0CtkUwX9/Ahv0eg+EdL5+P3oV7TNVwUId4yXth8BwoEZpyG dzDQmv4jVhA5N4tdcHUpcCb+WGAwiGZumYnCOcNIT4mFHsc2/lojzSQeh4zMLo4XvdMn0G bI4j/Aijn9Ap5IBw/heceQ7H9m/hmx/6aWw7ADLD35Ne5T/eIWxL/wnJzn0xZ3vChcCl9x 7j0/pWrFwGFQMil6sgTMFD6oOi5XQz+n9gVqwOyUrI2OBLe4Ti/qrq+ngaMI6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669657281; 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=PedwDh1E43sqoD3G7iGwspxUjHhkhoia5VOaBtWytvM=; b=Umb1OG68kIUMdDmKi8GrkL2Xi5I+n6CMzas+Z93duPJgHiDumJq2CDbWumnC99KoMkkxRA FNsLzFHWafF6sMYMjEgCRSG9YCFpG4ULXX4+3MAo7Y8wR5b0qoCM0DKExv4CpeERsGABMj ilxSrI4bCghAg1EUosplvuJmrRZjm2v+lHjgTomTa96SCr8ZPdhszFX7USn9OKvVuap2gG QYQnwN4uog6kgZTeFjoymPrQZv1/ijmKtxYrcTT+YdjYVKsDyLdiYMKwvzKXl1OTMG+NBA 94RDC4x5QAlJnV3bVFiU+/fHpDgNey08QQuc9YSMap7/YbmIZqxyozY9aZ1X2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669657281; a=rsa-sha256; cv=none; b=UplhEM8zrElFerjh1w3OIsAJx6uHHfNd9iJvUpMy2sS01e1AQoj688t5KuXETwE9fSbn3j Ka4NkFT5C5jD6QVxNzymx9uaq71oMD0J2hkK9+l7AfhV1PsTJaWw6UojgOI2dMwlrXvuMN V/cAzhgHyeiVJ0/NqW+AWQAP55JPv4WB/45xCTm7eHqa8Y2VLMEAHP/KTQa/zfNL3p7Hnt ZtJpVdQDGmD3x6nrAefRKUh9FlD9CNWu+iqqVz2p2M4sNF6bDNA+v/rMDLrOcCG31JJSnt WW1EuOml1SgSAFLPANFh83xzhIx7TSFUwNJirjw/s2ugplFMX9pxWbOJCM/Q/w== 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 4NLXns46lJzm4P; Mon, 28 Nov 2022 17:41:21 +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 2ASHfLKk004465; Mon, 28 Nov 2022 17:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHfLPP004464; Mon, 28 Nov 2022 17:41:21 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:41:21 GMT Message-Id: <202211281741.2ASHfLPP004464@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 415aa8df9d22 - main - lang/nim: Update to 1.6.10 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 415aa8df9d225599f057a56617e3becaae6a0a84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=415aa8df9d225599f057a56617e3becaae6a0a84 commit 415aa8df9d225599f057a56617e3becaae6a0a84 Author: Neal Nelson AuthorDate: 2022-11-28 17:34:18 +0000 Commit: Nuno Teixeira CommitDate: 2022-11-28 17:40:20 +0000 lang/nim: Update to 1.6.10 ChangeLog: https://nim-lang.org/blog/2022/11/23/version-1610-released.html PR: 267984 MFH: 2022Q4 (bugfixes) --- lang/nim/Makefile | 15 ++++++++++++--- lang/nim/distinfo | 6 +++--- lang/nim/files/patch-compiler_nimpaths.nim | 13 +++++++++++++ lang/nim/pkg-plist | 3 +++ 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/lang/nim/Makefile b/lang/nim/Makefile index 93aeac2d05aa..52efcb06fa1c 100644 --- a/lang/nim/Makefile +++ b/lang/nim/Makefile @@ -1,5 +1,5 @@ PORTNAME= nim -DISTVERSION= 1.6.8 +DISTVERSION= 1.6.10 CATEGORIES= lang MASTER_SITES= https://nim-lang.org/download/ @@ -19,8 +19,6 @@ USES= compiler:c11 cpe tar:xz CPE_VENDOR= nim-lang -MAKE_JOBS_UNSAFE= yes - OPTIONS_DEFINE= DOCS TOOLS OPTIONS_DEFAULT= TOOLS OPTIONS_EXCLUDE_powerpc64= DOCS @@ -46,6 +44,13 @@ post-patch: @${REINPLACE_CMD} -e s/%%GCC_DEFAULT%%/${GCC_DEFAULT}/ \ ${WRKSRC}/build.sh ${WRKSRC}/config/nim.cfg .endif + # Make a fake nimdoc.css so that we can change the expected target + # to where it should be, instead of where the nim project hard + # code it to be. + ${MKDIR} ${WRKSRC}/share/doc/nim + ${LN} -s ${WRKSRC}/doc/nimdoc.css ${WRKSRC}/share/doc/nim/nimdoc.css + ${MKDIR} ${WRKSRC}/share/nim + ${LN} -s ${WRKSRC}/tools/dochack ${WRKSRC}/share/nim/dochack do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ @@ -93,6 +98,10 @@ do-install-TOOLS-on: .for t in ${TLIST} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${STAGEDIR}${PREFIX}/bin .endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/share/nim/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.nim ${STAGEDIR}${PREFIX}/share/nim/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.js ${STAGEDIR}${PREFIX}/share/nim/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/fuzzysearch.nim ${STAGEDIR}${PREFIX}/share/nim/dochack do-test: cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \ diff --git a/lang/nim/distinfo b/lang/nim/distinfo index 942a5b88c6cc..35a292cdb088 100644 --- a/lang/nim/distinfo +++ b/lang/nim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664352984 -SHA256 (nim-1.6.8.tar.xz) = 0f5b65cdb60f78af41cb075c238983689a1e1f7e25c819f179862c18a484cf57 -SIZE (nim-1.6.8.tar.xz) = 5219880 +TIMESTAMP = 1669300700 +SHA256 (nim-1.6.10.tar.xz) = 13d7702f8b57087babe8cd051c13bc56a3171418ba867b49c6bbd09b29d24fea +SIZE (nim-1.6.10.tar.xz) = 5216284 diff --git a/lang/nim/files/patch-compiler_nimpaths.nim b/lang/nim/files/patch-compiler_nimpaths.nim new file mode 100644 index 000000000000..40ee13ff8f4e --- /dev/null +++ b/lang/nim/files/patch-compiler_nimpaths.nim @@ -0,0 +1,13 @@ +--- compiler/nimpaths.nim.orig 2022-11-21 01:04:21 UTC ++++ compiler/nimpaths.nim +@@ -20,8 +20,8 @@ Unstable API + import os, strutils + + const +- docCss* = "$nimr/doc/nimdoc.css" +- docHackNim* = "$nimr/tools/dochack/dochack.nim" ++ docCss* = "$nimr/share/doc/nim/nimdoc.css" ++ docHackNim* = "$nimr/share/nim/dochack/dochack.nim" + docHackJs* = docHackNim.changeFileExt("js") + docHackJsFname* = docHackJs.lastPathPart + theindexFname* = "theindex.html" diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist index 26ae9d3fdea0..313fe2a9a080 100644 --- a/lang/nim/pkg-plist +++ b/lang/nim/pkg-plist @@ -495,6 +495,9 @@ lib/nim/wrappers/pcre.nim lib/nim/wrappers/postgres.nim lib/nim/wrappers/sqlite3.nim lib/nim/wrappers/tinyc.nim +share/nim/dochack/dochack.nim +share/nim/dochack/dochack.js +share/nim/dochack/fuzzysearch.nim %%PORTDOCS%%%%DOCSDIR%%/advopt.txt %%PORTDOCS%%%%DOCSDIR%%/apis.rst %%PORTDOCS%%%%DOCSDIR%%/astspec.txt