From db935a52efe689c18afa98357f2dc228014d003d Mon Sep 17 00:00:00 2001
From: Yasuhiro Kimura <yasu@FreeBSD.org>
Date: Fri, 2 May 2025 21:39:24 +0900
Subject: databases/redis: Update to 8.0.0

* Update license information. Since 8.0 redis is distributed under
  triple license of (a) the Redis Source Available License v2 (RSALv2)
  or (b) the Server Side Public License v1 (SSPLv1) or (c) the GNU
  Affero General Public License v3 (AGPLv3).
* Add entry to UPDATING.

ChangeLog:	https://github.com/redis/redis/releases/tag/8.0.0
---
 databases/redis/files/patch-src-Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'databases/redis/files')

diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile
index 6b3ed47b68be..63339db6505a 100644
--- a/databases/redis/files/patch-src-Makefile
+++ b/databases/redis/files/patch-src-Makefile
@@ -1,25 +1,25 @@
---- src/Makefile.orig	2019-11-29 16:35:59 UTC
+--- src/Makefile.orig	2025-05-02 11:15:06 UTC
 +++ src/Makefile
-@@ -29,7 +29,7 @@ endif
- WARN=-Wall -W -Wno-missing-field-initializers
- OPT=$(OPTIMIZATION)
+@@ -67,7 +67,7 @@ endif
+ 	STD+=-std=c99
+ endif
  
 -PREFIX?=/usr/local
 +PREFIX:=$(PREFIX)
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
- 
-@@ -75,7 +75,6 @@ endif
+ PKG_CONFIG?=pkg-config
+@@ -131,7 +131,6 @@ FINAL_LIBS=-lm -lstdc++
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm -lstdc++
 -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
+ # Linux ARM32 needs -latomic at linking time
+ ifneq (,$(findstring armv,$(uname_M)))
+@@ -170,6 +169,11 @@ else
+ 	OPENSSL_PREFIX?=/usr/local/opt/openssl
+ endif
  else
 +ifeq ($(uname_S),FreeBSD)
 +        # FreeBSD
@@ -29,7 +29,7 @@
  ifeq ($(uname_S),AIX)
          # AIX
          FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -131,6 +135,7 @@ else
+@@ -219,6 +223,7 @@ else
  	# All the other OSes (notably Linux)
  	FINAL_LDFLAGS+= -rdynamic
  	FINAL_LIBS+=-ldl -pthread -lrt
-- 
cgit v1.2.3