From 89e0b04783bb6f6a0dde7811bb8af7da69eeac17 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Thu, 21 Nov 2019 19:27:39 +0000 Subject: Repocopy the databases/redis to the databases/redis4 to update the databases/redis port to the latest stable version, 5.0.6. PR: 241526 Reviewed by: portmgr (adamw) Approved by: portmgr (adamw) Differential Revision: https://reviews.freebsd.org/D22336 --- databases/redis/files/patch-src-Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'databases/redis/files/patch-src-Makefile') diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile index bfbe89b2d241..039f8f0dbe1e 100644 --- a/databases/redis/files/patch-src-Makefile +++ b/databases/redis/files/patch-src-Makefile @@ -1,7 +1,7 @@ ---- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300 -+++ src/Makefile 2015-04-07 21:30:22.464962000 +0300 -@@ -22,7 +22,7 @@ - WARN=-Wall -W +--- src/Makefile.orig 2019-09-25 10:40:18 UTC ++++ src/Makefile +@@ -29,7 +29,7 @@ endif + WARN=-Wall -W -Wno-missing-field-initializers OPT=$(OPTIMIZATION) -PREFIX?=/usr/local @@ -9,7 +9,7 @@ INSTALL_BIN=$(PREFIX)/bin INSTALL=install -@@ -52,7 +52,6 @@ +@@ -75,7 +75,6 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm @@ -17,9 +17,9 @@ ifeq ($(uname_S),SunOS) # SunOS -@@ -63,6 +62,11 @@ - ifeq ($(uname_S),Darwin) - # Darwin (nothing to do) +@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin) + # Darwin + FINAL_LIBS+= -ldl else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,11 +29,11 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -75,6 +79,7 @@ +@@ -120,6 +124,7 @@ else + # All the other OSes (notably Linux) + FINAL_LDFLAGS+= -rdynamic + FINAL_LIBS+=-ldl -pthread -lrt ++endif endif endif endif -+endif - # Include paths to dependencies - FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src - -- cgit v1.2.3