Attachment #217698 for bug #246770




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

20200901:
  AFFECTS: users of databases/redis
  AUTHOR: osa@FreeBSD.org

  The databases/redis port has been updated to the new stable release 6.0.
  Users wanting to stay on 5.0 can replace databases/redis with
  databases/redis5 with one of the following commands:

  # pkg install databases/redis5
    or
  # portmaster -o databases/redis5 databases/redis
    or
  # portupgrade -o databases/redis5 databases/redis

20200811:
  AFFECTS: users of *-emacs26-* packages
  AUTHOR: jrm@FreeBSD.org

Lines 840-845 Link Here

(-)databases/Makefile (+1 lines)
840	SUBDIR += redis	840	SUBDIR += redis
841	SUBDIR += redis-devel	841	SUBDIR += redis-devel
842	SUBDIR += redis4	842	SUBDIR += redis4
		843	SUBDIR += redis5
843	SUBDIR += redis_exporter	844	SUBDIR += redis_exporter
844	SUBDIR += redisdesktopmanager	845	SUBDIR += redisdesktopmanager
845	SUBDIR += retcl	846	SUBDIR += retcl




# $FreeBSD$

PORTNAME=	redis
PORTVERSION=	6.0.7
CATEGORIES=	databases
MASTER_SITES=	http://download.redis.io/releases/


LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES+=		compiler:c11 gmake

OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
OPTIONS_RADIO=	EXTLUA
OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
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
LUAJITOR_DESC=	Use lang/luajit-openresty instead of builtin lua
TLS_DESC=	Use TLS (openssl req.)
TESTS_DESC=	Install lang/tcl for redis unit tests
TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)

MAKE_ENV=	V=yo OPTIMIZATION=
MAKE_ENV=	"V=yo"

JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes

LUA_USES=		lua:51
LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
LUA_VARS=		_addflags=true
CFLAGS+=	-march=i586
.endif

LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
LUAJIT_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
LUAJIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
LUAJIT_VARS=		_addflags=true

LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
LUAJITOR_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
LUAJITOR_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
			${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
LUAJITOR_VARS=		_addflags=true

TESTS_USES=	tcl:build
USES+=		lua:51
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
.endif

TLS_USES=	ssl
TLS_MAKE_ENV=	BUILD_TLS=yes
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
.endif

TRIB_CATEGORIES=	ruby
TRIB_USE=		ruby=yes
TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
		${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
# Needed for __atomic_fetch_add_8
USE_GCC=	yes
CFLAGS+=	-march=i586
.endif

.if defined(_addflags)
CFLAGS=		-fPIC
LDFLAGS=	-Wl,-E
.endif

LDFLAGS+=	-lpthread -lm -lexecinfo

CONFLICTS?=	redis4 redis5 redes-devel

USE_RC_SUBR=	redis sentinel
BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \

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

post-patch-JEMALLOC-on:
	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile

post-patch-LUA-on:
.if ${PORT_OPTIONS:MJEMALLOC}
	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
.endif
.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
post-patch-LUAJIT-on:	post-patch-LUA-on
post-patch-LUAJITOR-on:	post-patch-LUA-on

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


do-install:
	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
.if ${PORT_OPTIONS:MTRIB}
	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
.endif
	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \

		${STAGEDIR}${REDIS_DBDIR} \
		${STAGEDIR}${REDIS_RUNDIR}

do-install-TRIB-on:
	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/

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


Lines 1-3 Link Here

(-)databases/redis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1587224146	1	TIMESTAMP = 1598952795
2	SHA256 (redis-5.0.9.tar.gz) = 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85	2	SHA256 (redis-6.0.7.tar.gz) = c2aaa1a4c7e72c70adedf976fdd5e1d34d395989283dab9d7840e0a304bb2393
3	SIZE (redis-5.0.9.tar.gz) = 1986574	3	SIZE (redis-6.0.7.tar.gz) = 2240490




--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
+++ src/Makefile	2020-05-16 12:20:46.728148000 -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')

 NODEPS:=clean distclean
 
 # Default settings
@@ -73,8 +73,8 @@
 # Override default settings if possible
 -include .make-settings
 

+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
 DEBUG=-g -ggdb
 
@@ -149,7 +149,7 @@
@@ -112,7 +112,7 @@
 endif
 endif
 # Include paths to dependencies

-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
@@ -197,6 +197,9 @@
     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
 endif
 
+FINAL_CFLAGS+=-I${PREFIX}/include/lua51

 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@@ -217,6 +220,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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 ae.o crcspeed.o crc64.o siphash.o crc16.o
 REDIS_BENCHMARK_NAME=redis-benchmark
@@ -268,7 +272,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)




--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
+++ src/Makefile	2020-05-16 12:25:33.461058000 -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')

 NODEPS:=clean distclean
 
 # Default settings
@@ -73,8 +73,8 @@
 # Override default settings if possible
 -include .make-settings
 

+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
 DEBUG=-g -ggdb
 
@@ -149,7 +149,7 @@
@@ -112,7 +112,7 @@
 endif
 endif
 # Include paths to dependencies

-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
@@ -197,6 +197,9 @@
     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
 endif
 
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0

 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@@ -217,6 +220,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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 ae.o crcspeed.o crc64.o siphash.o crc16.o
 REDIS_BENCHMARK_NAME=redis-benchmark
@@ -268,7 +272,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)




