FreeBSD Bugzilla – Attachment 214011 Details for
Bug 245504
www/nift: Update to 2.3.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
www/nift-2.2 to 2.3.7 patch file
nift-2.2-to-2.3.7.patch (text/plain), 8.63 KB, created by
Mohammad S. Babaei
on 2020-05-02 02:24:24 UTC
(
hide
)
Description:
www/nift-2.2 to 2.3.7 patch file
Filename:
MIME Type:
Creator:
Mohammad S. Babaei
Created:
2020-05-02 02:24:24 UTC
Size:
8.63 KB
patch
obsolete
>diff -urN nift-orig/Makefile nift/Makefile >--- nift-orig/Makefile 2020-04-28 04:11:20.752268000 +0000 >+++ nift/Makefile 2020-05-02 02:20:22.742996000 +0000 >@@ -3,7 +3,7 @@ > > PORTNAME= nift > DISTVERSIONPREFIX= v >-DISTVERSION= 2.2 >+DISTVERSION= 2.3.7 > CATEGORIES= www > > MAINTAINER= info@babaei.net >@@ -12,12 +12,25 @@ > 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 >+ >+OPTIONS_DEFINE= BUNDLED_LUAJIT >+OPTIONS_DEFAULT= BUNDLED_LUAJIT >+ >+BUNDLED_LUAJIT_DESC= Use the bundled LuaJIT >+ >+.include <bsd.port.options.mk> >+ >+.if ${PORT_OPTIONS:MBUNDLED_LUAJIT} >+MAKE_ARGS+= BUNDLED=1 >+MAKE_JOBS_UNSAFE= yes >+.else >+LIB_DEPENDS+= libluajit-5.1.so:lang/luajit >+MAKE_ARGS+= BUNDLED=0 >+.endif > > PLIST_FILES= bin/nift \ > bin/nsm >diff -urN nift-orig/distinfo nift/distinfo >--- nift-orig/distinfo 2020-04-28 04:11:20.752809000 +0000 >+++ nift/distinfo 2020-05-02 01:38:26.546482000 +0000 >@@ -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 = 1588383506 >+SHA256 (nifty-site-manager-nsm-v2.3.7_GH0.tar.gz) = b624eeb76c1b171670973bd94bb8a62484e76124fdc3f36a8e71938e182ff244 >+SIZE (nifty-site-manager-nsm-v2.3.7_GH0.tar.gz) = 1601817 >diff -urN nift-orig/files/patch-Lua.h nift/files/patch-Lua.h >--- nift-orig/files/patch-Lua.h 1970-01-01 00:00:00.000000000 +0000 >+++ nift/files/patch-Lua.h 2020-05-02 02:01:42.864865000 +0000 >@@ -0,0 +1,15 @@ >+--- Lua.h.orig 2020-05-02 01:59:47 UTC >++++ Lua.h >+@@ -20,7 +20,11 @@ >+ #include "/usr/local/include/lualib.h" >+ #include "/usr/local/include/lauxlib.h" >+ #else >+- #include "/usr/local/include/luajit-2.1/lua.hpp" >++ #if defined __FreeBSD__ >++ #include "/usr/local/include/luajit-2.0/lua.hpp" >++ #else >++ #include "/usr/local/include/luajit-2.1/lua.hpp" >++ #endif >+ #endif >+ #endif >+ >diff -urN nift-orig/files/patch-Makefile nift/files/patch-Makefile >--- nift-orig/files/patch-Makefile 2020-04-28 04:11:20.753702000 +0000 >+++ nift/files/patch-Makefile 1970-01-01 00:00:00.000000000 +0000 >@@ -1,65 +0,0 @@ >---- 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 >diff -urN nift-orig/nift/Makefile nift/nift/Makefile >--- nift-orig/nift/Makefile 2020-05-02 01:37:12.008477000 +0000 >+++ nift/nift/Makefile 1970-01-01 00:00:00.000000000 +0000 >@@ -1,32 +0,0 @@ >-# Created by: Mohammad S. Babaei <info@babaei.net> >-# $FreeBSD: head/www/nift/Makefile 530832 2020-04-05 20:11:53Z lbartoletti $ >- >-PORTNAME= nift >-DISTVERSIONPREFIX= v >-DISTVERSION= 2.2 >-CATEGORIES= www >- >-MAINTAINER= info@babaei.net >-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 >- >-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 <bsd.port.mk> >diff -urN nift-orig/nift/distinfo nift/nift/distinfo >--- nift-orig/nift/distinfo 2020-05-02 01:37:12.008555000 +0000 >+++ nift/nift/distinfo 1970-01-01 00:00:00.000000000 +0000 >@@ -1,3 +0,0 @@ >-TIMESTAMP = 1585525828 >-SHA256 (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 65d0d597aa0de5683a63e3f0524e1aa5d99e081aeb3124624c612e55b49c54be >-SIZE (nifty-site-manager-nsm-v2.2_GH0.tar.gz) = 1201641 >diff -urN nift-orig/nift/files/patch-Makefile nift/nift/files/patch-Makefile >--- nift-orig/nift/files/patch-Makefile 2020-05-02 01:37:12.009054000 +0000 >+++ nift/nift/files/patch-Makefile 1970-01-01 00:00:00.000000000 +0000 >@@ -1,65 +0,0 @@ >---- 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 >diff -urN nift-orig/nift/pkg-descr nift/nift/pkg-descr >--- nift-orig/nift/pkg-descr 2020-05-02 01:37:12.009120000 +0000 >+++ nift/nift/pkg-descr 1970-01-01 00:00:00.000000000 +0000 >@@ -1,4 +0,0 @@ >-Nift (aka nsm) is a cross-platform open-source framework for managing and >-generating websites. It's lightning-fast, developed from the ground up in C++. >- >-WWW: https://www.nift.cc
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
info
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 245504
:
213245
|
213879
|
214011
|
214012
|
214219
|
214256
|
214330