diff -urN nift-orig/Makefile nift/Makefile --- nift-orig/Makefile 2021-03-04 15:55:43.546189000 +0100 +++ nift/Makefile 2021-03-04 17:38:02.710566000 +0100 @@ -3,7 +3,7 @@ PORTNAME= nift DISTVERSIONPREFIX= v -DISTVERSION= 2.3.10 +DISTVERSION= 2.3.12 CATEGORIES= www MAINTAINER= info@babaei.net @@ -19,7 +19,7 @@ NO_OPTIONS_SORT= yes OPTIONS_SINGLE= LUA -OPTIONS_SINGLE_LUA= BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA53 PORTS_LUA52 PORTS_LUA51 +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 @@ -32,6 +32,7 @@ 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 @@ -42,6 +43,8 @@ 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 @@ -51,6 +54,7 @@ PLIST_FILES= bin/nift \ bin/nsm + post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Makefile diff -urN nift-orig/distinfo nift/distinfo --- nift-orig/distinfo 2021-03-04 15:55:43.546228000 +0100 +++ nift/distinfo 2021-03-04 15:57:46.031005000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1590378425 -SHA256 (nifty-site-manager-nsm-v2.3.10_GH0.tar.gz) = ef4410d423fca8dfb67a349a188a0a46bec67f7eb0157d146ae2fbb28f2f2295 -SIZE (nifty-site-manager-nsm-v2.3.10_GH0.tar.gz) = 1607394 +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 diff -urN nift-orig/files/patch-Makefile nift/files/patch-Makefile --- nift-orig/files/patch-Makefile 2021-03-04 15:55:43.546342000 +0100 +++ nift/files/patch-Makefile 2021-03-07 21:19:07.063943000 +0100 @@ -1,6 +1,6 @@ ---- Makefile.orig 2020-05-15 16:07:18 UTC +--- Makefile.orig 2021-03-07 20:18:20 UTC +++ Makefile -@@ -3,7 +3,7 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory. +@@ -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?= @@ -9,76 +9,151 @@ BINDIR=${DESTDIR}${PREFIX}/bin LIBDIR=${DESTDIR}${PREFIX}/lib -@@ -79,58 +79,58 @@ ifeq ($(BUNDLED),0) + 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 +@@ -22,7 +22,7 @@ ifeq ($(CXX),clang) + ifeq ($(OS),FreeBSD) + else + CXXFLAGS+= -Qunused-arguments -lstdc++ +- 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__ +- LDFLAGS+= -LLuaJIT/src -llua51 ++ LINK+= -LLuaJIT/src -llua51 + endif else ifeq ($(LUA_VERSION),x) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUA_VERSION_x__ -- LINK+= -L/usr/local/lib -llua -lm -ldl +- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl + LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl else # *nix CXXFLAGS+= -D__LUA_VERSION_x__ -- LINK+= -L/usr/local/lib -llua -ldl +- LDFLAGS+= -L/usr/local/lib -llua -ldl + LINK+= -L%%LOCALBASE%%/lib -llua -ldl endif else ifeq ($(LUA_VERSION),5.4) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUA_VERSION_5_4__ -- LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl else # *nix CXXFLAGS+= -D__LUA_VERSION_5_4__ -- LINK+= -L/usr/local/lib -llua-5.4 -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl endif else ifeq ($(LUA_VERSION),5.3) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUA_VERSION_5_3__ -- LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl else # *nix CXXFLAGS+= -D__LUA_VERSION_5_3__ -- LINK+= -L/usr/local/lib -llua-5.3 -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl endif else ifeq ($(LUA_VERSION),5.2) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUA_VERSION_5_2__ -- LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl else # *nix CXXFLAGS+= -D__LUA_VERSION_5_2__ -- LINK+= -L/usr/local/lib -llua-5.2 -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl endif else ifeq ($(LUA_VERSION),5.1) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUA_VERSION_5_1__ -- LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl else # *nix CXXFLAGS+= -D__LUA_VERSION_5_1__ -- LINK+= -L/usr/local/lib -llua-5.1 -ldl +- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl endif else ifeq ($(LUAJIT_VERSION),2.0) ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUAJIT_VERSION_2_0__ -- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1 +- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1 + LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1 else # *nix CXXFLAGS+= -D__LUAJIT_VERSION_2_0__ -- LINK+= -ldl -L/usr/local/lib -lluajit-5.1 +- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 + LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1 endif else ifeq ($(detected_OS),FreeBSD) # FreeBSD CXXFLAGS+= -D__LUAJIT_VERSION_2_1__ -- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1 +- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1 + LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1 else # *nix CXXFLAGS+= -D__LUAJIT_VERSION_2_1__ -- LINK+= -ldl -L/usr/local/lib -lluajit-5.1 +- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 + LINK+= -ldl -L%%LOCALBASE%%/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 + else ifeq ($(detected_OS),FreeBSD) # FreeBSD +- 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 + endif + else + CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__ + ifeq ($(detected_OS),Windows) # Windows +- LDFLAGS+= -LLuaJIT/src -llua51 +- #LDFLAGS+= -L. -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 + + 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 +