Attachment #208642 for bug #241526




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20191028:
  AFFETS: users of databases/redis
  AUTHOR: osa@FreeBSD.org

  databases/redis is updated to 5.0. Before updating you should read
  'Migrating from 4.0 to 5.0' section of following release note.

  https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES

  If you would like to stay 4.0 then switch to databases/redis4.

20191026:
  AFFECTS: users of www/qt5-webengine
  AUTHOR: kai@FreeBSD.org

Lines 889-894 Link Here

(-)databases/Makefile (+1 lines)
889	SUBDIR += recutils	889	SUBDIR += recutils
890	SUBDIR += redis	890	SUBDIR += redis
891	SUBDIR += redis-devel	891	SUBDIR += redis-devel
		892	SUBDIR += redis4
892	SUBDIR += redis_exporter	893	SUBDIR += redis_exporter
893	SUBDIR += redisdesktopmanager	894	SUBDIR += redisdesktopmanager
894	SUBDIR += retcl	895	SUBDIR += retcl




# $FreeBSD$

PORTNAME=	redis
DISTVERSION=	5.0.6
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	http://download.redis.io/releases/



LICENSE=	BSD3CLAUSE

OPTIONS_DEFINE=	JEMALLOC TESTS TRIB
OPTIONS_RADIO=	EXTLUA
OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
OPTIONS_SUB=	yes
JEMALLOC_DESC=	Use jemalloc
LUA_DESC=	Use lang/lua instead of builtin lua
LUAJIT_DESC=	Use lang/luajit instead of builtin lua
TESTS_DESC=	Install lang/tcl for redis unit tests
TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)

USES+=		compiler gmake
MAKE_ENV=	"V=yo"

.include <bsd.port.options.mk>

.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}

CFLAGS+=	-march=i586
.endif

.if ${PORT_OPTIONS:MJEMALLOC}
MAKE_ENV+=	"USE_JEMALLOC=yes"
.endif

.if ${PORT_OPTIONS:MTRIB}
CATEGORIES+=	ruby
USE_RUBY=	yes


LDFLAGS+=	-lpthread -lm -lexecinfo

CONFLICTS?=	redis4-4.* redis-devel-5.*

USES+=		gmake
MAKE_ENV=	"V=yo"
USE_RC_SUBR=	redis sentinel
BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
		redis-cli redis-sentinel redis-server

	REDIS_DBDIR=${REDIS_DBDIR} \
	REDIS_RUNDIR=${REDIS_RUNDIR}

.include <bsd.port.pre.mk>

post-patch:
.if ${PORT_OPTIONS:MJEMALLOC}
	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
.endif
.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
post-patch:
	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
.endif
.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c
.endif

post-build:
	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \

do-test:
	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)databases/redis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1553045896	1	TIMESTAMP = 1572194618
2	SHA256 (redis-4.0.14.tar.gz) = 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7	2	SHA256 (redis-5.0.6.tar.gz) = 6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3
3	SIZE (redis-4.0.14.tar.gz) = 1740967	3	SIZE (redis-5.0.6.tar.gz) = 1979873




--- src/Makefile.orig	2018-10-18 18:09:43.930566000 -0400
+++ src/Makefile	2018-10-18 18:10:32.562125000 -0400
@@ -16,7 +16,7 @@
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

 ifeq ($(MALLOC),tcmalloc)
 	FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -130,6 +130,9 @@
 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
 endif
 
+FINAL_CFLAGS+=-I${PREFIX}/include/lua51

@@ -150,6 +153,7 @@
 REDIS_SERVER_NAME=redis-server
 REDIS_SENTINEL_NAME=redis-sentinel
 REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
 REDIS_CLI_NAME=redis-cli
 REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
 REDIS_BENCHMARK_NAME=redis-benchmark
@@ -201,7 +205,7 @@
 




--- src/Makefile.orig	2018-10-18 18:11:24.649811000 -0400
+++ src/Makefile	2018-10-18 18:11:35.160523000 -0400
@@ -16,7 +16,7 @@
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

 ifeq ($(MALLOC),tcmalloc)
 	FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -130,6 +130,9 @@
 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
 endif
 
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0

@@ -150,6 +153,7 @@
 REDIS_SERVER_NAME=redis-server
 REDIS_SENTINEL_NAME=redis-sentinel
 REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
 REDIS_CLI_NAME=redis-cli
 REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
 REDIS_BENCHMARK_NAME=redis-benchmark
@@ -201,7 +205,7 @@
 

Lines 1-6 Link Here

(-)databases/redis/files/patch-deps-Makefile (-4 / +4 lines)
1	--- deps/Makefile.orig 2016-02-02 19:38:43.438304000 -0500	1	--- deps/Makefile.orig 2019-09-25 10:40:18 UTC
2	+++ deps/Makefile 2016-02-02 19:40:05.911356000 -0500	2	+++ deps/Makefile
3	@@ -59,7 +59,7 @@	3	@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
4	LUA_CFLAGS= -D__C99FEATURES__=1	4	LUA_CFLAGS= -D__C99FEATURES__=1
5	endif	5	endif
6		6
Lines 9-15 Link Here
9	LUA_LDFLAGS+= $(LDFLAGS)	9	LUA_LDFLAGS+= $(LDFLAGS)
10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more	10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
11	# challenging to cross-compile lua (and redis). These defines make it easier	11	# challenging to cross-compile lua (and redis). These defines make it easier
12	@@ -69,7 +69,7 @@	12	@@ -68,7 +68,7 @@ ARFLAGS=rcu
13		13
14	lua: .make-prerequisites	14	lua: .make-prerequisites
15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)	15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)




--- deps/hiredis/Makefile.orig	2019-09-25 10:40:18 UTC
+++ deps/hiredis/Makefile
@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
 HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
 
 # Installation related variables and target

 INCLUDE_PATH?=include/hiredis
 LIBRARY_PATH?=lib
 PKGCONF_PATH?=pkgconfig
@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
 # Fallback to gcc when $CC is not in $PATH.
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')

 REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
 
 DYLIBSUFFIX=so
@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
   REAL_LDFLAGS+= -ldl -lnsl -lsocket
   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
   INSTALL= cp -r
+endif
+ifeq ($(uname_S),FreeBSD)
+  CFLAGS?=$(CFLAGS)
+  CCLINK?=-pthread

+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+  STLIBNAME?=libhiredis.a
+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
 endif
 ifeq ($(uname_S),Darwin)
   DYLIBSUFFIX=dylib
   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)




--- deps/hiredis/net.c.orig	2019-09-25 10:40:18 UTC
+++ deps/hiredis/net.c
@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
 
     val = interval;
 

     val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }

 #endif
 #endif
 
@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     struct sockaddr_un sa;
     long timeout_msec = -1;
 

         return REDIS_ERR;
     if (redisSetBlocking(c,0) != REDIS_OK)
         return REDIS_ERR;
@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
         return REDIS_ERR;
 

Lines 1-5 Link Here

(-)databases/redis/files/patch-deps-linenoise-Makefile (-2 / +2 lines)
1	--- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300	1	--- deps/linenoise/Makefile.orig 2019-09-25 10:40:18 UTC
2	+++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300	2	+++ deps/linenoise/Makefile
3	@@ -1,10 +1,10 @@	3	@@ -1,10 +1,10 @@
4	STD=	4	STD=
5	WARN= -Wall	5	WARN= -Wall