--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
+++ src/Makefile	2020-05-16 12:22:56.630826000 -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')

 NODEPS:=clean distclean
 
 # Default settings
@@ -73,8 +73,8 @@
 # Override default settings if possible
 -include .make-settings
 

 FINAL_LIBS=-lm
 DEBUG=-g -ggdb
 
@@ -149,7 +149,7 @@
 endif
 endif
 # Include paths to dependencies

-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
@@ -197,6 +197,9 @@
     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
 endif
 
+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1

 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@@ -217,6 +220,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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 ae.o crcspeed.o crc64.o siphash.o crc16.o
 REDIS_BENCHMARK_NAME=redis-benchmark
@@ -268,7 +272,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)




--- deps/hiredis/Makefile.orig	2019-11-29 16:35:59 UTC
+++ deps/hiredis/Makefile
@@ -21,7 +21,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
@@ -44,10 +44,8 @@ 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++')
-OPTIMIZATION?=-O3
 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG_FLAGS?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+#DEBUG_FLAGS?= -g -ggdb
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
 REAL_LDFLAGS=$(LDFLAGS)
 
 DYLIBSUFFIX=so
@@ -82,6 +80,16 @@ endif
 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
+  LDFLAGS?=-L. -Wl,-rpath,.
+  DYLIBNAME?=libhiredis.so
+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+  STLIBNAME?=libhiredis.a
+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
+  SSL_LDFLAGS+=	${OPENSSL_LDFLAGS}
 endif
 ifeq ($(uname_S),Darwin)
   DYLIBSUFFIX=dylib




--- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
+++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
@@ -178,14 +178,34 @@
 
     val = interval;
 
-#ifdef _OSX
+#if defined(_OSX)
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }

-#else
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+#elif defined(__GLIBC__)
     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;
     }
 
     val = interval/3;
+    defined(TCP_KEEPCNT)
+    val = interval;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+ 
+    val = interval/3;
+    if (val == 0) val = 1;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));

+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+#else
+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
+    defined(TCP_KEEPCNT)
+    val = interval;
+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+        return REDIS_ERR;
+    }
+
+    val = internal/3;
     if (val == 0) val = 1;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
         return REDIS_ERR;
 
-    sa.sun_family = AF_LOCAL;
+    sa.sun_family = AF_UNIX;
     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
     if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
         if (errno == EINPROGRESS && !blocking) {




--- redis.conf.orig	2019-11-22 16:54:22 UTC
+++ redis.conf
@@ -203,7 +203,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:
@@ -225,7 +225,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:
@@ -238,7 +238,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.
@@ -330,7 +330,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-11-29 16:35:59 UTC
+++ src/Makefile
@@ -29,7 +29,7 @@ endif
 WARN=-Wall -W -Wno-missing-field-initializers

 FINAL_LIBS=-lm
-DEBUG=-g -ggdb
 
 # Linux ARM needs -latomic at linking time
 ifneq (,$(filter aarch64 armv,$(uname_M)))
@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin)
 	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
 	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
 else
