Index: head/www/nift/Makefile
===================================================================
--- head/www/nift/Makefile	(revision 568937)
+++ head/www/nift/Makefile	(revision 568938)
@@ -1,66 +1,66 @@
 # Created by: Mohammad S. Babaei <info@babaei.net>
 # $FreeBSD$
 
 PORTNAME=	nift
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.12
+DISTVERSION=	2.4.0
 CATEGORIES=	www
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Cross-platform open source website generator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++11-lang gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	nifty-site-manager
 GH_PROJECT=	nsm
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_SINGLE=		LUA
 OPTIONS_SINGLE_LUA=	BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA54 PORTS_LUA53 PORTS_LUA52 PORTS_LUA51
 
 OPTIONS_DEFAULT=	BUNDLED_LUAJIT
 OPTIONS_DEFAULT_powerpc64=	BUNDLED_LUA53
 OPTIONS_DEFAULT_powerpc64le=	BUNDLED_LUA53
 OPTIONS_DEFAULT_riscv64=	BUNDLED_LUA53
 OPTIONS_EXCLUDE_powerpc64=	BUNDLED_LUAJIT
 OPTIONS_EXCLUDE_powerpc64le=	BUNDLED_LUAJIT
 OPTIONS_EXCLUDE_riscv64=	BUNDLED_LUAJIT
 
 BUNDLED_LUAJIT_DESC=	Use the bundled LuaJIT
 BUNDLED_LUA53_DESC=	Use the bundled Lua 5.3
 PORTS_LUAJIT_DESC=	Use LuaJIT from FreeBSD Ports
 PORTS_LUA54_DESC=	Use Lua 5.4 from FreeBSD Ports
 PORTS_LUA53_DESC=	Use Lua 5.3 from FreeBSD Ports
 PORTS_LUA52_DESC=	Use Lua 5.2 from FreeBSD Ports
 PORTS_LUA51_DESC=	Use Lua 5.1 from FreeBSD Ports
 
 BUNDLED_LUAJIT_MAKE_ARGS=	BUNDLED=1
 BUNDLED_LUAJIT_VARS=		MAKE_JOBS_UNSAFE=	yes
 BUNDLED_LUA53_MAKE_ARGS=	BUNDLED=1 LUA_VERSION=5.3
 BUNDLED_LUA53_VARS=		MAKE_JOBS_UNSAFE=	yes
 PORTS_LUAJIT_MAKE_ARGS=		BUNDLED=0 LUAJIT_VERSION=2.0
 PORTS_LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 PORTS_LUA54_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.4
 PORTS_LUA54_LIB_DEPENDS=	liblua-5.4.so:lang/lua54
 PORTS_LUA53_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.3
 PORTS_LUA53_LIB_DEPENDS=	liblua-5.3.so:lang/lua53
 PORTS_LUA52_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.2
 PORTS_LUA52_LIB_DEPENDS=	liblua-5.2.so:lang/lua52
 PORTS_LUA51_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.1
 PORTS_LUA51_LIB_DEPENDS=	liblua-5.1.so:lang/lua51
 
 PLIST_FILES=	bin/nift \
 		bin/nsm
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nsm
 
 .include <bsd.port.mk>
