Attachment #214256 for bug #245504





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

MAINTAINER=	info@babaei.net

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libluajit-5.1.so:lang/luajit

USES=		compiler:c++11-lang gmake
USE_GITHUB=	yes
GH_ACCOUNT=	nifty-site-manager
GH_PROJECT=	nsm

NO_OPTIONS_SORT=	yes
OPTIONS_SINGLE=		LUA
OPTIONS_SINGLE_LUA=	BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA53 PORTS_LUA52 PORTS_LUA51

OPTIONS_DEFAULT=	BUNDLED_LUAJIT

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_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_LUAJIT_MAKE_ARGS=	BUNDLED=1
BUNDLED_LUAJIT_MAKE_JOBS_UNSAFE=	yes
BUNDLED_LUA53_MAKE_ARGS=	BUNDLED=1 LUA_VERSION=5.3
BUNDLED_LUA53_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_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
PORTS_LUA52_LIB_DEPENDS=	liblua-5.2.so:lang/lua52
PORTS_LUA51_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.1
PORTS_LUA51_LIB_DEPENDS=	liblua-5.1.so:lang/lua51

PLIST_FILES=	bin/nift \
		bin/nsm
post-patch:

Lines 1-3 Link Here

(-)www/nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585525828	1	TIMESTAMP = 1588819821
2	SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be	2	SHA256 (nifty-site-manager-nsm-v2.3.8_GH0.tar.gz) = 4bd42efbdbc05e121e7ee4ccf93640635dd4ee32532232f5e5a9e59f11238ad9
3	SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641	3	SIZE (nifty-site-manager-nsm-v2.3.8_GH0.tar.gz) = 1602629




--- Makefile.orig	2020-05-07 03:06:00 UTC
+++ Makefile
@@ -3,7 +3,7 @@ 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
 	CXX=clang
 	CXXFLAGS+= -s -Qunused-arguments -lstdc++
-	LINK+= -ldl -lm -LLuaJIT/src -lluajit            #use Nift built LuaJIT
-	#LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1   #use FreeBSD LuaJIT
+	LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1   #use FreeBSD LuaJIT
 else                                # *nix
 	#use these flags for a smaller binary
 	#CXXFLAGS+= -s
@@ -51,7 +50,7 @@ endif
 
 DESTDIR?=
-PREFIX?=/usr/local
+PREFIX?=%%LOCALBASE%%
 BINDIR=${DESTDIR}${PREFIX}/bin
 LIBDIR=${DESTDIR}${PREFIX}/lib
 
@@ -79,42 +79,58 @@ ifeq ($(BUNDLED),0)
 	else ifeq ($(LUA_VERSION),x) 
 	    ifeq ($(detected_OS),FreeBSD)  # FreeBSD
 			CXXFLAGS+= -D__LUA_VERSION_x__
-	    	LINK+= -L/usr/local/lib -llua -lm -ldl  
+	    	LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl  
 		else                                # *nix
 			CXXFLAGS+= -D__LUA_VERSION_x__
-	    	LINK+= -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__
-	    	LINK+= -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__
-	    	LINK+= -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__
-	    	LINK+= -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__
-	    	LINK+= -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__
+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl  
+		else                                # *nix
+			CXXFLAGS+= -D__LUA_VERSION_5_2__
+	    	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__
+	    	LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl  
+		else                                # *nix
+			CXXFLAGS+= -D__LUA_VERSION_5_1__
+	    	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__
-			LINK+= -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__
-			LINK+= -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__
-			LINK+= -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__
-			LINK+= -ldl -L/usr/local/lib -lluajit-5.1 
+			LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1 
 		endif
 	endif
 else

Return to bug 245504

Lines 3-9 Link Here

