git: 6378be71c3ac - main - databases/redis-devel: update to the recent commit

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Wed, 27 Oct 2021 13:52:54 UTC
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6378be71c3ac8724a5a0278ce3955886af148d3b

commit 6378be71c3ac8724a5a0278ce3955886af148d3b
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2021-10-27 13:52:31 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2021-10-27 13:52:31 +0000

    databases/redis-devel: update to the recent commit
---
 databases/redis-devel/Makefile                  |  4 ++--
 databases/redis-devel/distinfo                  |  6 +++---
 databases/redis-devel/files/patch-deps-Makefile | 13 ++++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 49bcb091ae4e..81da41e81901 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 
 PORTNAME=	redis
-PORTVERSION=	7.0.0.20211019
+PORTVERSION=	7.0.0.20211027
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES+=		compiler:c11 cpe gmake
 CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
-GH_TUPLE=	redis:redis:4962c55
+GH_TUPLE=	redis:redis:b7afac6
 
 OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=	EXTLUA
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index da3fe6da0ee1..09734ad57d16 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634694176
-SHA256 (redis-redis-7.0.0.20211019-4962c55_GH0.tar.gz) = 8f6de75809cd55f3e87600c7098762d304ec2e1ca411db91c5df5206a81ecd94
-SIZE (redis-redis-7.0.0.20211019-4962c55_GH0.tar.gz) = 2639422
+TIMESTAMP = 1635342301
+SHA256 (redis-redis-7.0.0.20211027-b7afac6_GH0.tar.gz) = 784295b414ceefb1852c01ea159297bb9e54ad47d19b05865db9c61c3dd5b7d2
+SIZE (redis-redis-7.0.0.20211027-b7afac6_GH0.tar.gz) = 2656094
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index cf77ec972392..54e63847811f 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,5 +1,5 @@
---- deps/Makefile.orig	2021-10-19 22:00:31.196463000 -0400
-+++ deps/Makefile	2021-10-19 22:00:41.781836000 -0400
+--- deps/Makefile.orig	2021-10-27 07:48:08.000000000 -0400
++++ deps/Makefile	2021-10-27 09:49:28.847356000 -0400
 @@ -69,7 +69,7 @@
  	LUA_CFLAGS= -D__C99FEATURES__=1
  endif
@@ -9,7 +9,7 @@
  LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -79,16 +79,16 @@
+@@ -79,11 +79,11 @@
  
  lua: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
@@ -22,11 +22,14 @@
 +JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
  JEMALLOC_LDFLAGS= $(LDFLAGS)
  
+ ifneq ($(DEB_HOST_GNU_TYPE),)
+@@ -92,7 +92,7 @@
+ 
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 -	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
  .PHONY: jemalloc