diff options
Diffstat (limited to 'databases/redis')
| -rw-r--r-- | databases/redis/Makefile | 5 | ||||
| -rw-r--r-- | databases/redis/distinfo | 6 | ||||
| -rw-r--r-- | databases/redis/files/patch-deps_Makefile | 6 | ||||
| -rw-r--r-- | databases/redis/files/patch-src_Makefile | 24 |
4 files changed, 10 insertions, 31 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 690a99962358..07abbf78a3d5 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis -DISTVERSION= 8.2.2 +DISTVERSION= 8.4.0 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ @@ -22,11 +22,10 @@ USE_RC_SUBR= redis sentinel MAKE_ENV= OPTIMIZATION= \ V=yo -LDFLAGS+= -lpthread -lm -lexecinfo #PIE_UNSAFE= ld: error: relocation R_X86_64_32 cannot be used against local \ # symbol; recompile with -fPIC -CONFLICTS_INSTALL= redis-devel redis62 redis72 redis74 +CONFLICTS_INSTALL= redis-devel redis[0-9]* PORTSCOUT= limit:^[0-9\.]*$$ SUB_FILES= pkg-message diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 087e23d38c53..b8d325bd63da 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759573077 -SHA256 (redis-8.2.2.tar.gz) = 4e340e8e822a82114b6fb0f7ca581b749fa876e31e36e9fbcb75416bec9d0608 -SIZE (redis-8.2.2.tar.gz) = 3901854 +TIMESTAMP = 1764323267 +SHA256 (redis-8.4.0.tar.gz) = ca909aa15252f2ecb3a048cd086469827d636bf8334f50bb94d03fba4bfc56e8 +SIZE (redis-8.4.0.tar.gz) = 4109585 diff --git a/databases/redis/files/patch-deps_Makefile b/databases/redis/files/patch-deps_Makefile index d0f405916a20..ff2007910cb6 100644 --- a/databases/redis/files/patch-deps_Makefile +++ b/databases/redis/files/patch-deps_Makefile @@ -1,6 +1,6 @@ ---- deps/Makefile.orig 2025-08-04 11:05:03 UTC +--- deps/Makefile.orig 2025-11-18 14:58:24 UTC +++ deps/Makefile -@@ -110,7 +110,7 @@ else +@@ -117,7 +117,7 @@ else ifeq ($(LUA_DEBUG),yes) LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK else @@ -9,7 +9,7 @@ endif ifeq ($(LUA_COVERAGE),yes) LUA_CFLAGS += -fprofile-arcs -ftest-coverage -@@ -138,7 +138,7 @@ jemalloc: .make-prerequisites +@@ -145,7 +145,7 @@ jemalloc: .make-prerequisites jemalloc: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) diff --git a/databases/redis/files/patch-src_Makefile b/databases/redis/files/patch-src_Makefile index 40cff0e1b880..396ffc148099 100644 --- a/databases/redis/files/patch-src_Makefile +++ b/databases/redis/files/patch-src_Makefile @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2025-08-04 11:05:03 UTC +--- src/Makefile.orig 2025-11-28 10:22:14 UTC +++ src/Makefile @@ -67,7 +67,7 @@ endif STD+=-std=c99 @@ -9,7 +9,7 @@ INSTALL_BIN=$(PREFIX)/bin INSTALL=install PKG_CONFIG?=pkg-config -@@ -143,7 +143,6 @@ FINAL_LIBS=-lm -lstdc++ +@@ -150,7 +150,6 @@ FINAL_LIBS=-lm -lstdc++ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm -lstdc++ @@ -17,23 +17,3 @@ # Linux ARM32 needs -latomic at linking time ifneq (,$(findstring armv,$(uname_M))) -@@ -182,6 +181,11 @@ else - OPENSSL_PREFIX?=/usr/local/opt/openssl - endif - else -+ifeq ($(uname_S),FreeBSD) -+ # FreeBSD -+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) -pthread -+else - ifeq ($(uname_S),AIX) - # AIX - FINAL_LDFLAGS+= -Wl,-bexpall -@@ -231,6 +235,7 @@ else - # All the other OSes (notably Linux) - FINAL_LDFLAGS+= -rdynamic - FINAL_LIBS+=-ldl -pthread -lrt -+endif - endif - endif - endif |