+ifeq ($(uname_S),FreeBSD)
+        # FreeBSD

 ifeq ($(uname_S),AIX)
         # AIX
         FINAL_LDFLAGS+= -Wl,-bexpall
@@ -131,6 +135,7 @@ else
 	# All the other OSes (notably Linux)
 	FINAL_LDFLAGS+= -rdynamic
 	FINAL_LIBS+=-ldl -pthread -lrt

Lines 1-4 Link Here

(-)databases/redis/files/patch-src-mkreleasehdr.sh (-2 / +2 lines)
1	--- src/mkreleasehdr.sh.orig 2019-09-25 10:40:18 UTC	1	--- src/mkreleasehdr.sh.orig 2019-11-22 16:54:22 UTC
2	+++ src/mkreleasehdr.sh	2	+++ src/mkreleasehdr.sh
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	#!/bin/sh	4	#!/bin/sh
Lines 8-11 Link Here
8	+GIT_DIRTY="0"	8	+GIT_DIRTY="0"
9	BUILD_ID=`uname -n`"-"`date +%s`	9	BUILD_ID=`uname -n`"-"`date +%s`
10	if [ -n "$SOURCE_DATE_EPOCH" ]; then	10	if [ -n "$SOURCE_DATE_EPOCH" ]; then
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)	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 71-77 Link Here

(-)databases/redis-devel/Makefile (-1 / +1 lines)
71		71
72	LDFLAGS+= -lpthread -lm -lexecinfo	72	LDFLAGS+= -lpthread -lm -lexecinfo
73		73
74	CONFLICTS?= redis4-4.* redis-5.*	74	CONFLICTS?= redis4 redis5 redis
75		75
76	USE_RC_SUBR= redis sentinel	76	USE_RC_SUBR= redis sentinel
77	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	77	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \

Lines 58-64 Link Here

(-)databases/redis4/Makefile (-1 / +1 lines)
58		58
59	LDFLAGS+= -lpthread -lm -lexecinfo	59	LDFLAGS+= -lpthread -lm -lexecinfo
60		60
61	CONFLICTS?= redis-5.* redis-devel-5.*	61	CONFLICTS?= redis5 redis redis-devel
62		62
63	USES+= gmake	63	USES+= gmake
64	MAKE_ENV= "V=yo"	64	MAKE_ENV= "V=yo"




# Created by: Sergey Skvortsov <skv@protey.ru>
# $FreeBSD$

PORTNAME=	redis5
PORTVERSION=	5.0.9
CATEGORIES=	databases
MASTER_SITES=	http://download.redis.io/releases/
DISTNAME=	redis-${PORTVERSION}

MAINTAINER=	osa@FreeBSD.org
COMMENT=	Persistent key-value database with built-in net interface


LDFLAGS+=	-lpthread -lm -lexecinfo

CONFLICTS?=	redis4 redis redis-devel

USE_RC_SUBR=	redis sentinel
BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \

Return to bug 246770

Lines 5-10 Link Here

