Attachment #197611 for bug #231780

Lines 11-16 Link Here

(-)databases/redis-devel/Makefile (-4 / +12 lines)
11		11
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13		13
		14	USES= compiler:c11 gmake
		15
		16	MAKE_ENV= "V=yo"
14	USE_GITHUB= yes	17	USE_GITHUB= yes
15	GH_ACCOUNT= antirez	18	GH_ACCOUNT= antirez
16		19
Lines 24-34 Link Here
24	TESTS_DESC= Install lang/tcl for redis unit tests	27	TESTS_DESC= Install lang/tcl for redis unit tests
25	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)	28	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
26		29
27	USES+= gmake
28	MAKE_ENV= "V=yo"
29
30	.include <bsd.port.options.mk>	30	.include <bsd.port.options.mk>
31		31
		32	.if ${ARCH} == mips
		33	USES:= compiler gmake
		34	.endif
		35
32	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}	36	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
33	# Needed for __atomic_fetch_add_8	37	# Needed for __atomic_fetch_add_8
34	USE_GCC= yes	38	USE_GCC= yes
Lines 99-104 Link Here
99	.if ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUA}	103	.if ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUA}
100	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/	104	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
101	.endif	105	.endif
		106	.include <bsd.port.pre.mk>
		107	.if ${COMPILER_TYPE} == clang
		108	EXTRA_PATCHES= ${PATCHDIR}/extra-patches-src_lzf__d.c
		109	.endif
102		110
103	post-build:	111	post-build:
104	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	112	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
Lines 118-121 Link Here
118	do-test:	126	do-test:
119	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl	127	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
120		128
121	.include <bsd.port.mk>	129	.include <bsd.port.post.mk>




--- deps/lua/src/lua_cjson.c.orig	2018-09-06 11:04:23 UTC
+++ deps/lua/src/lua_cjson.c
@@ -46,7 +46,9 @@
 #include "strbuf.h"
 #include "fpconv.h"
 
+#if defined(__sun)
 #include "../../../src/solarisfixes.h"
+#endif
 
 #ifndef CJSON_MODNAME
 #define CJSON_MODNAME   "cjson"




--- deps/lua/src/lua_cjson.c.orig	2016-12-04 20:49:41.925218000 -0500
+++ deps/lua/src/lua_cjson.c	2016-12-04 20:49:59.728885000 -0500
@@ -46,7 +46,9 @@
 #include "strbuf.h"
 #include "fpconv.h"
 
+#if defined(__sun)
 #include "../../../src/solarisfixes.h"
+#endif
 
 #ifndef CJSON_MODNAME
 #define CJSON_MODNAME   "cjson"

Return to bug 231780

Line 0 Link Here

(-)databases/redis-devel/files/patch-deps_lua_src_lua__cjson.c (+12 lines)
	1	--- deps/lua/src/lua_cjson.c.orig 2018-09-06 11:04:23 UTC
	2	+++ deps/lua/src/lua_cjson.c
	3	@@ -46,7 +46,9 @@
	4	#include "strbuf.h"
	5	#include "fpconv.h"
	6
	7	+#if defined(__sun)
	8	#include "../../../src/solarisfixes.h"
	9	+#endif
	10
	11	#ifndef CJSON_MODNAME
	12	#define CJSON_MODNAME "cjson"

Lines 1-12 Link Here

(-)databases/redis-devel/files/patch-src-lua_cjson.c (-12 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500
3	@@ -46,7 +46,9 @@
4	#include "strbuf.h"
5	#include "fpconv.h"
6
7	+#if defined(__sun)
8	#include "../../../src/solarisfixes.h"
9	+#endif
10
11	#ifndef CJSON_MODNAME
12	#define CJSON_MODNAME "cjson"