Date: Thu, 14 May 2020 19:44:57 +0000 (UTC) From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= <lbartoletti@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535253 - in head/www/nift: . files Message-ID: <202005141944.04EJiv6w053433@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lbartoletti Date: Thu May 14 19:44:57 2020 New Revision: 535253 URL: https://svnweb.freebsd.org/changeset/ports/535253 Log: PR: 245504 Submitted by: info@babaei.net (maintainer) Approved by: tcberner (mentor) Differential Revision: D24632 Modified: head/www/nift/Makefile head/www/nift/distinfo head/www/nift/files/patch-Makefile Modified: head/www/nift/Makefile ============================================================================== --- head/www/nift/Makefile Thu May 14 19:06:25 2020 (r535252) +++ head/www/nift/Makefile Thu May 14 19:44:57 2020 (r535253) @@ -3,7 +3,7 @@ PORTNAME= nift DISTVERSIONPREFIX= v -DISTVERSION= 2.2 +DISTVERSION= 2.3.8 CATEGORIES= www MAINTAINER= info@babaei.net @@ -12,12 +12,36 @@ 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 + +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 Modified: head/www/nift/distinfo ============================================================================== --- head/www/nift/distinfo Thu May 14 19:06:25 2020 (r535252) +++ head/www/nift/distinfo Thu May 14 19:44:57 2020 (r535253) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585525828 -SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be -SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641 +TIMESTAMP = 1588819821 +SHA256 (nifty-site-manager-nsm-v2.3.8_GH0.tar.gz) = 4bd42efbdbc05e121e7ee4ccf93640635dd4ee32532232f5e5a9e59f11238ad9 +SIZE (nifty-site-manager-nsm-v2.3.8_GH0.tar.gz) = 1602629 Modified: head/www/nift/files/patch-Makefile ============================================================================== --- head/www/nift/files/patch-Makefile Thu May 14 19:06:25 2020 (r535252) +++ head/www/nift/files/patch-Makefile Thu May 14 19:44:57 2020 (r535253) @@ -1,65 +1,80 @@ ---- Makefile.orig 2020-03-29 23:58:44 UTC +--- Makefile.orig 2020-05-07 03:06:00 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 +@@ -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 - ### + DESTDIR?= +-PREFIX?=/usr/local ++PREFIX?=%%LOCALBASE%% + BINDIR=${DESTDIR}${PREFIX}/bin + LIBDIR=${DESTDIR}${PREFIX}/lib --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 +@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005141944.04EJiv6w053433>