--- redis.conf.orig	2019-09-25 10:40:18 UTC
+++ redis.conf
@@ -133,7 +133,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.

 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options:
@@ -155,7 +155,7 @@ supervised no
 #
 # Creating a pid file is best effort: if Redis is not able to create it
 # nothing bad happens, the server will start and run normally.

 
 # Specify the server verbosity level.
 # This can be one of:
@@ -168,7 +168,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null

 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -260,7 +260,7 @@ dbfilename dump.rdb
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.




--- src/Makefile.orig	2019-09-25 10:40:18 UTC
+++ src/Makefile
@@ -29,7 +29,7 @@ endif
 WARN=-Wall -W -Wno-missing-field-initializers
 OPT=$(OPTIMIZATION)
 
-PREFIX?=/usr/local

 INSTALL_BIN=$(PREFIX)/bin
 INSTALL=install
 
@@ -75,7 +75,6 @@ endif
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm

 
 ifeq ($(uname_S),SunOS)
 	# SunOS
@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
 	# Darwin
 	FINAL_LIBS+= -ldl
 else
+ifeq ($(uname_S),FreeBSD)
+        # FreeBSD

 ifeq ($(uname_S),AIX)
         # AIX
         FINAL_LDFLAGS+= -Wl,-bexpall
@@ -120,6 +124,7 @@ else
 	# All the other OSes (notably Linux)
 	FINAL_LDFLAGS+= -rdynamic
 	FINAL_LIBS+=-ldl -pthread -lrt
+endif
 endif
 endif
 endif
+endif
 # Include paths to dependencies
 FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
 

Lines 1-11 Link Here

(-)databases/redis/files/patch-src-config.h (-11 lines)
1	--- src/config.h.orig 2015-04-07 21:24:36.634829000 +0300
2	+++ src/config.h 2015-04-07 21:24:53.388849000 +0300
3	@@ -62,7 +62,7 @@
4	#endif
5
6	/* Test for backtrace() */
7	-#if defined(__APPLE__) \|\| (defined(__linux__) && defined(__GLIBC__))
8	+#if defined(__APPLE__) \|\| (defined(__linux__) && defined(__GLIBC__)) \|\| defined(__FreeBSD__)
9	#define HAVE_BACKTRACE 1
10	#endif
11

Lines 1-5 Link Here

(-)databases/redis/files/patch-src-lua_cjson.c (-2 / +2 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500	1	--- deps/lua/src/lua_cjson.c.orig 2019-09-25 10:40:18 UTC
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500	2	+++ deps/lua/src/lua_cjson.c
3	@@ -46,7 +46,9 @@	3	@@ -46,7 +46,9 @@
4	#include "strbuf.h"	4	#include "strbuf.h"
5	#include "fpconv.h"	5	#include "fpconv.h"

Lines 1-5 Link Here

(-)databases/redis/files/patch-src-mkreleasehdr.sh (-4 / +4 lines)
1	--- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400	1	--- src/mkreleasehdr.sh.orig 2019-09-25 10:40:18 UTC
2	+++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400	2	+++ src/mkreleasehdr.sh
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#!/bin/sh	4	#!/bin/sh
5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`	5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`
Lines 7-11 Link Here
7	+GIT_SHA1="00000000"	7	+GIT_SHA1="00000000"
8	+GIT_DIRTY="0"	8	+GIT_DIRTY="0"
9	BUILD_ID=`uname -n`"-"`date +%s`	9	BUILD_ID=`uname -n`"-"`date +%s`
10	test -f release.h \|\| touch release.h	10	if [ -n "$SOURCE_DATE_EPOCH" ]; then
11	(cat release.h \| grep SHA1 \| grep $GIT_SHA1) && \	11	BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null \|\| date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null \|\| date -u %s)

Lines 13-18 Link Here

(-)databases/redis-devel/Makefile (-2 / +4 lines)
13		13
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15		15
		16	DEPRECATED= Use databases/redis instead
		17
16	OPTIONS_DEFINE= JEMALLOC TESTS TRIB	18	OPTIONS_DEFINE= JEMALLOC TESTS TRIB
17	OPTIONS_RADIO= EXTLUA	19	OPTIONS_RADIO= EXTLUA
18	OPTIONS_RADIO_EXTLUA= LUA LUAJIT	20	OPTIONS_RADIO_EXTLUA= LUA LUAJIT
Lines 65-71 Link Here
65		67
66	LDFLAGS+= -lpthread -lm -lexecinfo	68	LDFLAGS+= -lpthread -lm -lexecinfo
67		69
68	CONFLICTS?= redis-4.*	70	CONFLICTS?= redis4-4.* redis-5.*
69		71
70	USE_RC_SUBR= redis sentinel	72	USE_RC_SUBR= redis sentinel
71	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	73	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
Lines 122-125 Link Here
122	do-test:	124	do-test:
123	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl	125	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
124		126
125	.include <bsd.port.mk>	127	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)databases/redis-devel/files/patch-deps-Makefile (-4 / +4 lines)
1	--- deps/Makefile.orig 2016-02-02 19:38:43.438304000 -0500	1	--- deps/Makefile.orig 2019-05-15 16:07:37 UTC
2	+++ deps/Makefile 2016-02-02 19:40:05.911356000 -0500	2	+++ deps/Makefile
3	@@ -59,7 +59,7 @@	3	@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
4	LUA_CFLAGS= -D__C99FEATURES__=1	4	LUA_CFLAGS= -D__C99FEATURES__=1
5	endif	5	endif
6		6
Lines 9-15 Link Here
9	LUA_LDFLAGS+= $(LDFLAGS)	9	LUA_LDFLAGS+= $(LDFLAGS)
10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more	10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
11	# challenging to cross-compile lua (and redis). These defines make it easier	11	# challenging to cross-compile lua (and redis). These defines make it easier
12	@@ -69,7 +69,7 @@	12	@@ -68,7 +68,7 @@ ARFLAGS=rcu
13		13
14	lua: .make-prerequisites	14	lua: .make-prerequisites
15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)	15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)




--- deps/hiredis/Makefile.orig	2019-05-15 16:07:37 UTC
+++ deps/hiredis/Makefile
@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
 HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
 
 # Installation related variables and target

 INCLUDE_PATH?=include/hiredis
 LIBRARY_PATH?=lib
 PKGCONF_PATH?=pkgconfig
@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
 # Fallback to gcc when $CC is not in $PATH.
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')

 REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
 
 DYLIBSUFFIX=so
@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
   REAL_LDFLAGS+= -ldl -lnsl -lsocket
   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
   INSTALL= cp -r
+endif
+ifeq ($(uname_S),FreeBSD)
+  CFLAGS?=$(CFLAGS)
+  CCLINK?=-pthread

+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+  STLIBNAME?=libhiredis.a
+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
 endif
 ifeq ($(uname_S),Darwin)
   DYLIBSUFFIX=dylib
   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)




--- deps/hiredis/net.c.orig	2019-05-15 16:07:37 UTC
+++ deps/hiredis/net.c
@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
 
     val = interval;
 

     val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }

 #endif
 #endif
 
@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     struct sockaddr_un sa;
     long timeout_msec = -1;
 

         return REDIS_ERR;
     if (redisSetBlocking(c,0) != REDIS_OK)
         return REDIS_ERR;
@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
         return REDIS_ERR;
 

Lines 1-5 Link Here

