From nobody Fri Jul 25 14:11:54 2025 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 4bpVDW0c0Bz639Lw; Fri, 25 Jul 2025 14:11:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpVDV6tjPz3G4q; Fri, 25 Jul 2025 14:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753452715; 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=YSoX440L/5hUKDU8UR+NSUqSQwuESK5b/59FWnqCvio=; b=iADlRKkBnSW2RZOx92CS5m6iCfpXpTHboR2tvtmicflTtQ1xo3iYd7L6hqXkaE6jMAnIEn hYjB5fg5gljRwYh4hKZ/0LYswh698OnBtsA7nsTGHoQ/4WjfRFMCfk8jK5sYR/A6J3+fLc 5Hg4IRNuVTdtG3ZD4/KwfII7qdlC15sm1Rz29iAtmQseg7PUqBHF4EvN9q/LCodZFAWfKM TLQjdUDteV7SL0A4ioxcSU9dnN67GZ1XCLPnedjzZZsCRkozr4wLdnpSwhHYOmyn3TNFtU +GnZp/O1AtELGFXyY1qaciyNOtxJx/f0Z5GhL4UOsUakkdMrAjVw+w/aAYvXPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753452715; 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=YSoX440L/5hUKDU8UR+NSUqSQwuESK5b/59FWnqCvio=; b=JonwekrxgOXgTGS66bACETDWPCRm/vHV7viRb0slnfZ8UeQhIeVhnALu1iWf4nUwByqr6L WWy7A41jdAe11qFI42vn3RMsMtkKTSPLdOVCP7sDlT1mta6uiL8YOCU3XpGhU5ie2J6dji IaBcNCLShO4DSzrrCdkiwoTOoRYXX2eJLcrwPzOfmDqjQL6ch5lmN47V1qNFTDHPxk6m9h oUw/FM7daVZ2VoICAqWqRgv8DRAb1Az0jvQeXdi5ak4RgVNqSFAEznkXDXObkxBwkq7rHs JRlvs2XW3hr9NEIOJmyShMqU54cYT8vXUnuhGwXC1Ybwo8fzIq0s/5JrMYh3NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753452715; a=rsa-sha256; cv=none; b=pFzPSiyjGccCaIVZKnyCNumyZmffM3eEdVCTibJ8SYwF3ezq8bXuLX59iSZg2cn2tHHk/L dNm2EBfM7tD5mdEtkbReyK/IW+6xF+T2SARoy06bjguzLMpAaFF/x5ce/YLMHGWNy4sba5 pS49zhmN5L/quYs1nFDJUu7ttOYOImw8yuowsv2Xu6G0pvxTwQL5ymmRZcIO2Ib0WdfxTW lyuBvSKEfD740f1ezgckPnz5lEp9ZupDMz4stoTGaoe5gvAr+DSznZsoDnprrWTZ9gJzTZ XZpoDD24KxAc5qUBkEx7jCAfqhdU62oKFqxbZBF9EV1Wry/JRCugisAA0es8Mg== 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 4bpVDV6Sc6znFc; Fri, 25 Jul 2025 14:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PEBsFl031489; Fri, 25 Jul 2025 14:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PEBsBN031486; Fri, 25 Jul 2025 14:11:54 GMT (envelope-from git) Date: Fri, 25 Jul 2025 14:11:54 GMT Message-Id: <202507251411.56PEBsBN031486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: ca4e07a59580 - 2025Q3 - www/nift: Fix build 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q3 X-Git-Reftype: branch X-Git-Commit: ca4e07a595801cc5429c54febadfe95cf320e036 Auto-Submitted: auto-generated The branch 2025Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca4e07a595801cc5429c54febadfe95cf320e036 commit ca4e07a595801cc5429c54febadfe95cf320e036 Author: Mamadou Babaei AuthorDate: 2025-07-25 13:37:01 +0000 Commit: Vladimir Druzenko CommitDate: 2025-07-25 14:11:35 +0000 www/nift: Fix build - Fix build: In file included from Expr.cpp:1: In file included from ./Expr.h:8: ./exprtk/exprtk.h:6343:49: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 6343 | expression_node::ndb_t::template collect(branch_, node_delete_list); | ^ Upstream pull request: https://github.com/nifty-site-manager/nsm/pull/38 - Fix bug: nsm.cpp:1455:20: warning: overlapping comparisons always evaluate to false [-Wtautological-overlap-compare] 1455 | if(noParams < 2 && noParams > 5) | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~ 1 warning generated. Upstream pull request: https://github.com/nifty-site-manager/nsm/pull/39 - Make the choice of Lua implementation more intuitive. - Run the strip command once for all binaries. PR: 288379 MFH: 2025Q3 Co-authored-by: Vladimir Druzenko (cherry picked from commit dbade9f054efe783b74f6de1052da4f6964e984a) --- www/nift/Makefile | 21 ++++---- www/nift/files/patch-exprtk_exprtk.h | 101 +++++++++++++++++++++++++++++++++++ www/nift/files/patch-nsm.cpp | 11 ++++ 3 files changed, 123 insertions(+), 10 deletions(-) diff --git a/www/nift/Makefile b/www/nift/Makefile index a3f566c78eaa..ddac5881c67b 100644 --- a/www/nift/Makefile +++ b/www/nift/Makefile @@ -1,6 +1,7 @@ PORTNAME= nift DISTVERSIONPREFIX= v DISTVERSION= 3.0.3 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= info@babaei.net @@ -15,23 +16,23 @@ USE_GITHUB= yes GH_ACCOUNT= nifty-site-manager GH_PROJECT= nsm +MAKE_ARGS= BUNDLED=0 + PLIST_FILES= bin/nift \ bin/nsm -OPTIONS_DEFINE= LUAJIT OPTIONS_DEFAULT= LUAJIT +OPTIONS_SINGLE= LUAIMPL +OPTIONS_SINGLE_LUAIMPL= LUAJIT LUA +LUAIMPL_DESC= Lua implementation LUAJIT_DESC= Use the Just-In-Time compiler for lua LUAJIT_USES= luajit -LUAJIT_USE_OFF= lua -LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=${LUAJIT_LUAVER} -LUAJIT_MAKE_ARGS_OFF= BUNDLED=0 LUA_VERSION=${LUA_VER} - -.if empty(PORT_OPTIONS:MLUAJIT) -USES+= lua -.endif +LUAJIT_MAKE_ARGS= LUAJIT_VERSION=${LUAJIT_LUAVER} +LUA_USES= lua +LUA_MAKE_ARGS= LUA_VERSION=${LUA_VER} post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nsm + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift \ + ${STAGEDIR}${PREFIX}/bin/nsm .include diff --git a/www/nift/files/patch-exprtk_exprtk.h b/www/nift/files/patch-exprtk_exprtk.h new file mode 100644 index 000000000000..c46b67ea8b6f --- /dev/null +++ b/www/nift/files/patch-exprtk_exprtk.h @@ -0,0 +1,101 @@ +--- exprtk/exprtk.h.orig 2024-01-13 12:54:06 UTC ++++ exprtk/exprtk.h +@@ -6340,7 +6340,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -6400,7 +6400,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -6463,7 +6463,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -6507,7 +6507,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -7782,7 +7782,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(index_, node_delete_list); ++ expression_node::ndb_t::collect(index_, node_delete_list); + } + + std::size_t node_depth() const +@@ -11992,7 +11992,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -15283,7 +15283,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -15339,7 +15339,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -15406,7 +15406,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -15473,7 +15473,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const +@@ -16040,7 +16040,7 @@ namespace exprtk + + void collect_nodes(typename expression_node::noderef_list_t& node_delete_list) + { +- expression_node::ndb_t::template collect(branch_, node_delete_list); ++ expression_node::ndb_t::collect(branch_, node_delete_list); + } + + std::size_t node_depth() const diff --git a/www/nift/files/patch-nsm.cpp b/www/nift/files/patch-nsm.cpp new file mode 100644 index 000000000000..63cf40647dae --- /dev/null +++ b/www/nift/files/patch-nsm.cpp @@ -0,0 +1,11 @@ +--- nsm.cpp.orig 2024-01-13 12:54:06 UTC ++++ nsm.cpp +@@ -1452,7 +1452,7 @@ int main(int argc, const char* argv[]) + else if(cmd == "watch") + { + //ensures correct number of parameters given +- if(noParams < 2 && noParams > 5) ++ if(noParams < 2 || noParams > 5) + return parError(noParams, argv, "2-5"); + + WatchList wl;