git: 1a5768cc381f - main - databases/redis-devel: update to the recent commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Dec 2021 15:17:22 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1a5768cc381f41d2f823f7d01c6e6170368e6c37
commit 1a5768cc381f41d2f823f7d01c6e6170368e6c37
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2021-12-01 15:16:42 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2021-12-01 15:17:16 +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 | 25 ++++++++++---------------
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 42a2470fce92..d5e69a943a08 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.20211105
+PORTVERSION= 7.0.0.20211201
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:ddb508c
+GH_TUPLE= redis:redis:0e5b813
OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB
OPTIONS_RADIO= EXTLUA
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index b958b65791db..839c96e2cf29 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636129042
-SHA256 (redis-redis-7.0.0.20211105-ddb508c_GH0.tar.gz) = f60871bda3b14be93493d759af565f5e53c81a2e54ada99e0656cb2725ce08be
-SIZE (redis-redis-7.0.0.20211105-ddb508c_GH0.tar.gz) = 2665367
+TIMESTAMP = 1638371049
+SHA256 (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = b73a062ce2c4945a935792bcfa198e90f04df4e7d7a82a19001aad6f3010459a
+SIZE (redis-redis-7.0.0.20211201-0e5b813_GH0.tar.gz) = 2677658
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index 54e63847811f..c937bacb715e 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,20 +1,15 @@
---- 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
+--- deps/Makefile.orig 2021-12-01 10:06:05.001367000 -0500
++++ deps/Makefile 2021-12-01 10:08:16.372525000 -0500
+@@ -76,7 +76,7 @@
+ ifeq ($(LUA_DEBUG),yes)
+ LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
+ else
+- LUA_CFLAGS+= -O2
++ LUA_CFLAGS+=
endif
-
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
- 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,11 +79,11 @@
-
- lua: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
-+ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+@@ -90,7 +90,7 @@
.PHONY: lua
@@ -23,7 +18,7 @@
JEMALLOC_LDFLAGS= $(LDFLAGS)
ifneq ($(DEB_HOST_GNU_TYPE),)
-@@ -92,7 +92,7 @@
+@@ -99,7 +99,7 @@
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)