(-)www/nift/Makefile (-3 / +27 lines)
3		3
4	PORTNAME= nift	4	PORTNAME= nift
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.2	6	DISTVERSION= 2.3.8
7	CATEGORIES= www	7	CATEGORIES= www
8		8
9	MAINTAINER= info@babaei.net	9	MAINTAINER= info@babaei.net
Lines 12-24 Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	LIB_DEPENDS= libluajit-5.1.so:lang/luajit
16
17	USES= compiler:c++11-lang gmake	15	USES= compiler:c++11-lang gmake
18	USE_GITHUB= yes	16	USE_GITHUB= yes
19	GH_ACCOUNT= nifty-site-manager	17	GH_ACCOUNT= nifty-site-manager
20	GH_PROJECT= nsm	18	GH_PROJECT= nsm
21		19
		20	NO_OPTIONS_SORT= yes
		21	OPTIONS_SINGLE= LUA
		22	OPTIONS_SINGLE_LUA= BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA53 PORTS_LUA52 PORTS_LUA51
		23
		24	OPTIONS_DEFAULT= BUNDLED_LUAJIT
		25
		26	BUNDLED_LUAJIT_DESC= Use the bundled LuaJIT
		27	BUNDLED_LUA53_DESC= Use the bundled Lua 5.3
		28	PORTS_LUAJIT_DESC= Use LuaJIT from FreeBSD Ports
		29	PORTS_LUA53_DESC= Use Lua 5.3 from FreeBSD Ports
		30	PORTS_LUA52_DESC= Use Lua 5.2 from FreeBSD Ports
		31	PORTS_LUA51_DESC= Use Lua 5.1 from FreeBSD Ports
		32
		33	BUNDLED_LUAJIT_MAKE_ARGS= BUNDLED=1
		34	BUNDLED_LUAJIT_MAKE_JOBS_UNSAFE= yes
		35	BUNDLED_LUA53_MAKE_ARGS= BUNDLED=1 LUA_VERSION=5.3
		36	BUNDLED_LUA53_MAKE_JOBS_UNSAFE= yes
		37	PORTS_LUAJIT_MAKE_ARGS= BUNDLED=0 LUAJIT_VERSION=2.0
		38	PORTS_LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
		39	PORTS_LUA53_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.3
		40	PORTS_LUA53_LIB_DEPENDS= liblua-5.3.so:lang/lua53
		41	PORTS_LUA52_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.2
		42	PORTS_LUA52_LIB_DEPENDS= liblua-5.2.so:lang/lua52
		43	PORTS_LUA51_MAKE_ARGS= BUNDLED=0 LUA_VERSION=5.1
		44	PORTS_LUA51_LIB_DEPENDS= liblua-5.1.so:lang/lua51
		45
22	PLIST_FILES= bin/nift \	46	PLIST_FILES= bin/nift \
23	bin/nsm	47	bin/nsm
24	post-patch:	48	post-patch:

Lines 1-65 Link Here

(-)www/nift/files/patch-Makefile (-62 / +77 lines)
1	--- Makefile.orig 2020-03-29 23:58:44 UTC	1	--- Makefile.orig 2020-05-07 03:06:00 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows) # Windows	3	@@ -3,7 +3,7 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory.
4	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	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	CXX=clang
6	CXXFLAGS+= -s -Qunused-arguments -lstdc++
7	- LINK+= -ldl -lm -LLuaJIT/src -lluajit #use Nift built LuaJIT
8	- #LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1 #use FreeBSD LuaJIT
9	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1 #use FreeBSD LuaJIT
10	else # *nix
11	#use these flags for a smaller binary
12	#CXXFLAGS+= -s
13	@@ -51,7 +50,7 @@ endif
14		5
15	###	6	DESTDIR?=
		7	-PREFIX?=/usr/local
		8	+PREFIX?=%%LOCALBASE%%
		9	BINDIR=${DESTDIR}${PREFIX}/bin
		10	LIBDIR=${DESTDIR}${PREFIX}/lib
