Index: head/www/nift/Makefile =================================================================== --- head/www/nift/Makefile (revision 535727) +++ head/www/nift/Makefile (revision 535728) @@ -1,56 +1,56 @@ # Created by: Mohammad S. Babaei # $FreeBSD$ PORTNAME= nift DISTVERSIONPREFIX= v -DISTVERSION= 2.3.8 +DISTVERSION= 2.3.9 CATEGORIES= www MAINTAINER= info@babaei.net COMMENT= Cross-platform open source website generator LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE 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: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nift ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nsm .include Index: head/www/nift/distinfo =================================================================== --- head/www/nift/distinfo (revision 535727) +++ head/www/nift/distinfo (revision 535728) @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1589558824 +SHA256 (nifty-site-manager-nsm-v2.3.9_GH0.tar.gz) = afc5fe6011be31e3eb05c46f0dbe7de62365d4bca51310619d9add0e99ae91fa +SIZE (nifty-site-manager-nsm-v2.3.9_GH0.tar.gz) = 1605558 Index: head/www/nift/files/patch-Makefile =================================================================== --- head/www/nift/files/patch-Makefile (revision 535727) +++ head/www/nift/files/patch-Makefile (revision 535728) @@ -1,80 +1,84 @@ ---- Makefile.orig 2020-05-07 03:06:00 UTC +--- Makefile.orig 2020-05-15 16:07:18 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 DESTDIR?= -PREFIX?=/usr/local +PREFIX?=%%LOCALBASE%% BINDIR=${DESTDIR}${PREFIX}/bin LIBDIR=${DESTDIR}${PREFIX}/lib -@@ -79,42 +79,58 @@ ifeq ($(BUNDLED),0) +@@ -79,58 +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__ + else ifeq ($(LUA_VERSION),5.2) + ifeq ($(detected_OS),FreeBSD) # FreeBSD + CXXFLAGS+= -D__LUA_VERSION_5_2__ +- LINK+= -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__ + else # *nix + CXXFLAGS+= -D__LUA_VERSION_5_2__ +- LINK+= -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__ + endif + else ifeq ($(LUA_VERSION),5.1) + ifeq ($(detected_OS),FreeBSD) # FreeBSD + CXXFLAGS+= -D__LUA_VERSION_5_1__ +- LINK+= -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__ + else # *nix + CXXFLAGS+= -D__LUA_VERSION_5_1__ +- LINK+= -L/usr/local/lib -llua-5.1 -ldl + LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl -+ endif + 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