Attachment #223093 for bug #254133

View | Details | Raw Unified | Return to bug 254133
Collapse All | Expand All





PORTNAME=	nift
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.12
CATEGORIES=	www

MAINTAINER=	info@babaei.net


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

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_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


PLIST_FILES=	bin/nift \
		bin/nsm

post-patch:
	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
		${WRKSRC}/Makefile

Lines 1-3 Link Here

(-)nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590378425	1	TIMESTAMP = 1614869866
2	SHA256 (nifty-site-manager-nsm-v2.3.10_GH0.tar.gz) = ef4410d423fca8dfb67a349a188a0a46bec67f7eb0157d146ae2fbb28f2f2295	2	SHA256 (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = ddf93325c320f7b3dbcaa19a713ca740b909d229cd855d813575a3ca0cac8c61
3	SIZE (nifty-site-manager-nsm-v2.3.10_GH0.tar.gz) = 1607394	3	SIZE (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = 1607987




--- Makefile.orig	2021-03-07 20:18:20 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?=

 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
@@ -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__
-	    	LDFLAGS+= -L/usr/local/lib -llua -lm -ldl  
+	    	LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl  
 		else                                # *nix
 			CXXFLAGS+= -D__LUA_VERSION_x__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-	    	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__
-			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__
-			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__
-			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__
-			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
 

Return to bug 254133

Lines 3-9 Link Here

(-)nift/Makefile (-2 / +6 lines)
3		3
4	PORTNAME= nift	4	PORTNAME= nift
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.3.10	6	DISTVERSION= 2.3.12
7	CATEGORIES= www	7	CATEGORIES= www
8		8
9	MAINTAINER= info@babaei.net	9	MAINTAINER= info@babaei.net
Lines 19-25 Link Here
19		19
20	NO_OPTIONS_SORT= yes	20	NO_OPTIONS_SORT= yes
21	OPTIONS_SINGLE= LUA	21	OPTIONS_SINGLE= LUA
22	OPTIONS_SINGLE_LUA= BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA53 PORTS_LUA52 PORTS_LUA51	22	OPTIONS_SINGLE_LUA= BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA54 PORTS_LUA53 PORTS_LUA52 PORTS_LUA51
23		23
24	OPTIONS_DEFAULT= BUNDLED_LUAJIT	24	OPTIONS_DEFAULT= BUNDLED_LUAJIT
25	OPTIONS_DEFAULT_powerpc64= BUNDLED_LUA53	25	OPTIONS_DEFAULT_powerpc64= BUNDLED_LUA53
Lines 32-37 Link Here
32	BUNDLED_LUAJIT_DESC= Use the bundled LuaJIT	32	BUNDLED_LUAJIT_DESC= Use the bundled LuaJIT
33	BUNDLED_LUA53_DESC= Use the bundled Lua 5.3	33	BUNDLED_LUA53_DESC= Use the bundled Lua 5.3
34	PORTS_LUAJIT_DESC= Use LuaJIT from FreeBSD Ports	34	PORTS_LUAJIT_DESC= Use LuaJIT from FreeBSD Ports
		35	PORTS_LUA54_DESC= Use Lua 5.4 from FreeBSD Ports
35	PORTS_LUA53_DESC= Use Lua 5.3 from FreeBSD Ports	36	PORTS_LUA53_DESC= Use Lua 5.3 from FreeBSD Ports
36	PORTS_LUA52_DESC= Use Lua 5.2 from FreeBSD Ports	37	PORTS_LUA52_DESC= Use Lua 5.2 from FreeBSD Ports
37	PORTS_LUA51_DESC= Use Lua 5.1 from FreeBSD Ports	38	PORTS_LUA51_DESC= Use Lua 5.1 from FreeBSD Ports
Lines 42-47 Link Here
42	BUNDLED_LUA53_VARS= MAKE_JOBS_UNSAFE= yes	43	BUNDLED_LUA53_VARS= MAKE_JOBS_UNSAFE= yes
43	PORTS_LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=2.0	44	PORTS_LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=2.0
44	PORTS_LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	45	PORTS_LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
		46	PORTS_LUA54_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.4
		47	PORTS_LUA54_LIB_DEPENDS= liblua-5.4.so:lang/lua54
45	PORTS_LUA53_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.3	48	PORTS_LUA53_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.3
46	PORTS_LUA53_LIB_DEPENDS= liblua-5.3.so:lang/lua53	49	PORTS_LUA53_LIB_DEPENDS= liblua-5.3.so:lang/lua53
47	PORTS_LUA52_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.2	50	PORTS_LUA52_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.2
Lines 51-56 Link Here
51		54
52	PLIST_FILES= bin/nift \	55	PLIST_FILES= bin/nift \
53	bin/nsm	56	bin/nsm
		57
54	post-patch:	58	post-patch:
55	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	59	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
56	${WRKSRC}/Makefile	60	${WRKSRC}/Makefile

Lines 1-6 Link Here

(-)nift/files/patch-Makefile (-17 / +92 lines)
1	--- Makefile.orig 2020-05-15 16:07:18 UTC	1	--- Makefile.orig 2021-03-07 20:18:20 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -3,7 +3,7 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory.	3	@@ -3,14 +3,14 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory.
4	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	4	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
5		5
6	DESTDIR?=	6	DESTDIR?=
Lines 9-84 Link Here
9	BINDIR=${DESTDIR}${PREFIX}/bin	9	BINDIR=${DESTDIR}${PREFIX}/bin
10	LIBDIR=${DESTDIR}${PREFIX}/lib	10	LIBDIR=${DESTDIR}${PREFIX}/lib
11		11
12	@@ -79,58 +79,58 @@ ifeq ($(BUNDLED),0)	12	CXX?=g++
		13	CXXFLAGS+=-std=c++11 -Wall -Wextra -pedantic -O3 -Dexprtk_disable_caseinsensitivity
		14	#CXXFLAGS=-std=c++11 -Wall -Wextra -Werror -pedantic -O3
		15	-LDFLAGS+=-pthread
		16	+LINK+=-pthread
		17
		18	ifeq ($(OS),Windows_NT)
		19	detected_OS := Windows
		20	@@ -22,7 +22,7 @@ ifeq ($(CXX),clang)
		21	ifeq ($(OS),FreeBSD)
		22	else
		23	CXXFLAGS+= -Qunused-arguments -lstdc++
		24	- LDFLAGS+= -lm
		25	+ LINK+= -lm
		26	endif
		27	endif
		28
		29	@@ -71,66 +71,66 @@ ifeq ($(BUNDLED),0)
		30	WAS_UNBUNDLED=1
		31	ifneq ($(LUA_VERSION),)
		32	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
		33	- LDFLAGS+= -LLua-5.3/src -llua
		34	+ LINK+= -LLua-5.3/src -llua
		35	else
		36	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
		37	- LDFLAGS+= -LLuaJIT/src -llua51
		38	+ LINK+= -LLuaJIT/src -llua51
		39	endif
13	else ifeq ($(LUA_VERSION),x)	40	else ifeq ($(LUA_VERSION),x)
14	ifeq ($(detected_OS),FreeBSD) # FreeBSD	41	ifeq ($(detected_OS),FreeBSD) # FreeBSD
15	CXXFLAGS+= -D__LUA_VERSION_x__	42	CXXFLAGS+= -D__LUA_VERSION_x__
16	- LINK+= -L/usr/local/lib -llua -lm -ldl	43	- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl
17	+ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl	44	+ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl
18	else # *nix	45	else # *nix
19	CXXFLAGS+= -D__LUA_VERSION_x__	46	CXXFLAGS+= -D__LUA_VERSION_x__
20	- LINK+= -L/usr/local/lib -llua -ldl	47	- LDFLAGS+= -L/usr/local/lib -llua -ldl
21	+ LINK+= -L%%LOCALBASE%%/lib -llua -ldl	48	+ LINK+= -L%%LOCALBASE%%/lib -llua -ldl
22	endif	49	endif
23	else ifeq ($(LUA_VERSION),5.4)	50	else ifeq ($(LUA_VERSION),5.4)
24	ifeq ($(detected_OS),FreeBSD) # FreeBSD	51	ifeq ($(detected_OS),FreeBSD) # FreeBSD
25	CXXFLAGS+= -D__LUA_VERSION_5_4__	52	CXXFLAGS+= -D__LUA_VERSION_5_4__
26	- LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl	53	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl
27	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl	54	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl
28	else # *nix	55	else # *nix
29	CXXFLAGS+= -D__LUA_VERSION_5_4__	56	CXXFLAGS+= -D__LUA_VERSION_5_4__
30	- LINK+= -L/usr/local/lib -llua-5.4 -ldl	57	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
31	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl	58	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl
32	endif	59	endif
33	else ifeq ($(LUA_VERSION),5.3)	60	else ifeq ($(LUA_VERSION),5.3)
34	ifeq ($(detected_OS),FreeBSD) # FreeBSD	61	ifeq ($(detected_OS),FreeBSD) # FreeBSD
35	CXXFLAGS+= -D__LUA_VERSION_5_3__	62	CXXFLAGS+= -D__LUA_VERSION_5_3__
36	- LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl	63	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl
37	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl	64	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl
38	else # *nix	65	else # *nix
39	CXXFLAGS+= -D__LUA_VERSION_5_3__	66	CXXFLAGS+= -D__LUA_VERSION_5_3__
40	- LINK+= -L/usr/local/lib -llua-5.3 -ldl	67	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
41	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl	68	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl
42	endif	69	endif
43	else ifeq ($(LUA_VERSION),5.2)	70	else ifeq ($(LUA_VERSION),5.2)
44	ifeq ($(detected_OS),FreeBSD) # FreeBSD	71	ifeq ($(detected_OS),FreeBSD) # FreeBSD
45	CXXFLAGS+= -D__LUA_VERSION_5_2__	72	CXXFLAGS+= -D__LUA_VERSION_5_2__
46	- LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl	73	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl
47	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl	74	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl
48	else # *nix	75	else # *nix
49	CXXFLAGS+= -D__LUA_VERSION_5_2__	76	CXXFLAGS+= -D__LUA_VERSION_5_2__
50	- LINK+= -L/usr/local/lib -llua-5.2 -ldl	77	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
51	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl	78	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl
52	endif	79	endif
53	else ifeq ($(LUA_VERSION),5.1)	80	else ifeq ($(LUA_VERSION),5.1)
54	ifeq ($(detected_OS),FreeBSD) # FreeBSD	81	ifeq ($(detected_OS),FreeBSD) # FreeBSD
55	CXXFLAGS+= -D__LUA_VERSION_5_1__	82	CXXFLAGS+= -D__LUA_VERSION_5_1__
56	- LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl	83	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl
57	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl	84	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl
58	else # *nix	85	else # *nix
59	CXXFLAGS+= -D__LUA_VERSION_5_1__	86	CXXFLAGS+= -D__LUA_VERSION_5_1__
60	- LINK+= -L/usr/local/lib -llua-5.1 -ldl	87	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
61	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl	88	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl
62	endif	89	endif
63	else ifeq ($(LUAJIT_VERSION),2.0)	90	else ifeq ($(LUAJIT_VERSION),2.0)
64	ifeq ($(detected_OS),FreeBSD) # FreeBSD	91	ifeq ($(detected_OS),FreeBSD) # FreeBSD
65	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__	92	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
66	- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1	93	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
67	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1	94	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
68	else # *nix	95	else # *nix
69	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__	96	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
70	- LINK+= -ldl -L/usr/local/lib -lluajit-5.1	97	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
71	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1	98	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
72	endif	99	endif
73	else	100	else
74	ifeq ($(detected_OS),FreeBSD) # FreeBSD	101	ifeq ($(detected_OS),FreeBSD) # FreeBSD
75	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__	102	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
76	- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1	103	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
77	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1	104	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
78	else # *nix	105	else # *nix
79	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__	106	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
80	- LINK+= -ldl -L/usr/local/lib -lluajit-5.1	107	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
81	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1	108	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
82	endif	109	endif
83	endif	110	endif
84	else	111	else
		112	@@ -138,24 +138,24 @@ else
		113	ifeq ($(LUA_VERSION),5.3)
		114	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
		115	ifeq ($(detected_OS),Windows) # Windows
		116	- LDFLAGS+= -LLua-5.3/src -llua
		117	- #LDFLAGS+= -LLua-5.3/src -llua
		118	+ LINK+= -LLua-5.3/src -llua
		119	+ #LINK+= -LLua-5.3/src -llua
		120	else ifeq ($(detected_OS),FreeBSD) # FreeBSD
		121	- LDFLAGS+= -LLua-5.3/src -llua -ldl -lm
		122	+ LINK+= -LLua-5.3/src -llua -ldl -lm
		123	else # *nix/Vercel
		124	- LDFLAGS+= -LLua-5.3/src -llua -ldl
		125	+ LINK+= -LLua-5.3/src -llua -ldl
		126	endif
		127	else
		128	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
		129	ifeq ($(detected_OS),Windows) # Windows
		130	- LDFLAGS+= -LLuaJIT/src -llua51
		131	- #LDFLAGS+= -L. -llua51
		132	+ LINK+= -LLuaJIT/src -llua51
		133	+ #LINK+= -L. -llua51
		134	else ifeq ($(detected_OS),FreeBSD) # FreeBSD
		135	- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl -lm
		136	- #LDFLAGS+= -ldl -lm -LLuaJIT/src -lluajit
		137	+ LINK+= ./LuaJIT/src/libluajit.a -ldl -lm
		138	+ #LINK+= -ldl -lm -LLuaJIT/src -lluajit
		139	else # *nix/Vercel
		140	- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl
		141	- #LDFLAGS+= -ldl -LLuaJIT/src -lluajit
		142	+ LINK+= ./LuaJIT/src/libluajit.a -ldl
		143	+ #LINK+= -ldl -LLuaJIT/src -lluajit
		144	endif
		145	endif
		146	endif
		147	@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h
		148
		149	nsm: $(objects)
		150	ifeq ($(detected_OS),Windows) # Windows
		151	- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
		152	+ $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
		153	copy nsm.exe nift.exe
		154	else
		155	- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
		156	+ $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
		157	cp nsm nift
		158	endif
		159