aboutsummaryrefslogtreecommitdiff
path: root/www/nift
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2021-03-22 04:00:48 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2021-03-22 04:00:48 +0000
commit5698ddabdc23908421ce2cedaac9e0dbff1bc928 (patch)
tree4c6c8e78139b1e4d8d766a677b97000fb08370b6 /www/nift
parent5676d375e20e27f6953791390d908dadd8e4ee23 (diff)
downloadports-5698ddabdc23908421ce2cedaac9e0dbff1bc928.tar.gz
ports-5698ddabdc23908421ce2cedaac9e0dbff1bc928.zip
www/nift: Update to 2.4.0
PR: 254473 Submitted by: Mohammad S. Babaei <info@babaei.net> (maintainer)
Notes
Notes: svn path=/head/; revision=568938
Diffstat (limited to 'www/nift')
-rw-r--r--www/nift/Makefile2
-rw-r--r--www/nift/distinfo6
-rw-r--r--www/nift/files/patch-Makefile102
3 files changed, 55 insertions, 55 deletions
diff --git a/www/nift/Makefile b/www/nift/Makefile
index e3d15a64a9ac..5edcede146d4 100644
--- a/www/nift/Makefile
+++ b/www/nift/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nift
DISTVERSIONPREFIX= v
-DISTVERSION= 2.3.12
+DISTVERSION= 2.4.0
CATEGORIES= www
MAINTAINER= info@babaei.net
diff --git a/www/nift/distinfo b/www/nift/distinfo
index 2bcadbaad583..b5af0e3b13d7 100644
--- a/www/nift/distinfo
+++ b/www/nift/distinfo
@@ -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
diff --git a/www/nift/files/patch-Makefile b/www/nift/files/patch-Makefile
index 59b3dffe0db1..f706a9b7ecf9 100644
--- a/www/nift/files/patch-Makefile
+++ b/www/nift/files/patch-Makefile
@@ -1,4 +1,4 @@
---- 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
@@ -16,120 +16,120 @@
+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
@@ -144,7 +144,7 @@
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