(-)UPDATING (+14 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	20200901:
		9	AFFECTS: users of databases/redis
		10	AUTHOR: osa@FreeBSD.org
		11
		12	The databases/redis port has been updated to the new stable release 6.0.
		13	Users wanting to stay on 5.0 can replace databases/redis with
		14	databases/redis5 with one of the following commands:
		15
		16	# pkg install databases/redis5
		17	or
		18	# portmaster -o databases/redis5 databases/redis
		19	or
		20	# portupgrade -o databases/redis5 databases/redis
		21
8	20200811:	22	20200811:
9	AFFECTS: users of -emacs26- packages	23	AFFECTS: users of -emacs26- packages
10	AUTHOR: jrm@FreeBSD.org	24	AUTHOR: jrm@FreeBSD.org

Lines 2-8 Link Here

(-)databases/redis/Makefile (-48 / +44 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	PORTVERSION= 5.0.9	5	PORTVERSION= 6.0.7
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://download.redis.io/releases/	7	MASTER_SITES= http://download.redis.io/releases/
8		8
Lines 12-18 Link Here
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	OPTIONS_DEFINE= JEMALLOC TESTS TRIB	15	USES+= compiler:c11 gmake
		16
		17	OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB
16	OPTIONS_RADIO= EXTLUA	18	OPTIONS_RADIO= EXTLUA
17	OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR	19	OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR
18	OPTIONS_SUB= yes	20	OPTIONS_SUB= yes
Lines 19-77 Link Here
19	JEMALLOC_DESC= Use jemalloc	21	JEMALLOC_DESC= Use jemalloc
20	LUA_DESC= Use lang/lua instead of builtin lua	22	LUA_DESC= Use lang/lua instead of builtin lua
21	LUAJIT_DESC= Use lang/luajit instead of builtin lua	23	LUAJIT_DESC= Use lang/luajit instead of builtin lua
22	LUAJITOR_DESC= Use lang/luajit-openjit instead of builtin lua	24	LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua
		25	TLS_DESC= Use TLS (openssl req.)
23	TESTS_DESC= Install lang/tcl for redis unit tests	26	TESTS_DESC= Install lang/tcl for redis unit tests
24	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)	27	TRIB_DESC= Install redis-trib.rb (lang/ruby req.)
25		28
26	USES+= compiler:c11 gmake	29	MAKE_ENV= V=yo OPTIMIZATION=
27	MAKE_ENV= "V=yo"
28		30
29	.include <bsd.port.options.mk>	31	JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes
30		32
31	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}	33	LUA_USES= lua:51
32	# Needed for __atomic_fetch_add_8	34	LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua
33	USE_GCC= yes	35	LUA_VARS= _addflags=true
34	CFLAGS+= -march=i586
35	.endif
36		36
37	.if ${PORT_OPTIONS:MJEMALLOC}	37	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
38	MAKE_ENV+= "USE_JEMALLOC=yes"	38	LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
39	.endif	39	LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit
		40	LUAJIT_VARS= _addflags=true
40		41
41	.if ${PORT_OPTIONS:MTRIB}	42	LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
42	CATEGORIES+= ruby	43	LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
43	USE_RUBY= yes	44	LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
44	RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis	45	${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
45	.endif	46	LUAJITOR_VARS= _addflags=true
46		47
47	.if ${PORT_OPTIONS:MLUA}	48	TESTS_USES= tcl:build
48	USES+= lua:51
49	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua
50	.endif
51		49
52	.if ${PORT_OPTIONS:MLUAJIT}	50	TLS_USES= ssl
53	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit	51	TLS_MAKE_ENV= BUILD_TLS=yes
54	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit
55	.endif
56		52
57	.if ${PORT_OPTIONS:MLUAJITOR}	53	TRIB_CATEGORIES= ruby
58	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty	54	TRIB_USE= ruby=yes
59	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \	55	TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis
60	${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
61	.endif
62		56
63	.if ${PORT_OPTIONS:MLUA} \|\| ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUAJITOR}	57	.include <bsd.port.pre.mk>
64	CFLAGS+= -fPIC	58
65	LDFLAGS+= -Wl,-E	59	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
		60	# Needed for __atomic_fetch_add_8
		61	USE_GCC= yes
		62	CFLAGS+= -march=i586
66	.endif	63	.endif
67		64
68	.if ${PORT_OPTIONS:MTESTS}	65	.if defined(_addflags)
69	USES+= tcl:build	66	CFLAGS= -fPIC
		67	LDFLAGS= -Wl,-E
70	.endif	68	.endif
71		69
72	LDFLAGS+= -lpthread -lm -lexecinfo	70	LDFLAGS+= -lpthread -lm -lexecinfo
73		71
74	CONFLICTS?= redis4-4.* redis-devel-5.*	72	CONFLICTS?= redis4 redis5 redes-devel
75		73
76	USE_RC_SUBR= redis sentinel	74	USE_RC_SUBR= redis sentinel
77	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	75	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
Lines 97-111 Link Here
97	REDIS_DBDIR=${REDIS_DBDIR} \	95	REDIS_DBDIR=${REDIS_DBDIR} \
98	REDIS_RUNDIR=${REDIS_RUNDIR}	96	REDIS_RUNDIR=${REDIS_RUNDIR}
99		97
100	.include <bsd.port.pre.mk>	98	post-patch-JEMALLOC-on:
		99	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
101		100
102	post-patch:	101	post-patch-LUA-on:
103	.if ${PORT_OPTIONS:MJEMALLOC}
104	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
105	.endif
106	.if ${PORT_OPTIONS:MLUA} \|\| ${PORT_OPTIONS:MLUAJIT} \|\| ${PORT_OPTIONS:MLUAJITOR}
107	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/	102	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
108	.endif	103	post-patch-LUAJIT-on: post-patch-LUA-on
		104	post-patch-LUAJITOR-on: post-patch-LUA-on
109		105
110	post-build:	106	post-build:
111	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	107	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
Lines 113-121 Link Here
113		109
114	do-install:	110	do-install:
115	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/	111	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
116	.if ${PORT_OPTIONS:MTRIB}
117	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
118	.endif
119	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample	112	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
120	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample	113	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
121	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \	114	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
Lines 122-127 Link Here
122	${STAGEDIR}${REDIS_DBDIR} \	115	${STAGEDIR}${REDIS_DBDIR} \
123	${STAGEDIR}${REDIS_RUNDIR}	116	${STAGEDIR}${REDIS_RUNDIR}
124		117
		118	do-install-TRIB-on:
		119	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
		120
125	do-test:	121	do-test:
126	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl	122	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
127		123

Lines 1-5 Link Here

(-)databases/redis/files/extra-patch-src-Makefile.lua (-13 / +13 lines)
1	--- src/Makefile.orig 2018-10-18 18:09:43.930566000 -0400	1	--- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400
2	+++ src/Makefile 2018-10-18 18:10:32.562125000 -0400	2	+++ src/Makefile 2020-05-16 12:20:46.728148000 -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 9-15 Link Here
9	NODEPS:=clean distclean	9	NODEPS:=clean distclean
10		10
11	# Default settings	11	# Default settings
12	@@ -63,8 +63,8 @@	12	@@ -73,8 +73,8 @@
13	# Override default settings if possible	13	# Override default settings if possible
14	-include .make-settings	14	-include .make-settings
15		15
Lines 18-26 Link Here
18	+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)	18	+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
19	+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)	19	+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
20	FINAL_LIBS=-lm	20	FINAL_LIBS=-lm
		21	DEBUG=-g -ggdb
