Attachment #213879 for bug #245504

Lines 3-9 Link Here

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

Lines 1-3 Link Here

(-)nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585525828	1	TIMESTAMP = 1588050109
2	SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be	2	SHA256 (nifty-site-manager-nsm-v2.3.6_GH0.tar.gz) = 0176eaa37ed9f92fbf09ed4fc0f73dc9a560c3cddba83e70586ff096356e9466
3	SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641	3	SIZE (nifty-site-manager-nsm-v2.3.6_GH0.tar.gz) = 1225588




--- Makefile.orig	2020-04-28 05:33:18 UTC
+++ Makefile
@@ -55,7 +55,7 @@ else
 	else ifeq ($(detected_OS),Windows)  # Windows
 		LINK+= -L. -llua51
 	else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
-		LINK+= -ldl -lm -LLuaJIT/src -lluajit
+		LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1  
 	else                                # *nix
 		LINK+= -ldl -LLuaJIT/src -lluajit
 	endif
@@ -73,7 +73,7 @@ endif
@@ -51,7 +50,7 @@ endif
 
 ###
 

 
 ###
 
@@ -85,8 +85,6 @@ else ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),Windows)  # Windows
 	cd LuaJIT && make
 	copy LuaJIT\src\lua51.dll .
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
-	cd LuaJIT && gmake
-	cp LuaJIT/src/libluajit.so ./
 else                                # *nix
 	cd LuaJIT && make
 	cp LuaJIT/src/libluajit.so ./libluajit-5.1.so.2
@@ -193,7 +191,6 @@ ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	mkdir -p ${BINDIR}
 	chmod 755 nsm

 	mv nift ${BINDIR}
 	mv nsm ${BINDIR}
 else                           # *nix
@@ -211,7 +208,6 @@ ifeq ($(detected_OS),Windows)  # Windows
 	@echo "and 'nift.exe' from install location, typically "
 	@echo "'C:\Windows\System32'"
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
-	rm ${LIBDIR}/libluajit-5.1.so.2
 	rm ${BINDIR}/nift
 	rm ${BINDIR}/nsm
-	rm ${LIBDIR}/libluajit-5.1.so.2
 else                                # *nix
 	rm ${BINDIR}/nift
 	rm ${BINDIR}/nsm
@@ -234,7 +230,6 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	del $(objects)
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	rm -f $(objects)
-	cd LuaJIT && gmake clean
 else                                # *nix
 	rm -f $(objects)
 	cd LuaJIT && make clean
@@ -248,7 +243,6 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	del $(objects) nsm.exe nift.exe lua51.dll
 	#cd LuaJIT && make clean #see same line for clean
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	rm -f $(objects) nsm nift libluajit.so
-	cd LuaJIT && gmake clean
+	rm -f $(objects) nsm nift
 else                                # *nix
 	rm -f $(objects) nsm nift libluajit-5.1.so.2
 	cd LuaJIT && make clean

Return to bug 245504

Lines 1-16 Link Here

