Attachment #214011 for bug #245504





PORTNAME=	nift
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.7
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

OPTIONS_DEFINE=	BUNDLED_LUAJIT
OPTIONS_DEFAULT=	BUNDLED_LUAJIT

BUNDLED_LUAJIT_DESC=	Use the bundled LuaJIT

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MBUNDLED_LUAJIT}
MAKE_ARGS+=	BUNDLED=1
MAKE_JOBS_UNSAFE=	yes
.else
LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
MAKE_ARGS+=	BUNDLED=0
.endif

PLIST_FILES=	bin/nift \
		bin/nsm

Lines 1-3 Link Here

(-)nift/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585525828	1	TIMESTAMP = 1588383506
2	SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be	2	SHA256 (nifty-site-manager-nsm-v2.3.7_GH0.tar.gz) = b624eeb76c1b171670973bd94bb8a62484e76124fdc3f36a8e71938e182ff244
3	SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641	3	SIZE (nifty-site-manager-nsm-v2.3.7_GH0.tar.gz) = 1601817




--- Lua.h.orig	2020-05-02 01:59:47 UTC
+++ Lua.h
@@ -20,7 +20,11 @@
 		#include "/usr/local/include/lualib.h"
 	    #include "/usr/local/include/lauxlib.h"
 	#else
-		#include "/usr/local/include/luajit-2.1/lua.hpp"
+		#if defined __FreeBSD__
+			#include "/usr/local/include/luajit-2.0/lua.hpp"
+		#else
+			#include "/usr/local/include/luajit-2.1/lua.hpp"
+		#endif
 	#endif
 #endif
 




--- Makefile.orig	2020-03-29 23:58:44 UTC
+++ Makefile
@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	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
 
 ###
 
-all: make-luajit nsm
+all: nsm
 
 ###
 
@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin)        # Mac OSX
 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
 endif
@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	mkdir -p ${BINDIR}
 	chmod 755 nsm
-	mv libluajit.so ${LIBDIR}/libluajit-5.1.so.2
 	mv nift ${BINDIR}
 	mv nsm ${BINDIR}
 else                           # *nix
@@ -175,7 +170,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
 else                                # *nix
@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	#cd LuaJIT && make clean #this doesn't work for some reason
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	rm -f $(objects)
-	cd LuaJIT && gmake clean
 else                                # *nix
 	rm -f $(objects)
 	cd LuaJIT && make clean
@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	del -f $(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
 	cd LuaJIT && make clean




# Created by: Mohammad S. Babaei <info@babaei.net>
# $FreeBSD: head/www/nift/Makefile 530832 2020-04-05 20:11:53Z lbartoletti $

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

MAINTAINER=	info@babaei.net
COMMENT=	Cross-platform open source website generator

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

PLIST_FILES=	bin/nift \
		bin/nsm
post-patch:
	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
		${WRKSRC}/Makefile

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nsm

.include <bsd.port.mk>

Lines 1-3 Link Here

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




--- Makefile.orig	2020-03-29 23:58:44 UTC
+++ Makefile
@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	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
 
 ###
 
-all: make-luajit nsm
+all: nsm
 
 ###
 
@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin)        # Mac OSX
 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
 endif
@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows)  # Windows
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	mkdir -p ${BINDIR}
 	chmod 755 nsm
-	mv libluajit.so ${LIBDIR}/libluajit-5.1.so.2
 	mv nift ${BINDIR}
 	mv nsm ${BINDIR}
 else                           # *nix
@@ -175,7 +170,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
 else                                # *nix
@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	#cd LuaJIT && make clean #this doesn't work for some reason
 else ifeq ($(detected_OS),FreeBSD)  #FreeBSD
 	rm -f $(objects)
-	cd LuaJIT && gmake clean
 else                                # *nix
 	rm -f $(objects)
 	cd LuaJIT && make clean