(-)databases/redis-devel/files/patch-deps-linenoise-Makefile (-2 / +2 lines)
1	--- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300	1	--- deps/linenoise/Makefile.orig 2019-05-15 16:07:37 UTC
2	+++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300	2	+++ deps/linenoise/Makefile
3	@@ -1,10 +1,10 @@	3	@@ -1,10 +1,10 @@
4	STD=	4	STD=
5	WARN= -Wall	5	WARN= -Wall




--- redis.conf.orig	2019-05-15 16:07:37 UTC
+++ redis.conf
@@ -133,7 +133,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.

 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options:
@@ -155,7 +155,7 @@ supervised no
 #
 # Creating a pid file is best effort: if Redis is not able to create it
 # nothing bad happens, the server will start and run normally.

 
 # Specify the server verbosity level.
 # This can be one of:
@@ -168,7 +168,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null

 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -260,7 +260,7 @@ dbfilename dump.rdb
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.




--- src/Makefile.orig	2019-05-15 16:07:37 UTC
+++ src/Makefile
@@ -29,7 +29,7 @@ endif
 WARN=-Wall -W -Wno-missing-field-initializers
 OPT=$(OPTIMIZATION)
 
-PREFIX?=/usr/local

 INSTALL_BIN=$(PREFIX)/bin
 INSTALL=install
 
@@ -75,7 +75,6 @@ endif
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm

 
 ifeq ($(uname_S),SunOS)
 	# SunOS
@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
 	# Darwin
 	FINAL_LIBS+= -ldl
 else
+ifeq ($(uname_S),FreeBSD)
+        # FreeBSD

 ifeq ($(uname_S),AIX)
         # AIX
         FINAL_LDFLAGS+= -Wl,-bexpall
@@ -120,6 +124,7 @@ else
 	# All the other OSes (notably Linux)
 	FINAL_LDFLAGS+= -rdynamic
 	FINAL_LIBS+=-ldl -pthread -lrt
+endif
 endif
 endif
 endif
+endif
 # Include paths to dependencies
 FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
 

Lines 1-5 Link Here

(-)databases/redis-devel/files/patch-src-lua_cjson.c (-2 / +2 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500	1	--- deps/lua/src/lua_cjson.c.orig 2019-05-15 16:07:37 UTC
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500	2	+++ deps/lua/src/lua_cjson.c
3	@@ -46,7 +46,9 @@	3	@@ -46,7 +46,9 @@
4	#include "strbuf.h"	4	#include "strbuf.h"
5	#include "fpconv.h"	5	#include "fpconv.h"

Lines 1-5 Link Here

(-)databases/redis-devel/files/patch-src-mkreleasehdr.sh (-2 / +2 lines)
1	--- src/mkreleasehdr.sh.orig 2018-09-06 07:04:23.000000000 -0400	1	--- src/mkreleasehdr.sh.orig 2019-05-15 16:07:37 UTC
2	+++ src/mkreleasehdr.sh 2018-09-07 18:05:03.013274000 -0400	2	+++ src/mkreleasehdr.sh
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#!/bin/sh	4	#!/bin/sh
5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`	5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`

Lines 6-11 Link Here

(-)databases/redis4/Makefile (-3 / +5 lines)
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://download.redis.io/releases/	8	MASTER_SITES= http://download.redis.io/releases/
		9	PKGNAMESUFFIX= 4
9		10
10	MAINTAINER= osa@FreeBSD.org	11	MAINTAINER= osa@FreeBSD.org
11	COMMENT= Persistent key-value database with built-in net interface	12	COMMENT= Persistent key-value database with built-in net interface
Lines 21-26 Link Here
21	TESTS_DESC= Install lang/tcl for redis unit tests	22	TESTS_DESC= Install lang/tcl for redis unit tests
22	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)	23	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
23		24
		25	USES+= gmake
		26	MAKE_ENV= "V=yo"
		27
24	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>
25		29
26	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}	30	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
Lines 56-65 Link Here
56		60
57	LDFLAGS+= -lpthread -lm -lexecinfo	61	LDFLAGS+= -lpthread -lm -lexecinfo
58		62
59	CONFLICTS?= redis-devel-5.*	63	CONFLICTS?= redis-5.* redis-devel-5.*
60		64
61	USES+= gmake
62	MAKE_ENV= "V=yo"
63	USE_RC_SUBR= redis sentinel	65	USE_RC_SUBR= redis sentinel
64	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	66	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
65	redis-cli redis-sentinel redis-server	67	redis-cli redis-sentinel redis-server

Lines 1-6 Link Here

(-)databases/redis4/files/patch-deps-Makefile (-4 / +4 lines)
1	--- deps/Makefile.orig 2016-02-02 19:38:43.438304000 -0500	1	--- deps/Makefile.orig 2019-03-18 16:23:22 UTC
2	+++ deps/Makefile 2016-02-02 19:40:05.911356000 -0500	2	+++ deps/Makefile
3	@@ -59,7 +59,7 @@	3	@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
4	LUA_CFLAGS= -D__C99FEATURES__=1	4	LUA_CFLAGS= -D__C99FEATURES__=1
5	endif	5	endif
6		6
Lines 9-15 Link Here
9	LUA_LDFLAGS+= $(LDFLAGS)	9	LUA_LDFLAGS+= $(LDFLAGS)
10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more	10	# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
11	# challenging to cross-compile lua (and redis). These defines make it easier	11	# challenging to cross-compile lua (and redis). These defines make it easier
12	@@ -69,7 +69,7 @@	12	@@ -68,7 +68,7 @@ ARFLAGS=rcu
13		13
14	lua: .make-prerequisites	14	lua: .make-prerequisites
15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)	15	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)




--- deps/hiredis/Makefile.orig	2019-03-18 16:23:22 UTC
+++ deps/hiredis/Makefile
@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
 HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
 
 # Installation related variables and target

 INCLUDE_PATH?=include/hiredis
 LIBRARY_PATH?=lib
 PKGCONF_PATH?=pkgconfig
@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
 # Fallback to gcc when $CC is not in $PATH.
 CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')

 REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
 
 DYLIBSUFFIX=so
@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
   REAL_LDFLAGS+= -ldl -lnsl -lsocket
   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
   INSTALL= cp -r
+endif
+ifeq ($(uname_S),FreeBSD)
+  CFLAGS?=$(CFLAGS)
+  CCLINK?=-pthread

+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+  STLIBNAME?=libhiredis.a
+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
 endif
 ifeq ($(uname_S),Darwin)
   DYLIBSUFFIX=dylib
   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)




--- deps/hiredis/net.c.orig	2019-03-18 16:23:22 UTC
+++ deps/hiredis/net.c
@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
 
     val = interval;
 

     val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }

 #endif
 #endif
 
@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     struct sockaddr_un sa;
     long timeout_msec = -1;
 

         return REDIS_ERR;
     if (redisSetBlocking(c,0) != REDIS_OK)
         return REDIS_ERR;
@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
         return REDIS_ERR;
 

Lines 1-5 Link Here

(-)databases/redis4/files/patch-deps-linenoise-Makefile (-2 / +2 lines)
1	--- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300	1	--- deps/linenoise/Makefile.orig 2019-03-18 16:23:22 UTC
2	+++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300	2	+++ deps/linenoise/Makefile
3	@@ -1,10 +1,10 @@	3	@@ -1,10 +1,10 @@
4	STD=	4	STD=
5	WARN= -Wall	5	WARN= -Wall