16		11
17	-all: make-luajit nsm	12	@@ -79,42 +79,58 @@ ifeq ($(BUNDLED),0)
18	+all: nsm	13	else ifeq ($(LUA_VERSION),x)
19		14	ifeq ($(detected_OS),FreeBSD) # FreeBSD
20	###	15	CXXFLAGS+= -D__LUA_VERSION_x__
21		16	- LINK+= -L/usr/local/lib -llua -lm -ldl
22	@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin) # Mac OSX	17	+ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl
23	else ifeq ($(detected_OS),Windows) # Windows	18	else # *nix
24	cd LuaJIT && make	19	CXXFLAGS+= -D__LUA_VERSION_x__
25	copy LuaJIT\src\lua51.dll .	20	- LINK+= -L/usr/local/lib -llua -ldl
26	-else ifeq ($(detected_OS),FreeBSD) #FreeBSD	21	+ LINK+= -L%%LOCALBASE%%/lib -llua -ldl
27	- cd LuaJIT && gmake	22	endif
28	- cp LuaJIT/src/libluajit.so ./	23	else ifeq ($(LUA_VERSION),5.4)
29	else # *nix	24	ifeq ($(detected_OS),FreeBSD) # FreeBSD
30	cd LuaJIT && make	25	CXXFLAGS+= -D__LUA_VERSION_5_4__
31	endif	26	- LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl
32	@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows) # Windows	27	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl
33	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	28	else # *nix
34	mkdir -p ${BINDIR}	29	CXXFLAGS+= -D__LUA_VERSION_5_4__
35	chmod 755 nsm	30	- LINK+= -L/usr/local/lib -llua-5.4 -ldl
36	- mv libluajit.so ${LIBDIR}/libluajit-5.1.so.2	31	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl
37	mv nift ${BINDIR}	32	endif
38	mv nsm ${BINDIR}	33	else ifeq ($(LUA_VERSION),5.3)
39	else # *nix	34	ifeq ($(detected_OS),FreeBSD) # FreeBSD
40	@@ -175,7 +170,6 @@ ifeq ($(detected_OS),Windows) # Windows	35	CXXFLAGS+= -D__LUA_VERSION_5_3__
41	@echo "and 'nift.exe' from install location, typically "	36	- LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl
42	@echo "'C:\Windows\System32'"	37	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl
43	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	38	else # *nix
44	- rm ${LIBDIR}/libluajit-5.1.so.2	39	CXXFLAGS+= -D__LUA_VERSION_5_3__
45	rm ${BINDIR}/nift	40	- LINK+= -L/usr/local/lib -llua-5.3 -ldl
46	rm ${BINDIR}/nsm	41	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl
47	else # *nix	42	endif
48	@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows) # Windows	43	+ else ifeq ($(LUA_VERSION),5.2)
49	#cd LuaJIT && make clean #this doesn't work for some reason	44	+ ifeq ($(detected_OS),FreeBSD) # FreeBSD
50	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	45	+ CXXFLAGS+= -D__LUA_VERSION_5_2__
51	rm -f $(objects)	46	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl
52	- cd LuaJIT && gmake clean	47	+ else # *nix
53	else # *nix	48	+ CXXFLAGS+= -D__LUA_VERSION_5_2__
54	rm -f $(objects)	49	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl
55	cd LuaJIT && make clean	50	+ endif
56	@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows) # Windows	51	+ else ifeq ($(LUA_VERSION),5.1)
57	del -f $(objects) nsm.exe nift.exe lua51.dll	52	+ ifeq ($(detected_OS),FreeBSD) # FreeBSD
58	#cd LuaJIT && make clean #see same line for clean	53	+ CXXFLAGS+= -D__LUA_VERSION_5_1__
59	else ifeq ($(detected_OS),FreeBSD) #FreeBSD	54	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl
60	- rm -f $(objects) nsm nift libluajit.so	55	+ else # *nix
61	- cd LuaJIT && gmake clean	56	+ CXXFLAGS+= -D__LUA_VERSION_5_1__
62	+ rm -f $(objects) nsm nift	57	+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl
63	else # *nix	58	+ endif
64	rm -f $(objects) nsm nift	59	else ifeq ($(LUAJIT_VERSION),2.0)
65	cd LuaJIT && make clean	60	ifeq ($(detected_OS),FreeBSD) # FreeBSD
		61	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
		62	- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
		63	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
		64	else # *nix
		65	CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
		66	- LINK+= -ldl -L/usr/local/lib -lluajit-5.1
		67	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
		68	endif
		69	else
		70	ifeq ($(detected_OS),FreeBSD) # FreeBSD
		71	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
		72	- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
		73	+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
		74	else # *nix
		75	CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
		76	- LINK+= -ldl -L/usr/local/lib -lluajit-5.1
		77	+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
		78	endif
		79	endif
		80	else