(-)nift/files/patch-Makefile (-29 / +25 lines)
1	--- Makefile.orig 2020-03-29 23:58:44 UTC	1	--- Makefile.orig 2020-04-28 05:33:18 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows) # Windows	3	@@ -55,7 +55,7 @@ else
4	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	4	else ifeq ($(detected_OS),Windows) # Windows
5	CXX=clang	5	LINK+= -L. -llua51
6	CXXFLAGS+= -s -Qunused-arguments -lstdc++	6	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
7	- LINK+= -ldl -lm -LLuaJIT/src -lluajit #use Nift built LuaJIT	7	- LINK+= -ldl -lm -LLuaJIT/src -lluajit
8	- #LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1 #use FreeBSD LuaJIT	8	+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
9	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1 #use FreeBSD LuaJIT	9	else # *nix
10	else # *nix	10	LINK+= -ldl -LLuaJIT/src -lluajit
11	#use these flags for a smaller binary	11	endif
12	#CXXFLAGS+= -s	12	@@ -73,7 +73,7 @@ endif
13	@@ -51,7 +50,7 @@ endif
14		13
15	###	14	###
16		15
Lines 19-35 Link Here
19		18
20	###	19	###
21		20
22	@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin) # Mac OSX	21	@@ -85,8 +85,6 @@ else ifeq ($(detected_OS),Windows) # Windows
23	else ifeq ($(detected_OS),Windows) # Windows
24	cd LuaJIT && make	22	cd LuaJIT && make
25	copy LuaJIT\src\lua51.dll .	23	copy LuaJIT\src\lua51.dll .
26	-else ifeq ($(detected_OS),FreeBSD) #FreeBSD	24	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
27	- cd LuaJIT && gmake	25	- cd LuaJIT && gmake
28	- cp LuaJIT/src/libluajit.so ./	26	- cp LuaJIT/src/libluajit.so ./
29	else # *nix	27	else # *nix
30	cd LuaJIT && make	28	cd LuaJIT && make
31	endif	29	cp LuaJIT/src/libluajit.so ./libluajit-5.1.so.2
32	@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows) # Windows	30	@@ -193,7 +191,6 @@ ifeq ($(detected_OS),Windows) # Windows
33	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	31	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
34	mkdir -p ${BINDIR}	32	mkdir -p ${BINDIR}
35	chmod 755 nsm	33	chmod 755 nsm
Lines 37-65 Link Here
37	mv nift ${BINDIR}	35	mv nift ${BINDIR}
38	mv nsm ${BINDIR}	36	mv nsm ${BINDIR}
39	else # *nix	37	else # *nix
40	@@ -175,7 +170,6 @@ ifeq ($(detected_OS),Windows) # Windows	38	@@ -211,7 +208,6 @@ ifeq ($(detected_OS),Windows) # Windows
41	@echo "and 'nift.exe' from install location, typically "
42	@echo "'C:\Windows\System32'"
43	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	39	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
44	- rm ${LIBDIR}/libluajit-5.1.so.2
45	rm ${BINDIR}/nift	40	rm ${BINDIR}/nift
46	rm ${BINDIR}/nsm	41	rm ${BINDIR}/nsm
		42	- rm ${LIBDIR}/libluajit-5.1.so.2
47	else # *nix	43	else # *nix
48	@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows) # Windows	44	rm ${BINDIR}/nift
49	#cd LuaJIT && make clean #this doesn't work for some reason	45	rm ${BINDIR}/nsm
		46	@@ -234,7 +230,6 @@ else ifeq ($(detected_OS),Windows) # Windows
		47	del $(objects)
50	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	48	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
51	rm -f $(objects)	49	rm -f $(objects)
52	- cd LuaJIT && gmake clean	50	- cd LuaJIT && gmake clean
53	else # *nix	51	else # *nix
54	rm -f $(objects)	52	rm -f $(objects)
55	cd LuaJIT && make clean	53	cd LuaJIT && make clean
56	@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows) # Windows	54	@@ -248,7 +243,6 @@ else ifeq ($(detected_OS),Windows) # Windows
57	del -f $(objects) nsm.exe nift.exe lua51.dll	55	del $(objects) nsm.exe nift.exe lua51.dll
58	#cd LuaJIT && make clean #see same line for clean
59	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	56	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
60	- rm -f $(objects) nsm nift libluajit.so	57	rm -f $(objects) nsm nift libluajit.so
61	- cd LuaJIT && gmake clean	58	- cd LuaJIT && gmake clean
62	+ rm -f $(objects) nsm nift
63	else # *nix	59	else # *nix
64	rm -f $(objects) nsm nift	60	rm -f $(objects) nsm nift libluajit-5.1.so.2
65	cd LuaJIT && make clean	61	cd LuaJIT && make clean