--- redis.conf.orig	2019-03-18 16:23:22 UTC
+++ redis.conf
@@ -133,7 +133,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.

 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options:
@@ -155,7 +155,7 @@ supervised no
 #
 # Creating a pid file is best effort: if Redis is not able to create it
 # nothing bad happens, the server will start and run normally.

 
 # Specify the server verbosity level.
 # This can be one of:
@@ -168,7 +168,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null

 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -260,7 +260,7 @@ dbfilename dump.rdb
 # The Append Only File will also be created inside this directory.
 #
 # Note that you must specify a directory here, not a file name.




--- src/Makefile.orig	2019-03-18 16:23:22 UTC
+++ src/Makefile
@@ -24,7 +24,7 @@ STD=-std=c99 -pedantic -DREDIS_STATIC=''
 WARN=-Wall -W -Wno-missing-field-initializers
 OPT=$(OPTIMIZATION)
 
-PREFIX?=/usr/local

 INSTALL_BIN=$(PREFIX)/bin
 INSTALL=install
 
@@ -66,7 +66,6 @@ endif
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm

 
 ifeq ($(uname_S),SunOS)
 	# SunOS
@@ -85,6 +84,11 @@ ifeq ($(uname_S),Darwin)
 	# Darwin
 	FINAL_LIBS+= -ldl
 else
+ifeq ($(uname_S),FreeBSD)
+        # FreeBSD

 ifeq ($(uname_S),AIX)
         # AIX
         FINAL_LDFLAGS+= -Wl,-bexpall
@@ -101,6 +105,7 @@ else
 	# All the other OSes (notably Linux)
 	FINAL_LDFLAGS+= -rdynamic
 	FINAL_LIBS+=-ldl -pthread
+endif
 endif
 endif
 endif
+endif
 # Include paths to dependencies
 FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
 

Lines 1-5 Link Here

(-)databases/redis4/files/patch-src-config.h (-2 / +2 lines)
1	--- src/config.h.orig 2015-04-07 21:24:36.634829000 +0300	1	--- src/config.h.orig 2019-03-18 16:23:22 UTC
2	+++ src/config.h 2015-04-07 21:24:53.388849000 +0300	2	+++ src/config.h
3	@@ -62,7 +62,7 @@	3	@@ -62,7 +62,7 @@
4	#endif	4	#endif
5		5

Lines 1-5 Link Here

(-)databases/redis4/files/patch-src-lua_cjson.c (-2 / +2 lines)
1	--- deps/lua/src/lua_cjson.c.orig 2016-12-04 20:49:41.925218000 -0500	1	--- deps/lua/src/lua_cjson.c.orig 2019-03-18 16:23:22 UTC
2	+++ deps/lua/src/lua_cjson.c 2016-12-04 20:49:59.728885000 -0500	2	+++ deps/lua/src/lua_cjson.c
3	@@ -46,7 +46,9 @@	3	@@ -46,7 +46,9 @@
4	#include "strbuf.h"	4	#include "strbuf.h"
5	#include "fpconv.h"	5	#include "fpconv.h"

Lines 1-5 Link Here

(-)databases/redis4/files/patch-src-mkreleasehdr.sh (-2 / +2 lines)
1	--- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400	1	--- src/mkreleasehdr.sh.orig 2019-03-18 16:23:22 UTC
2	+++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400	2	+++ src/mkreleasehdr.sh
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#!/bin/sh	4	#!/bin/sh
5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`	5	-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null \|\| echo 00000000) \| head -n1`

Return to bug 241526

Lines 5-10 Link Here

(-)UPDATING (+11 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20191028:
		9	AFFETS: users of databases/redis
		10	AUTHOR: osa@FreeBSD.org
		11
		12	databases/redis is updated to 5.0. Before updating you should read
		13	'Migrating from 4.0 to 5.0' section of following release note.
		14
		15	https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES
		16
		17	If you would like to stay 4.0 then switch to databases/redis4.
		18
8	20191026:	19	20191026:
9	AFFECTS: users of www/qt5-webengine	20	AFFECTS: users of www/qt5-webengine
10	AUTHOR: kai@FreeBSD.org	21	AUTHOR: kai@FreeBSD.org

Lines 2-9 Link Here

(-)databases/redis/Makefile (-8 / +21 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	DISTVERSION= 4.0.14	5	DISTVERSION= 5.0.6
6	PORTREVISION= 1
7	CATEGORIES= databases	6	CATEGORIES= databases
8	MASTER_SITES= http://download.redis.io/releases/	7	MASTER_SITES= http://download.redis.io/releases/
9		8
Lines 12-26 Link Here
12		11
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14		13
15	OPTIONS_DEFINE= TESTS TRIB	14	OPTIONS_DEFINE= JEMALLOC TESTS TRIB
16	OPTIONS_RADIO= EXTLUA	15	OPTIONS_RADIO= EXTLUA
17	OPTIONS_RADIO_EXTLUA= LUA LUAJIT	16	OPTIONS_RADIO_EXTLUA= LUA LUAJIT
18	OPTIONS_SUB= yes	17	OPTIONS_SUB= yes
		18	JEMALLOC_DESC= Use jemalloc
19	LUA_DESC= Use lang/lua instead of builtin lua	19	LUA_DESC= Use lang/lua instead of builtin lua
20	LUAJIT_DESC= Use lang/luajit instead of builtin lua	20	LUAJIT_DESC= Use lang/luajit instead of builtin lua
21	TESTS_DESC= Install lang/tcl for redis unit tests	21	TESTS_DESC= Install lang/tcl for redis unit tests
22	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)	22	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
23		23
		24	USES+= compiler gmake
		25	MAKE_ENV= "V=yo"
		26
24	.include <bsd.port.options.mk>	27	.include <bsd.port.options.mk>
25		28
26	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}	29	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
Lines 29-34 Link Here
29	CFLAGS+= -march=i586	32	CFLAGS+= -march=i586
30	.endif	33	.endif
31		34
		35	.if ${PORT_OPTIONS:MJEMALLOC}
		36	MAKE_ENV+= "USE_JEMALLOC=yes"
		37	.endif
		38
32	.if ${PORT_OPTIONS:MTRIB}	39	.if ${PORT_OPTIONS:MTRIB}
33	CATEGORIES+= ruby	40	CATEGORIES+= ruby
34	USE_RUBY= yes	41	USE_RUBY= yes
Lines 56-65 Link Here
56		63
57	LDFLAGS+= -lpthread -lm -lexecinfo	64	LDFLAGS+= -lpthread -lm -lexecinfo
58		65
59	CONFLICTS?= redis-devel-5.*	66	CONFLICTS?= redis4-4.* redis-devel-5.*
60		67
61	USES+= gmake
62	MAKE_ENV= "V=yo"
63	USE_RC_SUBR= redis sentinel	68	USE_RC_SUBR= redis sentinel
64	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	69	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
65	redis-cli redis-sentinel redis-server	70	redis-cli redis-sentinel redis-server
Lines 84-93 Link Here
84	REDIS_DBDIR=${REDIS_DBDIR} \	89	REDIS_DBDIR=${REDIS_DBDIR} \
85	REDIS_RUNDIR=${REDIS_RUNDIR}	90	REDIS_RUNDIR=${REDIS_RUNDIR}
86		91
		92	.include <bsd.port.pre.mk>
		93
		94	post-patch:
		95	.if ${PORT_OPTIONS:MJEMALLOC}
		96	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
		97	.endif