21		22
22	ifeq ($(uname_S),SunOS)	23	@@ -149,7 +149,7 @@
23	@@ -112,7 +112,7 @@
24	endif	24	endif
25	endif	25	endif
26	# Include paths to dependencies	26	# Include paths to dependencies
Lines 27-36 Link Here
27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src	27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise	28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
29		29
30	ifeq ($(MALLOC),tcmalloc)	30	# Determine systemd support and/or build preference (defaulting to auto-detection)
31	FINAL_CFLAGS+= -DUSE_TCMALLOC	31	BUILD_WITH_SYSTEMD=no
32	@@ -130,6 +130,9 @@	32	@@ -197,6 +197,9 @@
33	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)	33	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
34	endif	34	endif
35		35
36	+FINAL_CFLAGS+=-I${PREFIX}/include/lua51	36	+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
Lines 39-53 Link Here
39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)	39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)	40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)	41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
42	@@ -150,6 +153,7 @@	42	@@ -217,6 +220,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 t_stream.o listpack.o localtime.o lolwut.o lolwut5.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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o	48	REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.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	@@ -268,7 +272,7 @@
51		51
52	# redis-server	52	# redis-server
53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)	53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

Lines 1-5 Link Here

(-)databases/redis/files/extra-patch-src-Makefile.luajit (-13 / +13 lines)
1	--- src/Makefile.orig 2018-10-18 18:11:24.649811000 -0400	1	--- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400
2	+++ src/Makefile 2018-10-18 18:11:35.160523000 -0400	2	+++ src/Makefile 2020-05-16 12:25:33.461058000 -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 9-15 Link Here
9	NODEPS:=clean distclean	9	NODEPS:=clean distclean
10		10
11	# Default settings	11	# Default settings
12	@@ -63,8 +63,8 @@	12	@@ -73,8 +73,8 @@
13	# Override default settings if possible	13	# Override default settings if possible
14	-include .make-settings	14	-include .make-settings
15		15
Lines 18-26 Link Here
18	+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)	18	+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
19	+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)	19	+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
20	FINAL_LIBS=-lm	20	FINAL_LIBS=-lm
		21	DEBUG=-g -ggdb
