Attachment #249770 for bug #278203

Lines 1-7 Link Here

(-)b/www/nift/Makefile (-3 / +3 lines)
1	PORTNAME= nift	1	PORTNAME= nift
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.4.11	3	DISTVERSION= 3.0.3
4	PORTREVISION= 1	4	PORTREVISION= 0
5	CATEGORIES= www	5	CATEGORIES= www
6		6
7	MAINTAINER= info@babaei.net	7	MAINTAINER= info@babaei.net
Lines 50-56 PORTS_LUAJIT_USES= luajit Link Here
50	PORTS_LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=${LUAJIT_LUAVER}	50	PORTS_LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=${LUAJIT_LUAVER}
51		51
52	post-patch:	52	post-patch:
53	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	53	${REINPLACE_CMD} -Ee 's\|^(PREFIX\?=)/usr/local$$\|\1${LOCALBASE}\|g' \
54	${WRKSRC}/Makefile	54	${WRKSRC}/Makefile
55		55
56	post-install:	56	post-install:

Lines 1-3 Link Here

(-)b/www/nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618064605	1	TIMESTAMP = 1711503891
2	SHA256 (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 4b7d5f7e5b1f721cdd88622ceec687ba59ecd900f266947071065c74da0f52b5	2	SHA256 (nifty-site-manager-nsm-v3.0.3_GH0.tar.gz) = 4900247b92e0ae0d124391ec710a38b322ae83170e2c39191f8ad497090ffd24
3	SIZE (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 1604956	3	SIZE (nifty-site-manager-nsm-v3.0.3_GH0.tar.gz) = 1792312




--- 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
@@ -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/usr/local/lib -llua -lm -ldl  
 		else                                # *nix
 			CXXFLAGS+= -D__LUA_VERSION_x__
-			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
 			CXXFLAGS+= -D__LUA_VERSION_5_4__
-			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/usr/local/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/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/usr/local/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/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/usr/local/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/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/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/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/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/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/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
 		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
@@ -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
 

Return to bug 278203

Removed Link Here

(-)a/www/nift/files/patch-Makefile (-159 lines)
1	--- Makefile.orig 2021-03-22 01:52:47 UTC
2	+++ Makefile
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
5
6	DESTDIR?=
7	-PREFIX?=/usr/local
8	+PREFIX?=%%LOCALBASE%%
9	BINDIR=${DESTDIR}${PREFIX}/bin
10	LIBDIR=${DESTDIR}${PREFIX}/lib
11
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
40	else ifeq ($(LUA_VERSION),x)
41	ifeq ($(detected_OS),FreeBSD) # FreeBSD
42	CXXFLAGS+= -D__LUA_VERSION_x__
43	- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl
44	+ LINK+= -L/usr/local/lib -llua -lm -ldl
45	else # *nix
46	CXXFLAGS+= -D__LUA_VERSION_x__
47	- LDFLAGS+= -L/usr/local/lib -llua -ldl
48	+ LINK+= -L/usr/local/lib -llua -ldl
49	endif
50	else ifeq ($(LUA_VERSION),5.4)
51	ifeq ($(detected_OS),FreeBSD) # FreeBSD
52	CXXFLAGS+= -D__LUA_VERSION_5_4__
53	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl
54	+ LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl
55	else # *nix
56	CXXFLAGS+= -D__LUA_VERSION_5_4__
57	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
58	+ LINK+= -L/usr/local/lib -llua-5.4 -ldl
59	endif
60	else ifeq ($(LUA_VERSION),5.3)
61	ifeq ($(detected_OS),FreeBSD) # FreeBSD
62	CXXFLAGS+= -D__LUA_VERSION_5_3__
63	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl
64	+ LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl
65	else # *nix
66	CXXFLAGS+= -D__LUA_VERSION_5_3__
67	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
68	+ LINK+= -L/usr/local/lib -llua-5.3 -ldl
69	endif
70	else ifeq ($(LUA_VERSION),5.2)
71	ifeq ($(detected_OS),FreeBSD) # FreeBSD
72	CXXFLAGS+= -D__LUA_VERSION_5_2__
73	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl
74	+ LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl
75	else # *nix
76	CXXFLAGS+= -D__LUA_VERSION_5_2__
77	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
78	+ LINK+= -L/usr/local/lib -llua-5.2 -ldl
79	endif
80	else ifeq ($(LUA_VERSION),5.1)
81	ifeq ($(detected_OS),FreeBSD) # FreeBSD
82	CXXFLAGS+= -D__LUA_VERSION_5_1__
83	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl
84	+ LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl
85	else # *nix
86	CXXFLAGS+= -D__LUA_VERSION_5_1__
87	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
88	+ LINK+= -L/usr/local/lib -llua-5.1 -ldl
89	endif
90	else ifeq ($(LUAJIT_VERSION),2.0)
91	ifeq ($(detected_OS),FreeBSD) # FreeBSD
92	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
93	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
94	+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
95	else # *nix
96	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
97	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
98	+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
99	endif
100	else
101	ifeq ($(detected_OS),FreeBSD) # FreeBSD
102	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
103	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
104	+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
105	else # *nix
106	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
107	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
108	+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
109	endif
110	endif
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	@@ -234,10 +234,10 @@ endif
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