87	.if ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUA}	98	.if ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUA}
88	post-patch:
89	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/	99	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
90	.endif	100	.endif
		101	.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
		102	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c
		103	.endif
91		104
92	post-build:	105	post-build:
93	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	106	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
Lines 107-110 Link Here
107	do-test:	120	do-test:
108	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl	121	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
109		122
110	.include <bsd.port.mk>	123	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)databases/redis/files/extra-patch-src-Makefile.lua (-5 / +5 lines)
1	--- src/Makefile.orig 2017-08-06 10:42:53.992510000 -0400	1	--- src/Makefile.orig 2018-10-18 18:09:43.930566000 -0400
2	+++ src/Makefile 2017-08-06 10:44:57.344366000 -0400	2	+++ src/Makefile 2018-10-18 18:10:32.562125000 -0400
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@
4	uname_S := $(shell sh -c 'uname -s 2>/dev/null \|\| echo not')	4	uname_S := $(shell sh -c 'uname -s 2>/dev/null \|\| echo not')
5	uname_M := $(shell sh -c 'uname -m 2>/dev/null \|\| echo not')	5	uname_M := $(shell sh -c 'uname -m 2>/dev/null \|\| echo not')
Lines 30-36 Link Here
30	ifeq ($(MALLOC),tcmalloc)	30	ifeq ($(MALLOC),tcmalloc)
31	FINAL_CFLAGS+= -DUSE_TCMALLOC	31	FINAL_CFLAGS+= -DUSE_TCMALLOC
32	@@ -130,6 +130,9 @@	32	@@ -130,6 +130,9 @@
33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a	33	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
34	endif	34	endif
35		35
36	+FINAL_CFLAGS+=-I${PREFIX}/include/lua51	36	+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
Lines 42-51 Link Here
42	@@ -150,6 +153,7 @@	42	@@ -150,6 +153,7 @@
43	REDIS_SERVER_NAME=redis-server	43	REDIS_SERVER_NAME=redis-server
44	REDIS_SENTINEL_NAME=redis-sentinel	44	REDIS_SENTINEL_NAME=redis-sentinel
45	REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o	45	REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
46	+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o	46	+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
47	REDIS_CLI_NAME=redis-cli	47	REDIS_CLI_NAME=redis-cli
48	REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o	48	REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
49	REDIS_BENCHMARK_NAME=redis-benchmark	49	REDIS_BENCHMARK_NAME=redis-benchmark
50	@@ -201,7 +205,7 @@	50	@@ -201,7 +205,7 @@
51		51

Lines 1-5 Link Here

(-)databases/redis/files/extra-patch-src-Makefile.luajit (-5 / +5 lines)
1	--- src/Makefile.orig 2017-08-06 10:48:29.559222000 -0400	1	--- src/Makefile.orig 2018-10-18 18:11:24.649811000 -0400
2	+++ src/Makefile 2017-08-06 10:50:45.155432000 -0400	2	+++ src/Makefile 2018-10-18 18:11:35.160523000 -0400
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@
4	uname_S := $(shell sh -c 'uname -s 2>/dev/null \|\| echo not')	4	uname_S := $(shell sh -c 'uname -s 2>/dev/null \|\| echo not')
5	uname_M := $(shell sh -c 'uname -m 2>/dev/null \|\| echo not')	5	uname_M := $(shell sh -c 'uname -m 2>/dev/null \|\| echo not')
Lines 30-36 Link Here
30	ifeq ($(MALLOC),tcmalloc)	30	ifeq ($(MALLOC),tcmalloc)
31	FINAL_CFLAGS+= -DUSE_TCMALLOC	31	FINAL_CFLAGS+= -DUSE_TCMALLOC
32	@@ -130,6 +130,9 @@	32	@@ -130,6 +130,9 @@
33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a	33	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
34	endif	34	endif
35		35
36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0	36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
Lines 42-51 Link Here
42	@@ -150,6 +153,7 @@	42	@@ -150,6 +153,7 @@
43	REDIS_SERVER_NAME=redis-server	43	REDIS_SERVER_NAME=redis-server
44	REDIS_SENTINEL_NAME=redis-sentinel	44	REDIS_SENTINEL_NAME=redis-sentinel
45	REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o	45	REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
46	+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o	46	+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
47	REDIS_CLI_NAME=redis-cli	47	REDIS_CLI_NAME=redis-cli
48	REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o	48	REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
49	REDIS_BENCHMARK_NAME=redis-benchmark	49	REDIS_BENCHMARK_NAME=redis-benchmark
50	@@ -201,7 +205,7 @@	50	@@ -201,7 +205,7 @@
51		51

Lines 1-6 Link Here

(-)databases/redis/files/patch-deps-hiredis-Makefile (-8 / +8 lines)
1	--- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400	1	--- deps/hiredis/Makefile.orig 2019-09-25 10:40:18 UTC
2	+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400	2	+++ deps/hiredis/Makefile
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h \| a
4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')	4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')
5		5
6	# Installation related variables and target	6	# Installation related variables and target
Lines 9-15 Link Here
9	INCLUDE_PATH?=include/hiredis	9	INCLUDE_PATH?=include/hiredis
10	LIBRARY_PATH?=lib	10	LIBRARY_PATH?=lib
11	PKGCONF_PATH?=pkgconfig	11	PKGCONF_PATH?=pkgconfig
12	@@ -38,10 +38,10 @@	12	@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
13	# Fallback to gcc when $CC is not in $PATH.	13	# Fallback to gcc when $CC is not in $PATH.
14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')	14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')
15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')	15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')
Lines 23-32 Link Here
23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)	23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
24		24
25	DYLIBSUFFIX=so	25	DYLIBSUFFIX=so
26	@@ -60,6 +60,15 @@	26	@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
		27	REAL_LDFLAGS+= -ldl -lnsl -lsocket
27	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)	28	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
28	INSTALL= cp -r	29	INSTALL= cp -r
29	endif	30	+endif
30	+ifeq ($(uname_S),FreeBSD)	31	+ifeq ($(uname_S),FreeBSD)
31	+ CFLAGS?=$(CFLAGS)	32	+ CFLAGS?=$(CFLAGS)
32	+ CCLINK?=-pthread	33	+ CCLINK?=-pthread
Lines 35-41 Link Here
35	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}	36	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
36	+ STLIBNAME?=libhiredis.a	37	+ STLIBNAME?=libhiredis.a
37	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}	38	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
38	+endif	39	endif
39	ifeq ($(uname_S),Darwin)	40	ifeq ($(uname_S),Darwin)
40	DYLIBSUFFIX=dylib	41	DYLIBSUFFIX=dylib
41	DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)

Lines 1-6 Link Here

(-)databases/redis/files/patch-deps-hiredis-net.c (-6 / +6 lines)
1	--- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400	1	--- deps/hiredis/net.c.orig 2019-09-25 10:40:18 UTC
2	+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400	2	+++ deps/hiredis/net.c
3	@@ -135,13 +135,12 @@	3	@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
4		4
5	val = interval;	5	val = interval;
6		6
Lines 16-22 Link Here
16	val = interval;	16	val = interval;
17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {	17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
19	@@ -160,6 +159,27 @@	19	@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
21	return REDIS_ERR;	21	return REDIS_ERR;
22	}	22	}
Lines 44-50 Link Here
44	#endif	44	#endif
45	#endif	45	#endif
46		46
47	@@ -431,7 +451,7 @@	47	@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
48	struct sockaddr_un sa;	48	struct sockaddr_un sa;
49	long timeout_msec = -1;	49	long timeout_msec = -1;
50		50
Lines 53-59 Link Here
53	return REDIS_ERR;	53	return REDIS_ERR;
54	if (redisSetBlocking(c,0) != REDIS_OK)	54	if (redisSetBlocking(c,0) != REDIS_OK)
55	return REDIS_ERR;	55	return REDIS_ERR;
56	@@ -456,7 +476,7 @@	56	@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)	57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
58	return REDIS_ERR;	58	return REDIS_ERR;
59		59

