Attachment #692850 for bug #777618

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

Lines 3-9 Link Here

(-)nift-orig/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nift	4	PORTNAME= nift
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.3.12	6	DISTVERSION= 2.4.0
7	CATEGORIES= www	7	CATEGORIES= www
8		8
9	MAINTAINER= info@babaei.net	9	MAINTAINER= info@babaei.net

Lines 1-3 Link Here

(-)nift-orig/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1614869866	1	TIMESTAMP = 1616377949
2	SHA256 (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = ddf93325c320f7b3dbcaa19a713ca740b909d229cd855d813575a3ca0cac8c61	2	SHA256 (nifty-site-manager-nsm-v2.4.0_GH0.tar.gz) = 7f6c0d8db59d0bcd46dc87a4e7190280a311196c2550524f923319e8a9495ad5
3	SIZE (nifty-site-manager-nsm-v2.3.12_GH0.tar.gz) = 1607987	3	SIZE (nifty-site-manager-nsm-v2.4.0_GH0.tar.gz) = 1600125

Lines 1-4 Link Here

(-)nift-orig/files/patch-Makefile




+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

 		endif
 	endif
 endif
@@ -234,10 +234,10 @@ endif 
 
 nsm: $(objects)
 ifeq ($(detected_OS),Windows)  # Windows

Return to bug 777618

Lines 16-135 Link Here

(-)- Makefile.orig (-50 / +50 lines)
16	+LINK+=-pthread	16	+LINK+=-pthread
17		17
18	ifeq ($(OS),Windows_NT)	18	ifeq ($(OS),Windows_NT)
19	detected_OS := Windows	19	detected_OS := Windows
20	@@ -22,7 +22,7 @@ ifeq ($(CXX),clang)	20	@@ -22,7 +22,7 @@ ifeq ($(CXX),clang)
21	ifeq ($(OS),FreeBSD)	21	ifeq ($(OS),FreeBSD)
22	else	22	else
23	CXXFLAGS+= -Qunused-arguments -lstdc++	23	CXXFLAGS+= -Qunused-arguments -lstdc++
24	- LDFLAGS+= -lm	24	- LDFLAGS+= -lm
25	+ LINK+= -lm	25	+ LINK+= -lm
26	endif	26	endif
27	endif	27	endif
28		28
29	@@ -71,66 +71,66 @@ ifeq ($(BUNDLED),0)	29	@@ -71,66 +71,66 @@ ifeq ($(BUNDLED),0)
30	WAS_UNBUNDLED=1	30	WAS_UNBUNDLED=1
31	ifneq ($(LUA_VERSION),)	31	ifneq ($(LUA_VERSION),)
32	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__	32	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
33	- LDFLAGS+= -LLua-5.3/src -llua	33	- LDFLAGS+= -LLua-5.3/src -llua
34	+ LINK+= -LLua-5.3/src -llua	34	+ LINK+= -LLua-5.3/src -llua
35	else	35	else
36	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__	36	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
37	- LDFLAGS+= -LLuaJIT/src -llua51	37	- LDFLAGS+= -LLuaJIT/src -llua51
38	+ LINK+= -LLuaJIT/src -llua51	38	+ LINK+= -LLuaJIT/src -llua51
39	endif	39	endif
40	else ifeq ($(LUA_VERSION),x)	40	else ifeq ($(LUA_VERSION),x)
41	ifeq ($(detected_OS),FreeBSD) # FreeBSD	41	ifeq ($(detected_OS),FreeBSD) # FreeBSD
42	CXXFLAGS+= -D__LUA_VERSION_x__	42	CXXFLAGS+= -D__LUA_VERSION_x__
43	- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl	43	- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl
44	+ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl	44	+ LINK+= -L/usr/local/lib -llua -lm -ldl
45	else # *nix	45	else # *nix
46	CXXFLAGS+= -D__LUA_VERSION_x__	46	CXXFLAGS+= -D__LUA_VERSION_x__
47	- LDFLAGS+= -L/usr/local/lib -llua -ldl	47	- LDFLAGS+= -L/usr/local/lib -llua -ldl
48	+ LINK+= -L%%LOCALBASE%%/lib -llua -ldl	48	+ LINK+= -L/usr/local/lib -llua -ldl
49	endif	49	endif
50	else ifeq ($(LUA_VERSION),5.4)	50	else ifeq ($(LUA_VERSION),5.4)
51	ifeq ($(detected_OS),FreeBSD) # FreeBSD	51	ifeq ($(detected_OS),FreeBSD) # FreeBSD
52	CXXFLAGS+= -D__LUA_VERSION_5_4__	52	CXXFLAGS+= -D__LUA_VERSION_5_4__
53	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl	53	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl
54	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl	54	+ LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl
55	else # *nix	55	else # *nix
56	CXXFLAGS+= -D__LUA_VERSION_5_4__	56	CXXFLAGS+= -D__LUA_VERSION_5_4__
57	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl	57	- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
58	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl	58	+ LINK+= -L/usr/local/lib -llua-5.4 -ldl
59	endif	59	endif
60	else ifeq ($(LUA_VERSION),5.3)	60	else ifeq ($(LUA_VERSION),5.3)
61	ifeq ($(detected_OS),FreeBSD) # FreeBSD	61	ifeq ($(detected_OS),FreeBSD) # FreeBSD
62	CXXFLAGS+= -D__LUA_VERSION_5_3__	62	CXXFLAGS+= -D__LUA_VERSION_5_3__
63	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl	63	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl
64	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl	64	+ LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl
65	else # *nix	65	else # *nix
66	CXXFLAGS+= -D__LUA_VERSION_5_3__	66	CXXFLAGS+= -D__LUA_VERSION_5_3__
67	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl	67	- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
68	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl	68	+ LINK+= -L/usr/local/lib -llua-5.3 -ldl
69	endif	69	endif
70	else ifeq ($(LUA_VERSION),5.2)	70	else ifeq ($(LUA_VERSION),5.2)
71	ifeq ($(detected_OS),FreeBSD) # FreeBSD	71	ifeq ($(detected_OS),FreeBSD) # FreeBSD
72	CXXFLAGS+= -D__LUA_VERSION_5_2__	72	CXXFLAGS+= -D__LUA_VERSION_5_2__
73	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl	73	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl
74	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl	74	+ LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl
75	else # *nix	75	else # *nix
76	CXXFLAGS+= -D__LUA_VERSION_5_2__	76	CXXFLAGS+= -D__LUA_VERSION_5_2__
77	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl	77	- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
78	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl	78	+ LINK+= -L/usr/local/lib -llua-5.2 -ldl
79	endif	79	endif
80	else ifeq ($(LUA_VERSION),5.1)	80	else ifeq ($(LUA_VERSION),5.1)
81	ifeq ($(detected_OS),FreeBSD) # FreeBSD	81	ifeq ($(detected_OS),FreeBSD) # FreeBSD
82	CXXFLAGS+= -D__LUA_VERSION_5_1__	82	CXXFLAGS+= -D__LUA_VERSION_5_1__
83	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl	83	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl
84	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl	84	+ LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl
85	else # *nix	85	else # *nix
86	CXXFLAGS+= -D__LUA_VERSION_5_1__	86	CXXFLAGS+= -D__LUA_VERSION_5_1__
87	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl	87	- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
88	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl	88	+ LINK+= -L/usr/local/lib -llua-5.1 -ldl
89	endif	89	endif
90	else ifeq ($(LUAJIT_VERSION),2.0)	90	else ifeq ($(LUAJIT_VERSION),2.0)
91	ifeq ($(detected_OS),FreeBSD) # FreeBSD	91	ifeq ($(detected_OS),FreeBSD) # FreeBSD
92	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__	92	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
93	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1	93	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
94	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1	94	+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
95	else # *nix	95	else # *nix
96	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__	96	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
97	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1	97	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
98	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1	98	+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
99	endif	99	endif
100	else	100	else
101	ifeq ($(detected_OS),FreeBSD) # FreeBSD	101	ifeq ($(detected_OS),FreeBSD) # FreeBSD
102	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__	102	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
103	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1	103	- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
104	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1	104	+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
105	else # *nix	105	else # *nix
106	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__	106	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
107	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1	107	- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
108	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1	108	+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
109	endif	109	endif
110	endif	110	endif
111	else	111	else
112	@@ -138,24 +138,24 @@ else	112	@@ -138,24 +138,24 @@ else
113	ifeq ($(LUA_VERSION),5.3)	113	ifeq ($(LUA_VERSION),5.3)
114	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__	114	CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
115	ifeq ($(detected_OS),Windows) # Windows	115	ifeq ($(detected_OS),Windows) # Windows
116	- LDFLAGS+= -LLua-5.3/src -llua	116	- LDFLAGS+= -LLua-5.3/src -llua
117	- #LDFLAGS+= -LLua-5.3/src -llua	117	- #LDFLAGS+= -LLua-5.3/src -llua
118	+ LINK+= -LLua-5.3/src -llua	118	+ LINK+= -LLua-5.3/src -llua
119	+ #LINK+= -LLua-5.3/src -llua	119	+ #LINK+= -LLua-5.3/src -llua
120	else ifeq ($(detected_OS),FreeBSD) # FreeBSD	120	else ifeq ($(detected_OS),FreeBSD) # FreeBSD
121	- LDFLAGS+= -LLua-5.3/src -llua -ldl -lm	121	- LDFLAGS+= -LLua-5.3/src -llua -ldl -lm
122	+ LINK+= -LLua-5.3/src -llua -ldl -lm	122	+ LINK+= -LLua-5.3/src -llua -ldl -lm
123	else # *nix/Vercel	123	else # *nix/Vercel
124	- LDFLAGS+= -LLua-5.3/src -llua -ldl	124	- LDFLAGS+= -LLua-5.3/src -llua -ldl
125	+ LINK+= -LLua-5.3/src -llua -ldl	125	+ LINK+= -LLua-5.3/src -llua -ldl
126	endif	126	endif
127	else	127	else
128	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__	128	CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
129	ifeq ($(detected_OS),Windows) # Windows	129	ifeq ($(detected_OS),Windows) # Windows
130	- LDFLAGS+= -LLuaJIT/src -llua51	130	- LDFLAGS+= -LLuaJIT/src -llua51
131	- #LDFLAGS+= -L. -llua51	131	- #LDFLAGS+= -L. -llua51
132	+ LINK+= -LLuaJIT/src -llua51	132	+ LINK+= -LLuaJIT/src -llua51
133	+ #LINK+= -L. -llua51	133	+ #LINK+= -L. -llua51
134	else ifeq ($(detected_OS),FreeBSD) # FreeBSD	134	else ifeq ($(detected_OS),FreeBSD) # FreeBSD
135	- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl -lm	135	- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl -lm
Lines 144-150 Link Here
144	endif	144	endif
145	endif	145	endif
146	endif	146	endif
147	@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h	147	@@ -234,10 +234,10 @@ endif
148		148
149	nsm: $(objects)	149	nsm: $(objects)
150	ifeq ($(detected_OS),Windows) # Windows	150	ifeq ($(detected_OS),Windows) # Windows