git: b5688f6d033b - main - www/nift: Update to 3.0.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Thu, 05 Sep 2024 05:29:13 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b5688f6d033b41d422a8962af69239981a3ad841

commit b5688f6d033b41d422a8962af69239981a3ad841
Author:     Mamadou Babaei <info@babaei.net>
AuthorDate: 2024-09-05 05:21:56 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-09-05 05:28:55 +0000

    www/nift: Update to 3.0.3
    
    Don't use bundled lua or luajit.
    Remove options about lua versions, set via DEFAULT_VERSIONS.
    Add LUAJIT option.
    Update WWW.
    
    Changelog:
    https://github.com/nifty-site-manager/nsm/blob/master/ReleaseNotes.md
    
    PR:             278203
    Reported by:    yds <yds@Necessitu.de>
    Approved by:    submitter is maintainer
---
 www/nift/Makefile             |  49 ++++---------
 www/nift/distinfo             |   6 +-
 www/nift/files/patch-Makefile | 159 ------------------------------------------
 3 files changed, 16 insertions(+), 198 deletions(-)

diff --git a/www/nift/Makefile b/www/nift/Makefile
index 67f112fa92c0..a3f566c78eaa 100644
--- a/www/nift/Makefile
+++ b/www/nift/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	nift
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.11
-PORTREVISION=	1
+DISTVERSION=	3.0.3
 CATEGORIES=	www
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Cross-platform open source website generator
-WWW=		https://www.nift.cc
+WWW=		https://www.nift.dev
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -19,39 +18,17 @@ GH_PROJECT=	nsm
 PLIST_FILES=	bin/nift \
 		bin/nsm
 
-OPTIONS_DEFAULT=		PORTS_LUAJIT
-OPTIONS_DEFAULT_riscv64=	BUNDLED_LUA53
-OPTIONS_SINGLE=		LUA
-OPTIONS_SINGLE_LUA=	BUNDLED_LUAJIT BUNDLED_LUA53 PORTS_LUAJIT PORTS_LUA54 PORTS_LUA53 PORTS_LUA52 PORTS_LUA51
-OPTIONS_EXCLUDE_riscv64=	BUNDLED_LUAJIT
-NO_OPTIONS_SORT=	yes
-
-BUNDLED_LUA53_DESC=	Use the bundled Lua 5.3
-BUNDLED_LUAJIT_DESC=	Use the bundled LuaJIT
-PORTS_LUA51_DESC=	Use Lua 5.1 from FreeBSD Ports
-PORTS_LUA52_DESC=	Use Lua 5.2 from FreeBSD Ports
-PORTS_LUA53_DESC=	Use Lua 5.3 from FreeBSD Ports
-PORTS_LUA54_DESC=	Use Lua 5.4 from FreeBSD Ports
-PORTS_LUAJIT_DESC=	Use LuaJIT from FreeBSD Ports
-
-BUNDLED_LUA53_MAKE_ARGS=	BUNDLED=1 LUA_VERSION=5.3
-BUNDLED_LUA53_VARS=		MAKE_JOBS_UNSAFE=	yes
-BUNDLED_LUAJIT_MAKE_ARGS=	BUNDLED=1
-BUNDLED_LUAJIT_VARS=		MAKE_JOBS_UNSAFE=	yes
-PORTS_LUA51_LIB_DEPENDS=	liblua-5.1.so:lang/lua51
-PORTS_LUA51_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.1
-PORTS_LUA52_LIB_DEPENDS=	liblua-5.2.so:lang/lua52
-PORTS_LUA52_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.2
-PORTS_LUA53_LIB_DEPENDS=	liblua-5.3.so:lang/lua53
-PORTS_LUA53_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.3
-PORTS_LUA54_LIB_DEPENDS=	liblua-5.4.so:lang/lua54
-PORTS_LUA54_MAKE_ARGS=		BUNDLED=0 LUA_VERSION=5.4
-PORTS_LUAJIT_USES=		luajit
-PORTS_LUAJIT_MAKE_ARGS=		BUNDLED=0 LUAJIT_VERSION=${LUAJIT_LUAVER}
-
-post-patch:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/Makefile
+OPTIONS_DEFINE=		LUAJIT
+OPTIONS_DEFAULT=	LUAJIT
+LUAJIT_DESC=		Use the Just-In-Time compiler for lua
+LUAJIT_USES=		luajit
+LUAJIT_USE_OFF=		lua
+LUAJIT_MAKE_ARGS=	BUNDLED=0 LUAJIT_VERSION=${LUAJIT_LUAVER}
+LUAJIT_MAKE_ARGS_OFF=	BUNDLED=0 LUA_VERSION=${LUA_VER}
+
+.if empty(PORT_OPTIONS:MLUAJIT)
+USES+=		lua
+.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift
diff --git a/www/nift/distinfo b/www/nift/distinfo
index 0850a3418c66..19c1308a8863 100644
--- a/www/nift/distinfo
+++ b/www/nift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618064605
-SHA256 (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 4b7d5f7e5b1f721cdd88622ceec687ba59ecd900f266947071065c74da0f52b5
-SIZE (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 1604956
+TIMESTAMP = 1711503891
+SHA256 (nifty-site-manager-nsm-v3.0.3_GH0.tar.gz) = 4900247b92e0ae0d124391ec710a38b322ae83170e2c39191f8ad497090ffd24
+SIZE (nifty-site-manager-nsm-v3.0.3_GH0.tar.gz) = 1792312
diff --git a/www/nift/files/patch-Makefile b/www/nift/files/patch-Makefile
deleted file mode 100644
index f706a9b7ecf9..000000000000
--- a/www/nift/files/patch-Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
---- Makefile.orig	2021-03-22 01:52:47 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
- 
- DESTDIR?=
--PREFIX?=/usr/local
-+PREFIX?=%%LOCALBASE%%
- BINDIR=${DESTDIR}${PREFIX}/bin
- LIBDIR=${DESTDIR}${PREFIX}/lib
- 
- CXX?=g++
- CXXFLAGS+=-std=c++11 -Wall -Wextra -pedantic -O3 -Dexprtk_disable_caseinsensitivity
- #CXXFLAGS=-std=c++11 -Wall -Wextra -Werror -pedantic -O3
--LDFLAGS+=-pthread
-+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
--			#LDFLAGS+= -ldl -lm -LLuaJIT/src -lluajit
-+			LINK+= ./LuaJIT/src/libluajit.a -ldl -lm
-+			#LINK+= -ldl -lm -LLuaJIT/src -lluajit
- 		else                                # *nix/Vercel
--			LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl
--			#LDFLAGS+= -ldl -LLuaJIT/src -lluajit
-+			LINK+= ./LuaJIT/src/libluajit.a -ldl
-+			#LINK+= -ldl -LLuaJIT/src -lluajit
- 		endif
- 	endif
- endif
-@@ -234,10 +234,10 @@ endif 
- 
- nsm: $(objects)
- ifeq ($(detected_OS),Windows)  # Windows
--	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
- 	copy nsm.exe nift.exe
- else
--	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
- 	cp nsm nift
- endif
-