Lines 1-6 Link Here

(-)databases/redis/files/patch-redis.conf (-6 / +6 lines)
1	--- redis.conf.orig 2016-06-17 09:15:21.000000000 -0400	1	--- redis.conf.orig 2019-09-25 10:40:18 UTC
2	+++ redis.conf 2016-06-18 11:58:19.871082000 -0400	2	+++ redis.conf
3	@@ -125,7 +125,7 @@	3	@@ -133,7 +133,7 @@ tcp-keepalive 300
4		4
5	# By default Redis does not run as a daemon. Use 'yes' if you need it.	5	# By default Redis does not run as a daemon. Use 'yes' if you need it.
6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.	6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
Lines 9-15 Link Here
9		9
10	# If you run Redis from upstart or systemd, Redis can interact with your	10	# If you run Redis from upstart or systemd, Redis can interact with your
11	# supervision tree. Options:	11	# supervision tree. Options:
12	@@ -147,7 +147,7 @@	12	@@ -155,7 +155,7 @@ supervised no
13	#	13	#
14	# Creating a pid file is best effort: if Redis is not able to create it	14	# Creating a pid file is best effort: if Redis is not able to create it
15	# nothing bad happens, the server will start and run normally.	15	# nothing bad happens, the server will start and run normally.
Lines 18-24 Link Here
18		18
19	# Specify the server verbosity level.	19	# Specify the server verbosity level.
20	# This can be one of:	20	# This can be one of:
21	@@ -160,7 +160,7 @@	21	@@ -168,7 +168,7 @@ loglevel notice
22	# Specify the log file name. Also the empty string can be used to force	22	# Specify the log file name. Also the empty string can be used to force
23	# Redis to log on the standard output. Note that if you use standard	23	# Redis to log on the standard output. Note that if you use standard
24	# output for logging but daemonize, logs will be sent to /dev/null	24	# output for logging but daemonize, logs will be sent to /dev/null
Lines 27-33 Link Here
27		27
28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,	28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,
29	# and optionally update the other syslog parameters to suit your needs.	29	# and optionally update the other syslog parameters to suit your needs.
30	@@ -244,7 +244,7 @@	30	@@ -260,7 +260,7 @@ dbfilename dump.rdb
31	# The Append Only File will also be created inside this directory.	31	# The Append Only File will also be created inside this directory.
32	#	32	#
33	# Note that you must specify a directory here, not a file name.	33	# Note that you must specify a directory here, not a file name.

Lines 1-7 Link Here

(-)databases/redis/files/patch-src-Makefile (-13 / +13 lines)
1	--- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300	1	--- src/Makefile.orig 2019-09-25 10:40:18 UTC
2	+++ src/Makefile 2015-04-07 21:30:22.464962000 +0300	2	+++ src/Makefile
3	@@ -22,7 +22,7 @@	3	@@ -29,7 +29,7 @@ endif
4	WARN=-Wall -W	4	WARN=-Wall -W -Wno-missing-field-initializers
5	OPT=$(OPTIMIZATION)	5	OPT=$(OPTIMIZATION)
6		6
7	-PREFIX?=/usr/local	7	-PREFIX?=/usr/local
Lines 9-15 Link Here
9	INSTALL_BIN=$(PREFIX)/bin	9	INSTALL_BIN=$(PREFIX)/bin
10	INSTALL=install	10	INSTALL=install
11		11
12	@@ -52,7 +52,6 @@	12	@@ -75,7 +75,6 @@ endif
13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)	13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)	14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
15	FINAL_LIBS=-lm	15	FINAL_LIBS=-lm
Lines 17-25 Link Here
17		17
18	ifeq ($(uname_S),SunOS)	18	ifeq ($(uname_S),SunOS)
19	# SunOS	19	# SunOS
20	@@ -63,6 +62,11 @@	20	@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
21	ifeq ($(uname_S),Darwin)	21	# Darwin
22	# Darwin (nothing to do)	22	FINAL_LIBS+= -ldl
23	else	23	else
24	+ifeq ($(uname_S),FreeBSD)	24	+ifeq ($(uname_S),FreeBSD)
25	+ # FreeBSD	25	+ # FreeBSD
Lines 29-39 Link Here
29	ifeq ($(uname_S),AIX)	29	ifeq ($(uname_S),AIX)
30	# AIX	30	# AIX
31	FINAL_LDFLAGS+= -Wl,-bexpall	31	FINAL_LDFLAGS+= -Wl,-bexpall
32	@@ -75,6 +79,7 @@	32	@@ -120,6 +124,7 @@ else
		33	# All the other OSes (notably Linux)
		34	FINAL_LDFLAGS+= -rdynamic
		35	FINAL_LIBS+=-ldl -pthread -lrt
		36	+endif
33	endif	37	endif
34	endif	38	endif
35	endif	39	endif
36	+endif
37	# Include paths to dependencies
38	FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
39

Lines 1-6 Link Here

(-)databases/redis-devel/files/patch-deps-hiredis-Makefile (-8 / +8 lines)
1	--- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400	1	--- deps/hiredis/Makefile.orig 2019-05-15 16:07:37 UTC
2	+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400	2	+++ deps/hiredis/Makefile
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h \| a
4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')	4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')
5		5
6	# Installation related variables and target	6	# Installation related variables and target
Lines 9-15 Link Here
9	INCLUDE_PATH?=include/hiredis	9	INCLUDE_PATH?=include/hiredis
10	LIBRARY_PATH?=lib	10	LIBRARY_PATH?=lib
11	PKGCONF_PATH?=pkgconfig	11	PKGCONF_PATH?=pkgconfig
12	@@ -38,10 +38,10 @@	12	@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
13	# Fallback to gcc when $CC is not in $PATH.	13	# Fallback to gcc when $CC is not in $PATH.
14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')	14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')
15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')	15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')
Lines 23-32 Link Here
23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)	23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
24		24
25	DYLIBSUFFIX=so	25	DYLIBSUFFIX=so
26	@@ -60,6 +60,15 @@	26	@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
		27	REAL_LDFLAGS+= -ldl -lnsl -lsocket
27	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)	28	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
28	INSTALL= cp -r	29	INSTALL= cp -r
29	endif	30	+endif
30	+ifeq ($(uname_S),FreeBSD)	31	+ifeq ($(uname_S),FreeBSD)
31	+ CFLAGS?=$(CFLAGS)	32	+ CFLAGS?=$(CFLAGS)
32	+ CCLINK?=-pthread	33	+ CCLINK?=-pthread
Lines 35-41 Link Here
35	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}	36	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
36	+ STLIBNAME?=libhiredis.a	37	+ STLIBNAME?=libhiredis.a
37	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}	38	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
38	+endif	39	endif
39	ifeq ($(uname_S),Darwin)	40	ifeq ($(uname_S),Darwin)
40	DYLIBSUFFIX=dylib	41	DYLIBSUFFIX=dylib
41	DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)

