From owner-svn-ports-head@freebsd.org Sun Apr 5 20:32:05 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 30B6326A68C; Sun, 5 Apr 2020 20:32:05 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48wQM565Prz3Fkk; Sun, 5 Apr 2020 20:32:01 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5F7C1B4F9; Sun, 5 Apr 2020 20:11:53 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 035KBrE3017671; Sun, 5 Apr 2020 20:11:53 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 035KBrss017668; Sun, 5 Apr 2020 20:11:53 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202004052011.035KBrss017668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Sun, 5 Apr 2020 20:11:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530832 - in head/www/nift: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: in head/www/nift: . files X-SVN-Commit-Revision: 530832 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2020 20:32:08 -0000 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@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