FreeBSD Bugzilla – Attachment 224028 Details for
Bug 254980
www/nift: update to 2.4.12
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
www/nift-2.4.11 to 2.4.12 patch file
nift-v2.4.11-to-v2.4.12.patch (text/plain), 7.26 KB, created by
Mohammad S. Babaei
on 2021-04-11 15:55:58 UTC
(
hide
)
Description:
www/nift-2.4.11 to 2.4.12 patch file
Filename:
MIME Type:
Creator:
Mohammad S. Babaei
Created:
2021-04-11 15:55:58 UTC
Size:
7.26 KB
patch
obsolete
>diff -urN nift-orig/Makefile nift/Makefile >--- nift-orig/Makefile 2021-04-11 17:34:11.452347000 +0200 >+++ nift/Makefile 2021-04-11 17:35:27.909910000 +0200 >@@ -2,7 +2,7 @@ > > PORTNAME= nift > DISTVERSIONPREFIX= v >-DISTVERSION= 2.4.11 >+DISTVERSION= 2.4.12 > CATEGORIES= www > > MAINTAINER= info@babaei.net >diff -urN nift-orig/distinfo nift/distinfo >--- nift-orig/distinfo 2021-04-11 17:34:11.452314000 +0200 >+++ nift/distinfo 2021-04-11 17:35:27.910086000 +0200 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1618064605 >-SHA256 (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 4b7d5f7e5b1f721cdd88622ceec687ba59ecd900f266947071065c74da0f52b5 >-SIZE (nifty-site-manager-nsm-v2.4.11_GH0.tar.gz) = 1604956 >+TIMESTAMP = 1618141639 >+SHA256 (nifty-site-manager-nsm-v2.4.12_GH0.tar.gz) = 7a28987114cd5e4717b31a96840c0be505d58a07e20dcf26b25add7dbdf2668b >+SIZE (nifty-site-manager-nsm-v2.4.12_GH0.tar.gz) = 1632264 >diff -urN nift-orig/files/patch-LuaJIT_src_Makefile nift/files/patch-LuaJIT_src_Makefile >--- nift-orig/files/patch-LuaJIT_src_Makefile 1970-01-01 01:00:00.000000000 +0100 >+++ nift/files/patch-LuaJIT_src_Makefile 2021-04-11 17:35:27.910331000 +0200 >@@ -0,0 +1,28 @@ >+--- LuaJIT/src/Makefile.orig 2021-04-11 12:16:52 UTC >++++ LuaJIT/src/Makefile >+@@ -16,6 +16,12 @@ RELVER= 0 >+ ABIVER= 5.1 >+ NODOTABIVER= 51 >+ >++ifeq ($(OS),Windows_NT) >++ detected_OS := Windows >++else >++ detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown') >++endif >++ >+ ############################################################################## >+ ############################# COMPILER OPTIONS ############################# >+ ############################################################################## >+@@ -24,7 +30,11 @@ NODOTABIVER= 51 >+ # removing the '#' in front of them. Make sure you force a full recompile >+ # with "make clean", followed by "make" if you change any options. >+ # >+-DEFAULT_CC = gcc >++ifeq ($(detected_OS),FreeBSD) #FreeBSD >++ DEFAULT_CC = clang >++else # *nix >++ DEFAULT_CC = gcc >++endif >+ # >+ # LuaJIT builds as a native 32 or 64 bit binary by default. >+ CC= $(DEFAULT_CC) >diff -urN nift-orig/files/patch-LuaJIT_src_lj__prng.c nift/files/patch-LuaJIT_src_lj__prng.c >--- nift-orig/files/patch-LuaJIT_src_lj__prng.c 1970-01-01 01:00:00.000000000 +0100 >+++ nift/files/patch-LuaJIT_src_lj__prng.c 2021-04-11 17:39:33.759151000 +0200 >@@ -0,0 +1,18 @@ >+--- LuaJIT/src/lj_prng.c.orig 2021-04-11 15:38:54 UTC >++++ LuaJIT/src/lj_prng.c >+@@ -109,6 +109,7 @@ static PRGR libfunc_rgr; >+ #include <sys/syscall.h> >+ #else >+ >++#ifndef LJ_TARGET_HAS_GETENTROPY >+ #if LJ_TARGET_OSX && !LJ_TARGET_IOS >+ /* >+ ** In their infinite wisdom Apple decided to disallow getentropy() in the >+@@ -123,6 +124,7 @@ static PRGR libfunc_rgr; >+ #endif >+ #elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN >+ #define LJ_TARGET_HAS_GETENTROPY 1 >++#endif >+ #endif >+ >+ #if LJ_TARGET_HAS_GETENTROPY >diff -urN nift-orig/files/patch-Makefile nift/files/patch-Makefile >--- nift-orig/files/patch-Makefile 2021-04-11 17:34:11.452271000 +0200 >+++ nift/files/patch-Makefile 2021-04-11 17:53:42.563559000 +0200 >@@ -1,4 +1,4 @@ >---- Makefile.orig 2021-03-22 01:52:47 UTC >+--- Makefile.orig 2021-04-11 05:30:01 UTC > +++ Makefile > @@ -3,14 +3,14 @@ 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 >@@ -41,71 +41,71 @@ > ifeq ($(detected_OS),FreeBSD) # FreeBSD > CXXFLAGS+= -D__LUA_VERSION_x__ > - LDFLAGS+= -L/usr/local/lib -llua -lm -ldl >-+ LINK+= -L/usr/local/lib -llua -lm -ldl >++ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl > else # *nix > CXXFLAGS+= -D__LUA_VERSION_x__ > - LDFLAGS+= -L/usr/local/lib -llua -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl >-+ 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__ > - LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl >-+ LINK+= -L/usr/local/lib -llua-5.1 -ldl >++ 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__ > - LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.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_0__ > - LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 >-+ 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__ > - LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.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__ > - LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1 >-+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1 >++ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1 > endif > endif > else >@@ -144,7 +144,7 @@ > endif > endif > endif >-@@ -234,10 +234,10 @@ endif >+@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h > > nsm: $(objects) > ifeq ($(detected_OS),Windows) # Windows
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 254980
:
224024
|
224026
|
224027
|
224028
|
224032
|
224033