summaryrefslogtreecommitdiff
path: root/www/nift
diff options
context:
space:
mode:
Diffstat (limited to 'www/nift')
-rw-r--r--www/nift/Makefile21
-rw-r--r--www/nift/files/patch-exprtk_exprtk.h101
-rw-r--r--www/nift/files/patch-nsm.cpp11
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 <bsd.port.mk>
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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(index_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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<T>::noderef_list_t& node_delete_list)
+ {
+- expression_node<T>::ndb_t::template collect(branch_, node_delete_list);
++ expression_node<T>::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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-30 02:01:55 +0000