Index: head/www/nift/distinfo
===================================================================
--- head/www/nift/distinfo	(revision 568937)
+++ head/www/nift/distinfo	(revision 568938)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614869866
-SHA256 (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = ddf93325c320f7b3dbcaa19a713ca740b909d229cd855d813575a3ca0cac8c61
-SIZE (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = 1607987
+TIMESTAMP = 1616377949
+SHA256 (nifty-site-manager-nsm-v2.4.0_GH0.tar.gz) = 7f6c0d8db59d0bcd46dc87a4e7190280a311196c2550524f923319e8a9495ad5
+SIZE (nifty-site-manager-nsm-v2.4.0_GH0.tar.gz) = 1600125
Index: head/www/nift/files/patch-Makefile
===================================================================
--- head/www/nift/files/patch-Makefile	(revision 568937)
+++ head/www/nift/files/patch-Makefile	(revision 568938)
@@ -1,159 +1,159 @@
---- Makefile.orig	2021-03-07 20:18:20 UTC
+--- Makefile.orig	2021-03-22 01:52:47 UTC
 +++ Makefile
 @@ -3,14 +3,14 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory.
  cppfiles=nsm.cpp ConsoleColor.cpp DateTimeInfo.cpp Directory.cpp Expr.cpp ExprtkFns.cpp Filename.cpp FileSystem.cpp Getline.cpp GitInfo.cpp hashtk/HashTk.cpp Lolcat.cpp LuaFns.cpp Lua.cpp NumFns.cpp Pagination.cpp Parser.cpp Path.cpp ProjectInfo.cpp Quoted.cpp StrFns.cpp SystemInfo.cpp Title.cpp TrackedInfo.cpp Variables.cpp WatchList.cpp
  
  DESTDIR?=
 -PREFIX?=/usr/local
 +PREFIX?=%%LOCALBASE%%
  BINDIR=${DESTDIR}${PREFIX}/bin
  LIBDIR=${DESTDIR}${PREFIX}/lib
  
  CXX?=g++
  CXXFLAGS+=-std=c++11 -Wall -Wextra -pedantic -O3 -Dexprtk_disable_caseinsensitivity
  #CXXFLAGS=-std=c++11 -Wall -Wextra -Werror -pedantic -O3
 -LDFLAGS+=-pthread
 +LINK+=-pthread
  
  ifeq ($(OS),Windows_NT) 
-     detected_OS := Windows
+ 	detected_OS := Windows
 @@ -22,7 +22,7 @@ ifeq ($(CXX),clang)
  	ifeq ($(OS),FreeBSD) 
  	else
  		CXXFLAGS+= -Qunused-arguments -lstdc++
--	    LDFLAGS+= -lm
-+	    LINK+= -lm
+-		LDFLAGS+= -lm
++		LINK+= -lm
  	endif
  endif
  
 @@ -71,66 +71,66 @@ ifeq ($(BUNDLED),0)
  		WAS_UNBUNDLED=1
  		ifneq ($(LUA_VERSION),)
-     		CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
--    		LDFLAGS+= -LLua-5.3/src -llua
-+    		LINK+= -LLua-5.3/src -llua
-     	else
-     		CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
+ 			CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
+-			LDFLAGS+= -LLua-5.3/src -llua
++			LINK+= -LLua-5.3/src -llua
+ 		else
+ 			CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
 -			LDFLAGS+= -LLuaJIT/src -llua51
 +			LINK+= -LLuaJIT/src -llua51
-     	endif
+ 		endif
  	else ifeq ($(LUA_VERSION),x) 
- 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
+ 		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUA_VERSION_x__
--	    	LDFLAGS+= -L/usr/local/lib -llua -lm -ldl  
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl  
+-			LDFLAGS+= -L/usr/local/lib -llua -lm -ldl  
++			LINK+= -L/usr/local/lib -llua -lm -ldl  
  		else                                # *nix
  			CXXFLAGS+= -D__LUA_VERSION_x__
--	    	LDFLAGS+= -L/usr/local/lib -llua -ldl
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua -ldl
+-			LDFLAGS+= -L/usr/local/lib -llua -ldl
++			LINK+= -L/usr/local/lib -llua -ldl
  		endif
  	else ifeq ($(LUA_VERSION),5.4) 
- 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
+ 		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUA_VERSION_5_4__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl  
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl  
+-			LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl  
++			LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl  
  		else                                # *nix
  			CXXFLAGS+= -D__LUA_VERSION_5_4__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl
+-			LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
++			LINK+= -L/usr/local/lib -llua-5.4 -ldl
  		endif
  	else ifeq ($(LUA_VERSION),5.3) 
- 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
+ 		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUA_VERSION_5_3__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl  
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl  
+-			LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl  
++			LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl  
  		else                                # *nix
  			CXXFLAGS+= -D__LUA_VERSION_5_3__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl
+-			LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
++			LINK+= -L/usr/local/lib -llua-5.3 -ldl
  		endif
  	else ifeq ($(LUA_VERSION),5.2) 
- 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
+ 		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUA_VERSION_5_2__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl  
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl  
+-			LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl  
++			LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl  
  		else                                # *nix
  			CXXFLAGS+= -D__LUA_VERSION_5_2__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl
+-			LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
++			LINK+= -L/usr/local/lib -llua-5.2 -ldl
  		endif
  	else ifeq ($(LUA_VERSION),5.1) 
- 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
+ 		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUA_VERSION_5_1__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl  
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl  
+-			LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl  
++			LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl  
  		else                                # *nix
  			CXXFLAGS+= -D__LUA_VERSION_5_1__
--	    	LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
-+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl
+-			LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
++			LINK+= -L/usr/local/lib -llua-5.1 -ldl
  		endif
  	else ifeq ($(LUAJIT_VERSION),2.0)
  		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
 -			LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1  
-+			LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1  
++			LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1  
  		else                                # *nix
  			CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
 -			LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 
-+			LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1 
++			LINK+= -ldl -L/usr/local/lib -lluajit-5.1 
  		endif
  	else
  		ifeq ($(detected_OS),FreeBSD)  # FreeBSD
  			CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
 -			LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1  
-+			LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1  
++			LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1  
  		else                                # *nix
  			CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
 -			LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 
-+			LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1 
++			LINK+= -ldl -L/usr/local/lib -lluajit-5.1 
  		endif
  	endif
  else
 @@ -138,24 +138,24 @@ else
  	ifeq ($(LUA_VERSION),5.3) 
  		CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
- 	    ifeq ($(detected_OS),Windows)  # Windows
--	    	LDFLAGS+= -LLua-5.3/src -llua
--	    	#LDFLAGS+= -LLua-5.3/src -llua
-+	    	LINK+= -LLua-5.3/src -llua
-+	    	#LINK+= -LLua-5.3/src -llua
+ 		ifeq ($(detected_OS),Windows)  # Windows
+-			LDFLAGS+= -LLua-5.3/src -llua
+-			#LDFLAGS+= -LLua-5.3/src -llua
++			LINK+= -LLua-5.3/src -llua
++			#LINK+= -LLua-5.3/src -llua
  		else ifeq ($(detected_OS),FreeBSD)  # FreeBSD
--	    	LDFLAGS+= -LLua-5.3/src -llua -ldl -lm
-+	    	LINK+= -LLua-5.3/src -llua -ldl -lm
+-			LDFLAGS+= -LLua-5.3/src -llua -ldl -lm
++			LINK+= -LLua-5.3/src -llua -ldl -lm
  		else                                # *nix/Vercel
--	    	LDFLAGS+= -LLua-5.3/src -llua -ldl
-+	    	LINK+= -LLua-5.3/src -llua -ldl
+-			LDFLAGS+= -LLua-5.3/src -llua -ldl
++			LINK+= -LLua-5.3/src -llua -ldl
  		endif
  	else
  		CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
  		ifeq ($(detected_OS),Windows)  # Windows
--	    	LDFLAGS+= -LLuaJIT/src -llua51
+-			LDFLAGS+= -LLuaJIT/src -llua51
 -			#LDFLAGS+= -L. -llua51
-+	    	LINK+= -LLuaJIT/src -llua51
++			LINK+= -LLuaJIT/src -llua51
 +			#LINK+= -L. -llua51
  		else ifeq ($(detected_OS),FreeBSD)  # FreeBSD
 -			LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl -lm
 -			#LDFLAGS+= -ldl -lm -LLuaJIT/src -lluajit
 +			LINK+= ./LuaJIT/src/libluajit.a -ldl -lm
 +			#LINK+= -ldl -lm -LLuaJIT/src -lluajit
  		else                                # *nix/Vercel
 -			LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl
 -			#LDFLAGS+= -ldl -LLuaJIT/src -lluajit
 +			LINK+= ./LuaJIT/src/libluajit.a -ldl
 +			#LINK+= -ldl -LLuaJIT/src -lluajit
  		endif
  	endif
  endif
-@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h
+@@ -234,10 +234,10 @@ endif 
  
  nsm: $(objects)
  ifeq ($(detected_OS),Windows)  # Windows
 -	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
 +	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
  	copy nsm.exe nift.exe
  else
 -	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
 +	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
  	cp nsm nift
  endif