21		22
22	ifeq ($(uname_S),SunOS)	23	@@ -149,7 +149,7 @@
23	@@ -112,7 +112,7 @@
24	endif	24	endif
25	endif	25	endif
26	# Include paths to dependencies	26	# Include paths to dependencies
Lines 27-36 Link Here
27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src	27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise	28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
29		29
30	ifeq ($(MALLOC),tcmalloc)	30	# Determine systemd support and/or build preference (defaulting to auto-detection)
31	FINAL_CFLAGS+= -DUSE_TCMALLOC	31	BUILD_WITH_SYSTEMD=no
32	@@ -130,6 +130,9 @@	32	@@ -197,6 +197,9 @@
33	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)	33	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
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 39-53 Link Here
39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)	39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)	40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)	41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
42	@@ -150,6 +153,7 @@	42	@@ -217,6 +220,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 t_stream.o listpack.o localtime.o lolwut.o lolwut5.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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o	48	REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.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	@@ -268,7 +272,7 @@
51		51
52	# redis-server	52	# redis-server
53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)	53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

Lines 1-5 Link Here

(-)databases/redis/files/extra-patch-src-Makefile.luajit-or (-12 / +12 lines)
1	--- src/Makefile.orig 2019-11-19 12:05:52.000000000 -0500	1	--- src/Makefile.orig 2020-05-15 16:29:52.000000000 -0400
2	+++ src/Makefile 2019-12-11 19:44:38.238797000 -0500	2	+++ src/Makefile 2020-05-16 12:22:56.630826000 -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 9-15 Link Here
9	NODEPS:=clean distclean	9	NODEPS:=clean distclean
10		10
11	# Default settings	11	# Default settings
12	@@ -72,8 +72,8 @@	12	@@ -73,8 +73,8 @@
13	# Override default settings if possible	13	# Override default settings if possible
14	-include .make-settings	14	-include .make-settings
15		15
Lines 20-26 Link Here
20	FINAL_LIBS=-lm	20	FINAL_LIBS=-lm
21	DEBUG=-g -ggdb	21	DEBUG=-g -ggdb
22		22
23	@@ -127,7 +127,7 @@	23	@@ -149,7 +149,7 @@
24	endif	24	endif
25	endif	25	endif
26	# Include paths to dependencies	26	# Include paths to dependencies
Lines 27-36 Link Here
27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src	27	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise	28	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
29		29
30	ifeq ($(MALLOC),tcmalloc)	30	# Determine systemd support and/or build preference (defaulting to auto-detection)
31	FINAL_CFLAGS+= -DUSE_TCMALLOC	31	BUILD_WITH_SYSTEMD=no
32	@@ -145,6 +145,9 @@	32	@@ -197,6 +197,9 @@
33	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)	33	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
34	endif	34	endif
35		35
36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1	36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
Lines 39-53 Link Here
39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)	39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)	40	REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)	41	REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
42	@@ -165,6 +168,7 @@	42	@@ -217,6 +220,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 t_stream.o listpack.o localtime.o lolwut.o lolwut5.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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.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 dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o	48	REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
49	REDIS_BENCHMARK_NAME=redis-benchmark	49	REDIS_BENCHMARK_NAME=redis-benchmark
50	@@ -216,7 +220,7 @@	50	@@ -268,7 +272,7 @@
51		51
52	# redis-server	52	# redis-server
53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)	53	$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)

Lines 1-6 Link Here