Lines 1-6 Link Here

(-)databases/redis-devel/files/patch-deps-hiredis-net.c (-6 / +6 lines)
1	--- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400	1	--- deps/hiredis/net.c.orig 2019-05-15 16:07:37 UTC
2	+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400	2	+++ deps/hiredis/net.c
3	@@ -135,13 +135,12 @@	3	@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
4		4
5	val = interval;	5	val = interval;
6		6
Lines 16-22 Link Here
16	val = interval;	16	val = interval;
17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {	17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
19	@@ -160,6 +159,27 @@	19	@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
21	return REDIS_ERR;	21	return REDIS_ERR;
22	}	22	}
Lines 44-50 Link Here
44	#endif	44	#endif
45	#endif	45	#endif
46		46
47	@@ -431,7 +451,7 @@	47	@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
48	struct sockaddr_un sa;	48	struct sockaddr_un sa;
49	long timeout_msec = -1;	49	long timeout_msec = -1;
50		50
Lines 53-59 Link Here
53	return REDIS_ERR;	53	return REDIS_ERR;
54	if (redisSetBlocking(c,0) != REDIS_OK)	54	if (redisSetBlocking(c,0) != REDIS_OK)
55	return REDIS_ERR;	55	return REDIS_ERR;
56	@@ -456,7 +476,7 @@	56	@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)	57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
58	return REDIS_ERR;	58	return REDIS_ERR;
59		59

Lines 1-6 Link Here

(-)databases/redis-devel/files/patch-redis.conf (-6 / +6 lines)
1	--- redis.conf.orig 2016-06-17 09:15:21.000000000 -0400	1	--- redis.conf.orig 2019-05-15 16:07:37 UTC
2	+++ redis.conf 2016-06-18 11:58:19.871082000 -0400	2	+++ redis.conf
3	@@ -125,7 +125,7 @@	3	@@ -133,7 +133,7 @@ tcp-keepalive 300
4		4
5	# By default Redis does not run as a daemon. Use 'yes' if you need it.	5	# By default Redis does not run as a daemon. Use 'yes' if you need it.
6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.	6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
Lines 9-15 Link Here
9		9
10	# If you run Redis from upstart or systemd, Redis can interact with your	10	# If you run Redis from upstart or systemd, Redis can interact with your
11	# supervision tree. Options:	11	# supervision tree. Options:
12	@@ -147,7 +147,7 @@	12	@@ -155,7 +155,7 @@ supervised no
13	#	13	#
14	# Creating a pid file is best effort: if Redis is not able to create it	14	# Creating a pid file is best effort: if Redis is not able to create it
15	# nothing bad happens, the server will start and run normally.	15	# nothing bad happens, the server will start and run normally.
Lines 18-24 Link Here
18		18
19	# Specify the server verbosity level.	19	# Specify the server verbosity level.
20	# This can be one of:	20	# This can be one of:
21	@@ -160,7 +160,7 @@	21	@@ -168,7 +168,7 @@ loglevel notice
22	# Specify the log file name. Also the empty string can be used to force	22	# Specify the log file name. Also the empty string can be used to force
23	# Redis to log on the standard output. Note that if you use standard	23	# Redis to log on the standard output. Note that if you use standard
24	# output for logging but daemonize, logs will be sent to /dev/null	24	# output for logging but daemonize, logs will be sent to /dev/null
Lines 27-33 Link Here
27		27
28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,	28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,
29	# and optionally update the other syslog parameters to suit your needs.	29	# and optionally update the other syslog parameters to suit your needs.
30	@@ -244,7 +244,7 @@	30	@@ -260,7 +260,7 @@ dbfilename dump.rdb
31	# The Append Only File will also be created inside this directory.	31	# The Append Only File will also be created inside this directory.
32	#	32	#
33	# Note that you must specify a directory here, not a file name.	33	# Note that you must specify a directory here, not a file name.

Lines 1-7 Link Here

(-)databases/redis-devel/files/patch-src-Makefile (-13 / +13 lines)
1	--- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300	1	--- src/Makefile.orig 2019-05-15 16:07:37 UTC
2	+++ src/Makefile 2015-04-07 21:30:22.464962000 +0300	2	+++ src/Makefile
3	@@ -22,7 +22,7 @@	3	@@ -29,7 +29,7 @@ endif
4	WARN=-Wall -W	4	WARN=-Wall -W -Wno-missing-field-initializers
5	OPT=$(OPTIMIZATION)	5	OPT=$(OPTIMIZATION)
6		6
7	-PREFIX?=/usr/local	7	-PREFIX?=/usr/local
Lines 9-15 Link Here
9	INSTALL_BIN=$(PREFIX)/bin	9	INSTALL_BIN=$(PREFIX)/bin
10	INSTALL=install	10	INSTALL=install
11		11
12	@@ -52,7 +52,6 @@	12	@@ -75,7 +75,6 @@ endif
13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)	13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)	14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
15	FINAL_LIBS=-lm	15	FINAL_LIBS=-lm
Lines 17-25 Link Here
17		17
18	ifeq ($(uname_S),SunOS)	18	ifeq ($(uname_S),SunOS)
19	# SunOS	19	# SunOS
20	@@ -63,6 +62,11 @@	20	@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
21	ifeq ($(uname_S),Darwin)	21	# Darwin
22	# Darwin (nothing to do)	22	FINAL_LIBS+= -ldl
23	else	23	else
24	+ifeq ($(uname_S),FreeBSD)	24	+ifeq ($(uname_S),FreeBSD)
25	+ # FreeBSD	25	+ # FreeBSD
Lines 29-39 Link Here
29	ifeq ($(uname_S),AIX)	29	ifeq ($(uname_S),AIX)
30	# AIX	30	# AIX
31	FINAL_LDFLAGS+= -Wl,-bexpall	31	FINAL_LDFLAGS+= -Wl,-bexpall
32	@@ -75,6 +79,7 @@	32	@@ -120,6 +124,7 @@ else
		33	# All the other OSes (notably Linux)
		34	FINAL_LDFLAGS+= -rdynamic
		35	FINAL_LIBS+=-ldl -pthread -lrt
		36	+endif
33	endif	37	endif
34	endif	38	endif
35	endif	39	endif
36	+endif
37	# Include paths to dependencies
38	FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
39

Lines 1-6 Link Here

(-)databases/redis4/files/patch-deps-hiredis-Makefile (-8 / +8 lines)
1	--- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400	1	--- deps/hiredis/Makefile.orig 2019-03-18 16:23:22 UTC
2	+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400	2	+++ deps/hiredis/Makefile
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h \| a
4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')	4	HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h \| awk '{print $$3}')
5		5
6	# Installation related variables and target	6	# Installation related variables and target
Lines 9-15 Link Here
9	INCLUDE_PATH?=include/hiredis	9	INCLUDE_PATH?=include/hiredis
10	LIBRARY_PATH?=lib	10	LIBRARY_PATH?=lib
11	PKGCONF_PATH?=pkgconfig	11	PKGCONF_PATH?=pkgconfig
12	@@ -38,10 +38,10 @@	12	@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
13	# Fallback to gcc when $CC is not in $PATH.	13	# Fallback to gcc when $CC is not in $PATH.
14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')	14	CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) \|\| echo gcc')
15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')	15	CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) \|\| echo g++')
Lines 23-32 Link Here
23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)	23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
24		24
25	DYLIBSUFFIX=so	25	DYLIBSUFFIX=so
26	@@ -60,6 +60,15 @@	26	@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
		27	REAL_LDFLAGS+= -ldl -lnsl -lsocket