@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows)  # Windows
 	del -f $(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
 	cd LuaJIT && make clean

Lines 1-4 Link Here

(-)nift/nift/pkg-descr (-4 lines)
1	Nift (aka nsm) is a cross-platform open-source framework for managing and
2	generating websites. It's lightning-fast, developed from the ground up in C++.
3
4	WWW: https://www.nift.cc

Return to bug 245504

Lines 3-9 Link Here

(-)nift/Makefile (-3 / +16 lines)
3		3
4	PORTNAME= nift	4	PORTNAME= nift
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.2	6	DISTVERSION= 2.3.7
7	CATEGORIES= www	7	CATEGORIES= www
8		8
9	MAINTAINER= info@babaei.net	9	MAINTAINER= info@babaei.net
Lines 12-23 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
		19
		20	OPTIONS_DEFINE= BUNDLED_LUAJIT
		21	OPTIONS_DEFAULT= BUNDLED_LUAJIT
		22
		23	BUNDLED_LUAJIT_DESC= Use the bundled LuaJIT
		24
		25	.include <bsd.port.options.mk>
		26
		27	.if ${PORT_OPTIONS:MBUNDLED_LUAJIT}
		28	MAKE_ARGS+= BUNDLED=1
		29	MAKE_JOBS_UNSAFE= yes
		30	.else
		31	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
		32	MAKE_ARGS+= BUNDLED=0
		33	.endif
21		34
22	PLIST_FILES= bin/nift \	35	PLIST_FILES= bin/nift \
23	bin/nsm	36	bin/nsm

Line 0 Link Here

(-)nift/files/patch-Lua.h (+15 lines)
	1	--- Lua.h.orig 2020-05-02 01:59:47 UTC
	2	+++ Lua.h
	3	@@ -20,7 +20,11 @@
	4	#include "/usr/local/include/lualib.h"
	5	#include "/usr/local/include/lauxlib.h"
	6	#else
	7	- #include "/usr/local/include/luajit-2.1/lua.hpp"
	8	+ #if defined __FreeBSD__
	9	+ #include "/usr/local/include/luajit-2.0/lua.hpp"
	10	+ #else
	11	+ #include "/usr/local/include/luajit-2.1/lua.hpp"
	12	+ #endif
	13	#endif
	14	#endif
	15

Lines 1-65 Link Here

(-)nift/files/patch-Makefile (-65 lines)
1	--- Makefile.orig 2020-03-29 23:58:44 UTC
2	+++ Makefile
3	@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows) # Windows
4	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
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
15	###
16
17	-all: make-luajit nsm
18	+all: nsm
19
20	###
21
22	@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin) # Mac OSX
23	else ifeq ($(detected_OS),Windows) # Windows
24	cd LuaJIT && make
25	copy LuaJIT\src\lua51.dll .
26	-else ifeq ($(detected_OS),FreeBSD) #FreeBSD
27	- cd LuaJIT && gmake
28	- cp LuaJIT/src/libluajit.so ./
29	else # *nix
30	cd LuaJIT && make
31	endif
32	@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows) # Windows
33	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
34	mkdir -p ${BINDIR}
35	chmod 755 nsm
36	- mv libluajit.so ${LIBDIR}/libluajit-5.1.so.2
37	mv nift ${BINDIR}
38	mv nsm ${BINDIR}
39	else # *nix
40	@@ -175,7 +170,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
44	- rm ${LIBDIR}/libluajit-5.1.so.2
45	rm ${BINDIR}/nift
46	rm ${BINDIR}/nsm
47	else # *nix
48	@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows) # Windows
49	#cd LuaJIT && make clean #this doesn't work for some reason
50	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
51	rm -f $(objects)
52	- cd LuaJIT && gmake clean
53	else # *nix
54	rm -f $(objects)
55	cd LuaJIT && make clean
56	@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows) # Windows
57	del -f $(objects) nsm.exe nift.exe lua51.dll
58	#cd LuaJIT && make clean #see same line for clean
59	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
60	- rm -f $(objects) nsm nift libluajit.so
61	- cd LuaJIT && gmake clean
62	+ rm -f $(objects) nsm nift
63	else # *nix
64	rm -f $(objects) nsm nift
65	cd LuaJIT && make clean

Lines 1-32 Link Here

(-)nift/nift/Makefile (-32 lines)
1	# Created by: Mohammad S. Babaei <info@babaei.net>
2	# $FreeBSD: head/www/nift/Makefile 530832 2020-04-05 20:11:53Z lbartoletti $
3
4	PORTNAME= nift
5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.2
7	CATEGORIES= www
8
9	MAINTAINER= info@babaei.net
10	COMMENT= Cross-platform open source website generator
11
12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/LICENSE
14
15	LIB_DEPENDS= libluajit-5.1.so:lang/luajit
16
17	USES= compiler:c++11-lang gmake
18	USE_GITHUB= yes
19	GH_ACCOUNT= nifty-site-manager
20	GH_PROJECT= nsm
21
22	PLIST_FILES= bin/nift \
23	bin/nsm
24	post-patch:
25	${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
26	${WRKSRC}/Makefile
27
28	post-install:
29	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift
30	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nsm
31
32	.include <bsd.port.mk>

Lines 1-65 Link Here

(-)nift/nift/files/patch-Makefile (-65 lines)
1	--- Makefile.orig 2020-03-29 23:58:44 UTC
2	+++ Makefile
3	@@ -30,8 +30,7 @@ else ifeq ($(detected_OS),Windows) # Windows
4	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
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
15	###
16
17	-all: make-luajit nsm
18	+all: nsm
19
20	###
21
22	@@ -62,9 +61,6 @@ ifeq ($(detected_OS),Darwin) # Mac OSX
23	else ifeq ($(detected_OS),Windows) # Windows
24	cd LuaJIT && make
25	copy LuaJIT\src\lua51.dll .
26	-else ifeq ($(detected_OS),FreeBSD) #FreeBSD
27	- cd LuaJIT && gmake
28	- cp LuaJIT/src/libluajit.so ./
29	else # *nix
30	cd LuaJIT && make
31	endif
32	@@ -159,7 +155,6 @@ ifeq ($(detected_OS),Windows) # Windows
33	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
34	mkdir -p ${BINDIR}
35	chmod 755 nsm
36	- mv libluajit.so ${LIBDIR}/libluajit-5.1.so.2
37	mv nift ${BINDIR}
38	mv nsm ${BINDIR}
39	else # *nix
40	@@ -175,7 +170,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
44	- rm ${LIBDIR}/libluajit-5.1.so.2
45	rm ${BINDIR}/nift
46	rm ${BINDIR}/nsm
47	else # *nix
48	@@ -201,7 +195,6 @@ else ifeq ($(detected_OS),Windows) # Windows
49	#cd LuaJIT && make clean #this doesn't work for some reason
50	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
51	rm -f $(objects)
52	- cd LuaJIT && gmake clean
53	else # *nix
54	rm -f $(objects)
55	cd LuaJIT && make clean
56	@@ -215,8 +208,7 @@ else ifeq ($(detected_OS),Windows) # Windows
57	del -f $(objects) nsm.exe nift.exe lua51.dll
58	#cd LuaJIT && make clean #see same line for clean
59	else ifeq ($(detected_OS),FreeBSD) #FreeBSD
60	- rm -f $(objects) nsm nift libluajit.so
61	- cd LuaJIT && gmake clean
62	+ rm -f $(objects) nsm nift
63	else # *nix
64	rm -f $(objects) nsm nift
65	cd LuaJIT && make clean