Attachment #224033 for bug #254980

Lines 2-8 Link Here

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

Lines 1-3 Link Here

(-)nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618064605	1	TIMESTAMP = 1618141639
2	SHA256 (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 4b7d5f7e5b1f721cdd88622ceec687ba59ecd900f266947071065c74da0f52b5	2	SHA256 (nifty-site-manager-nsm-v2.4.12_GH0.tar.gz) = 7a28987114cd5e4717b31a96840c0be505d58a07e20dcf26b25add7dbdf2668b
3	SIZE (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 1604956	3	SIZE (nifty-site-manager-nsm-v2.4.12_GH0.tar.gz) = 1632264

Line 0 Link Here

(-)nift/files/patch-LuaJIT_src_Makefile (+43 lines)
	1	--- LuaJIT/src/Makefile.orig 2021-04-11 05:30:01 UTC
	2	+++ LuaJIT/src/Makefile
	3	@@ -16,6 +16,15 @@ RELVER= 0
	4	ABIVER= 5.1
	5	NODOTABIVER= 51
	6
	7	+ifeq ($(OS),Windows_NT)
	8	+ detected_OS := Windows
	9	+else
	10	+ detected_OS := $(shell sh -c 'uname 2>/dev/null \|\| echo Unknown')
	11	+ ifeq ($(detected_OS),FreeBSD)
	12	+ FREEBSD_VERSION := $(shell uname -r \| cut -d - -f 1)
	13	+ endif
	14	+endif
	15	+
	16	##############################################################################
	17	############################# COMPILER OPTIONS #############################
	18	##############################################################################
	19	@@ -24,7 +33,11 @@ NODOTABIVER= 51
	20	# removing the '#' in front of them. Make sure you force a full recompile
	21	# with "make clean", followed by "make" if you change any options.
	22	#
	23	-DEFAULT_CC = gcc
	24	+ifeq ($(detected_OS),FreeBSD) #FreeBSD
	25	+ DEFAULT_CC = clang
	26	+else # *nix
	27	+ DEFAULT_CC = gcc
	28	+endif
	29	#
	30	# LuaJIT builds as a native 32 or 64 bit binary by default.
	31	CC= $(DEFAULT_CC)
	32	@@ -113,6 +126,11 @@ XCFLAGS=
	33	# Disable LJ_GC64 mode for x64.
	34	#XCFLAGS+= -DLUAJIT_DISABLE_GC64
	35	#
	36	+ifeq ($(detected_OS),FreeBSD) #FreeBSD
	37	+ ifeq ($(shell expr $(FREEBSD_VERSION) \< 12.0),1)
	38	+ XCFLAGS+= -DLJ_TARGET_HAS_GETENTROPY=0
	39	+ endif
	40	+endif
	41	##############################################################################
	42
	43	##############################################################################




--- LuaJIT/src/lj_prng.c.orig	2021-04-11 15:38:54 UTC
+++ LuaJIT/src/lj_prng.c
@@ -109,6 +109,7 @@ static PRGR libfunc_rgr;
 #include <sys/syscall.h>
 #else
 
+#ifndef LJ_TARGET_HAS_GETENTROPY
 #if LJ_TARGET_OSX && !LJ_TARGET_IOS
 /*
 ** In their infinite wisdom Apple decided to disallow getentropy() in the
@@ -123,6 +124,7 @@ static PRGR libfunc_rgr;
 #endif
 #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN
 #define LJ_TARGET_HAS_GETENTROPY	1
+#endif
 #endif
 
 #if LJ_TARGET_HAS_GETENTROPY




--- Makefile.orig	2021-04-11 05:30:01 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

 		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

 		endif
 	endif
 endif
@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h
 
 nsm: $(objects)
 ifeq ($(detected_OS),Windows)  # Windows

Return to bug 254980

Line 0 Link Here

(-)nift/files/patch-LuaJIT_src_lj__prng.c (+18 lines)
	1	--- LuaJIT/src/lj_prng.c.orig 2021-04-11 15:38:54 UTC
	2	+++ LuaJIT/src/lj_prng.c
	3	@@ -109,6 +109,7 @@ static PRGR libfunc_rgr;
	4	#include <sys/syscall.h>
	5	#else
	6
	7	+#ifndef LJ_TARGET_HAS_GETENTROPY
	8	#if LJ_TARGET_OSX && !LJ_TARGET_IOS
	9	/*
	10	** In their infinite wisdom Apple decided to disallow getentropy() in the
	11	@@ -123,6 +124,7 @@ static PRGR libfunc_rgr;
	12	#endif
	13	#elif (LJ_TARGET_BSD && !defined(__NetBSD__)) \|\| LJ_TARGET_SOLARIS \|\| LJ_TARGET_CYGWIN
	14	#define LJ_TARGET_HAS_GETENTROPY 1
	15	+#endif
	16	#endif
	17
	18	#if LJ_TARGET_HAS_GETENTROPY

Lines 1-4 Link Here

(-)nift/files/patch-Makefile (-16 / +16 lines)
1	--- Makefile.orig 2021-03-22 01:52:47 UTC	1	--- Makefile.orig 2021-04-11 05:30:01 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -3,14 +3,14 @@ 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
Lines 41-111 Link Here
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/usr/local/lib -llua -lm -ldl	44	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua -ldl	48	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.4 -lm -ldl	54	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.4 -ldl	58	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.3 -lm -ldl	64	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.3 -ldl	68	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.2 -lm -ldl	74	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.2 -ldl	78	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.1 -lm -ldl	84	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -llua-5.1 -ldl	88	+ LINK+= -L%%LOCALBASE%%/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/usr/local/lib -lluajit-5.1	94	+ LINK+= -ldl -lm -L%%LOCALBASE%%/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/usr/local/lib -lluajit-5.1	98	+ LINK+= -ldl -L%%LOCALBASE%%/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/usr/local/lib -lluajit-5.1	104	+ LINK+= -ldl -lm -L%%LOCALBASE%%/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/usr/local/lib -lluajit-5.1	108	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
109	endif	109	endif
110	endif	110	endif
111	else	111	else
Lines 144-150 Link Here
144	endif	144	endif
145	endif	145	endif
146	endif	146	endif
147	@@ -234,10 +234,10 @@ endif	147	@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h
148		148
149	nsm: $(objects)	149	nsm: $(objects)
150	ifeq ($(detected_OS),Windows) # Windows	150	ifeq ($(detected_OS),Windows) # Windows