(-)databases/redis/files/patch-deps-hiredis-Makefile (-13 / +12 lines)
1	--- deps/hiredis/Makefile.orig 2019-09-25 10:40:18 UTC	1	--- deps/hiredis/Makefile.orig 2019-11-29 16:35:59 UTC
2	+++ deps/hiredis/Makefile	2	+++ deps/hiredis/Makefile
3	@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h \| a	3	@@ -21,7 +21,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-41 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 @@ export REDIS_TEST_CONFIG	12	@@ -44,10 +44,8 @@ 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++')
16	-OPTIMIZATION?=-O3	16	-OPTIMIZATION?=-O3
17	+#OPTIMIZATION?=-O3	17	WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
18	WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
19	-DEBUG_FLAGS?= -g -ggdb	18	-DEBUG_FLAGS?= -g -ggdb
20	-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)	19	-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
21	+#DEBUG_FLAGS?= -g -ggdb
22	+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)	20	+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
23	REAL_LDFLAGS=$(LDFLAGS) $(ARCH)	21	REAL_LDFLAGS=$(LDFLAGS)
24		22
25	DYLIBSUFFIX=so	23	DYLIBSUFFIX=so
26	@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)	24	@@ -82,6 +80,16 @@ endif
		25	ifeq ($(uname_S),SunOS)
27	REAL_LDFLAGS+= -ldl -lnsl -lsocket	26	REAL_LDFLAGS+= -ldl -lnsl -lsocket
28	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)	27	DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
29	INSTALL= cp -r
30	+endif	28	+endif
31	+ifeq ($(uname_S),FreeBSD)	29	+ifeq ($(uname_S),FreeBSD)
32	+ CFLAGS?=$(CFLAGS)	30	+ CFLAGS?=$(CFLAGS)
33	+ CCLINK?=-pthread	31	+ CCLINK?=pthread
34	+ LDFLAGS?=-L. -Wl,-rpath,.	32	+ LDFLAGS?=-L. -Wl,-rpath,.
35	+ DYLIBNAME?=libhiredis.so	33	+ DYLIBNAME?=libhiredis.so
36	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}	34	+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
37	+ STLIBNAME?=libhiredis.a	35	+ STLIBNAME?=libhiredis.a
38	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}	36	+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
		37	+ SSL_LDFLAGS+= ${OPENSSL_LDFLAGS}
39	endif	38	endif
40	ifeq ($(uname_S),Darwin)	39	ifeq ($(uname_S),Darwin)
41	DYLIBSUFFIX=dylib	40	DYLIBSUFFIX=dylib

Lines 1-12 Link Here