27	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)	28	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
28	INSTALL= cp -r	29	INSTALL= cp -r
29	endif	30	+endif
30	+ifeq ($(uname_S),FreeBSD)	31	+ifeq ($(uname_S),FreeBSD)
31	+ CFLAGS?=$(CFLAGS)	32	+ CFLAGS?=$(CFLAGS)
32	+ CCLINK?=-pthread	33	+ CCLINK?=-pthread
Lines 35-41 Link Here
35	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}	36	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
36	+ STLIBNAME?=libhiredis.a	37	+ STLIBNAME?=libhiredis.a
37	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}	38	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
38	+endif	39	endif
39	ifeq ($(uname_S),Darwin)	40	ifeq ($(uname_S),Darwin)
40	DYLIBSUFFIX=dylib	41	DYLIBSUFFIX=dylib
41	DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)

Lines 1-6 Link Here

(-)databases/redis4/files/patch-deps-hiredis-net.c (-6 / +6 lines)
1	--- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400	1	--- deps/hiredis/net.c.orig 2019-03-18 16:23:22 UTC
2	+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400	2	+++ deps/hiredis/net.c
3	@@ -135,13 +135,12 @@	3	@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
4		4
5	val = interval;	5	val = interval;
6		6
Lines 16-22 Link Here
16	val = interval;	16	val = interval;
17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {	17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
19	@@ -160,6 +159,27 @@	19	@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
21	return REDIS_ERR;	21	return REDIS_ERR;
22	}	22	}
Lines 44-50 Link Here
44	#endif	44	#endif
45	#endif	45	#endif
46		46
47	@@ -431,7 +451,7 @@	47	@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
48	struct sockaddr_un sa;	48	struct sockaddr_un sa;
49	long timeout_msec = -1;	49	long timeout_msec = -1;
50		50
Lines 53-59 Link Here
53	return REDIS_ERR;	53	return REDIS_ERR;
54	if (redisSetBlocking(c,0) != REDIS_OK)	54	if (redisSetBlocking(c,0) != REDIS_OK)
55	return REDIS_ERR;	55	return REDIS_ERR;
56	@@ -456,7 +476,7 @@	56	@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)	57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
58	return REDIS_ERR;	58	return REDIS_ERR;
59		59

Lines 1-6 Link Here

(-)databases/redis4/files/patch-redis.conf (-6 / +6 lines)
1	--- redis.conf.orig 2016-06-17 09:15:21.000000000 -0400	1	--- redis.conf.orig 2019-03-18 16:23:22 UTC
2	+++ redis.conf 2016-06-18 11:58:19.871082000 -0400	2	+++ redis.conf
3	@@ -125,7 +125,7 @@	3	@@ -133,7 +133,7 @@ tcp-keepalive 300
4		4
5	# By default Redis does not run as a daemon. Use 'yes' if you need it.	5	# By default Redis does not run as a daemon. Use 'yes' if you need it.
6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.	6	# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
Lines 9-15 Link Here
9		9
10	# If you run Redis from upstart or systemd, Redis can interact with your	10	# If you run Redis from upstart or systemd, Redis can interact with your
11	# supervision tree. Options:	11	# supervision tree. Options:
12	@@ -147,7 +147,7 @@	12	@@ -155,7 +155,7 @@ supervised no
13	#	13	#
14	# Creating a pid file is best effort: if Redis is not able to create it	14	# Creating a pid file is best effort: if Redis is not able to create it
15	# nothing bad happens, the server will start and run normally.	15	# nothing bad happens, the server will start and run normally.
Lines 18-24 Link Here
18		18
19	# Specify the server verbosity level.	19	# Specify the server verbosity level.
20	# This can be one of:	20	# This can be one of:
21	@@ -160,7 +160,7 @@	21	@@ -168,7 +168,7 @@ loglevel notice
22	# Specify the log file name. Also the empty string can be used to force	22	# Specify the log file name. Also the empty string can be used to force
23	# Redis to log on the standard output. Note that if you use standard	23	# Redis to log on the standard output. Note that if you use standard
24	# output for logging but daemonize, logs will be sent to /dev/null	24	# output for logging but daemonize, logs will be sent to /dev/null
Lines 27-33 Link Here
27		27
28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,	28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,
29	# and optionally update the other syslog parameters to suit your needs.	29	# and optionally update the other syslog parameters to suit your needs.
30	@@ -244,7 +244,7 @@	30	@@ -260,7 +260,7 @@ dbfilename dump.rdb
31	# The Append Only File will also be created inside this directory.	31	# The Append Only File will also be created inside this directory.
32	#	32	#
33	# Note that you must specify a directory here, not a file name.	33	# Note that you must specify a directory here, not a file name.

Lines 1-7 Link Here

(-)databases/redis4/files/patch-src-Makefile (-13 / +13 lines)
1	--- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300	1	--- src/Makefile.orig 2019-03-18 16:23:22 UTC
2	+++ src/Makefile 2015-04-07 21:30:22.464962000 +0300	2	+++ src/Makefile
3	@@ -22,7 +22,7 @@	3	@@ -24,7 +24,7 @@ STD=-std=c99 -pedantic -DREDIS_STATIC=''
4	WARN=-Wall -W	4	WARN=-Wall -W -Wno-missing-field-initializers
5	OPT=$(OPTIMIZATION)	5	OPT=$(OPTIMIZATION)
6		6
7	-PREFIX?=/usr/local	7	-PREFIX?=/usr/local
Lines 9-15 Link Here
9	INSTALL_BIN=$(PREFIX)/bin	9	INSTALL_BIN=$(PREFIX)/bin
10	INSTALL=install	10	INSTALL=install
11		11
12	@@ -52,7 +52,6 @@	12	@@ -66,7 +66,6 @@ endif
13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)	13	FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)	14	FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
15	FINAL_LIBS=-lm	15	FINAL_LIBS=-lm
Lines 17-25 Link Here
17		17
18	ifeq ($(uname_S),SunOS)	18	ifeq ($(uname_S),SunOS)
19	# SunOS	19	# SunOS
20	@@ -63,6 +62,11 @@	20	@@ -85,6 +84,11 @@ ifeq ($(uname_S),Darwin)
21	ifeq ($(uname_S),Darwin)	21	# Darwin
22	# Darwin (nothing to do)	22	FINAL_LIBS+= -ldl
23	else	23	else
24	+ifeq ($(uname_S),FreeBSD)	24	+ifeq ($(uname_S),FreeBSD)
25	+ # FreeBSD	25	+ # FreeBSD
Lines 29-39 Link Here
29	ifeq ($(uname_S),AIX)	29	ifeq ($(uname_S),AIX)
30	# AIX	30	# AIX
31	FINAL_LDFLAGS+= -Wl,-bexpall	31	FINAL_LDFLAGS+= -Wl,-bexpall
32	@@ -75,6 +79,7 @@	32	@@ -101,6 +105,7 @@ else
		33	# All the other OSes (notably Linux)
		34	FINAL_LDFLAGS+= -rdynamic
		35	FINAL_LIBS+=-ldl -pthread
		36	+endif
33	endif	37	endif
34	endif	38	endif
35	endif	39	endif
36	+endif
37	# Include paths to dependencies
38	FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
39