svn commit: r530832 - in head/www/nift: . files
Loïc Bartoletti
lbartoletti at FreeBSD.org
Sun Apr 5 20:32:07 UTC 2020
Author: lbartoletti
Date: Sun Apr 5 20:11:53 2020
New Revision: 530832
URL: https://svnweb.freebsd.org/changeset/ports/530832
Log:
www/nift: Update to 2.2
- Update to 2.2
- Add files/patch-Makefile to use LuaJIT from ports
- Patch Makefile for localbase
PR: 244941
Submitted by: Mohammad S. Babaei (maintainer)
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D24298
Added:
head/www/nift/files/
head/www/nift/files/patch-Makefile (contents, props changed)
Modified:
head/www/nift/Makefile
head/www/nift/distinfo
Modified: head/www/nift/Makefile
==============================================================================
--- head/www/nift/Makefile Sun Apr 5 19:59:08 2020 (r530831)
+++ head/www/nift/Makefile Sun Apr 5 20:11:53 2020 (r530832)
@@ -3,7 +3,7 @@
PORTNAME= nift
DISTVERSIONPREFIX= v
-DISTVERSION= 2.0.1
+DISTVERSION= 2.2
CATEGORIES= www
MAINTAINER= info at babaei.net
@@ -12,13 +12,18 @@ COMMENT= Cross-platform open source website generator
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lang
+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
Modified: head/www/nift/distinfo
==============================================================================
--- head/www/nift/distinfo Sun Apr 5 19:59:08 2020 (r530831)
+++ head/www/nift/distinfo Sun Apr 5 20:11:53 2020 (r530832)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578262769
-SHA256 (nifty-site-manager-nsm-v2.0.1_GH0.tar.gz) = 66aad5d280b7d7ea8a5ea5b6bee24a69883218df2bc455e7ffb60343b77d4e4a
-SIZE (nifty-site-manager-nsm-v2.0.1_GH0.tar.gz) = 53160
+TIMESTAMP = 1585525828
+SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be
+SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641
Added: head/www/nift/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nift/files/patch-Makefile Sun Apr 5 20:11:53 2020 (r530832)
@@ -0,0 +1,65 @@
+--- 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
More information about the svn-ports-all
mailing list