(-)databases/redis/files/patch-deps-hiredis-net.c (-43 / +18 lines)
1	--- deps/hiredis/net.c.orig 2019-09-25 10:40:18 UTC	1	--- deps/hiredis/net.c.orig 2019-11-28 14:32:05.942453000 -0500
2	+++ deps/hiredis/net.c	2	+++ deps/hiredis/net.c 2019-11-28 14:39:08.326408000 -0500
3	@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {	3	@@ -178,14 +178,34 @@
4
5	val = interval;
6
7	-#ifdef _OSX
8	+#if defined(_OSX)
9	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
10	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	4	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
11	return REDIS_ERR;	5	return REDIS_ERR;
12	}	6	}
Lines 13-35 Link Here
13	-#else	7	-#else
14	-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)	8	-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
15	+#elif defined(__GLIBC__)	9	+#elif defined(__GLIBC__)
16	val = interval;
17	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {	10	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
18	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	11	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
19	@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
20	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
21	return REDIS_ERR;	12	return REDIS_ERR;
22	}	13	}
23	+#else	14
24	+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \	15	val = interval/3;
25	+ defined(TCP_KEEPCNT)
26	+ val = interval;
27	+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
28	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
29	+ return REDIS_ERR;
30	+ }
31	+
32	+ val = interval/3;
33	+ if (val == 0) val = 1;	16	+ if (val == 0) val = 1;
34	+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {	17	+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
35	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	18	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
Lines 41-64 Link Here
41	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));	24	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
42	+ return REDIS_ERR;	25	+ return REDIS_ERR;
43	+ }	26	+ }
44	#endif	27	+#else
45	#endif	28	+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
46		29	+ defined(TCP_KEEPCNT)
47	@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha	30	+ val = interval;
48	struct sockaddr_un sa;	31	+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
49	long timeout_msec = -1;	32	+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
50		33	+ return REDIS_ERR;
51	- if (redisCreateSocket(c,AF_LOCAL) < 0)	34	+ }
52	+ if (redisCreateSocket(c,AF_UNIX) < 0)	35	+
53	return REDIS_ERR;	36	+ val = internal/3;
54	if (redisSetBlocking(c,0) != REDIS_OK)	37	if (val == 0) val = 1;
55	return REDIS_ERR;	38	if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
56	@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha	39	__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
57	if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
58	return REDIS_ERR;
59
60	- sa.sun_family = AF_LOCAL;
61	+ sa.sun_family = AF_UNIX;
62	strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
63	if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
64	if (errno == EINPROGRESS && !blocking) {

Lines 1-6 Link Here

(-)databases/redis/files/patch-redis.conf (-5 / +5 lines)
1	--- redis.conf.orig 2019-09-25 10:40:18 UTC	1	--- redis.conf.orig 2019-11-22 16:54:22 UTC
2	+++ redis.conf	2	+++ redis.conf
3	@@ -133,7 +133,7 @@ tcp-keepalive 300	3	@@ -203,7 +203,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	@@ -155,7 +155,7 @@ supervised no	12	@@ -225,7 +225,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	@@ -168,7 +168,7 @@ loglevel notice	21	@@ -238,7 +238,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	@@ -260,7 +260,7 @@ dbfilename dump.rdb	30	@@ -330,7 +330,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-4 Link Here

(-)databases/redis/files/patch-src-Makefile (-7 / +7 lines)
1	--- src/Makefile.orig 2019-09-25 10:40:18 UTC	1	--- src/Makefile.orig 2019-11-29 16:35:59 UTC
2	+++ src/Makefile	2	+++ src/Makefile
3	@@ -29,7 +29,7 @@ endif	3	@@ -29,7 +29,7 @@ endif
4	WARN=-Wall -W -Wno-missing-field-initializers	4	WARN=-Wall -W -Wno-missing-field-initializers
Lines 15-25 Link Here
15	FINAL_LIBS=-lm	15	FINAL_LIBS=-lm
16	-DEBUG=-g -ggdb	16	-DEBUG=-g -ggdb
17		17
18	ifeq ($(uname_S),SunOS)	18	# Linux ARM needs -latomic at linking time
19	# SunOS	19	ifneq (,$(filter aarch64 armv,$(uname_M)))
20	@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)	20	@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin)
21	# Darwin	21	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
22	FINAL_LIBS+= -ldl	22	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
23	else	23	else
24	+ifeq ($(uname_S),FreeBSD)	24	+ifeq ($(uname_S),FreeBSD)
25	+ # FreeBSD	25	+ # FreeBSD
Lines 29-35 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	@@ -120,6 +124,7 @@ else	32	@@ -131,6 +135,7 @@ else
33	# All the other OSes (notably Linux)	33	# All the other OSes (notably Linux)
34	FINAL_LDFLAGS+= -rdynamic	34	FINAL_LDFLAGS+= -rdynamic
35	FINAL_LIBS+=-ldl -pthread -lrt	35	FINAL_LIBS+=-ldl -pthread -lrt

Lines 1-10 Link Here

(-)databases/redis5/Makefile (-2 / +3 lines)
1	# Created by: Sergey Skvortsov <skv@protey.ru>	1	# Created by: Sergey Skvortsov <skv@protey.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= redis	4	PORTNAME= redis5
5	PORTVERSION= 5.0.9	5	PORTVERSION= 5.0.9
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://download.redis.io/releases/	7	MASTER_SITES= http://download.redis.io/releases/
		8	DISTNAME= redis-${PORTVERSION}
8		9
9	MAINTAINER= osa@FreeBSD.org	10	MAINTAINER= osa@FreeBSD.org
10	COMMENT= Persistent key-value database with built-in net interface	11	COMMENT= Persistent key-value database with built-in net interface
Lines 71-77 Link Here
71		72
72	LDFLAGS+= -lpthread -lm -lexecinfo	73	LDFLAGS+= -lpthread -lm -lexecinfo
73		74
74	CONFLICTS?= redis4-4.* redis-devel-5.*	75	CONFLICTS?= redis4 redis redis-devel
75		76
76	USE_RC_SUBR= redis sentinel	77	USE_RC_SUBR= redis sentinel
77	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \	78	BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \