From 0e736bceef0f6cf86ddd66eb8563320356fc5c05 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Tue, 7 Apr 2015 22:28:20 +0000
Subject: Upgrade from 2.8.19 to 3.0.0. Merge all changes from
 databases/redis-devel to databases/redis.

<ChangeLog>

Redis 3.0 release notes
=======================

--[ Redis 3.0.0 ] Release date: 1 Apr 2015

>> What's new in Redis 3.0 compared to Redis 2.8?

* Redis Cluster: a distributed implementation of a subset of Redis.
* New "embedded string" object encoding resulting in less cache
  misses. Big speed gain under certain work loads.
* AOF child -> parent final data transmission to minimize latency due
  to "last write" during AOF rewrites.
* Much improved LRU approximation algorithm for keys eviction.
* WAIT command to block waiting for a write to be transmitted to
  the specified number of slaves.
* MIGRATE connection caching. Much faster keys migraitons.
* MIGARTE new options COPY and REPLACE.
* CLIENT PAUSE command: stop processing client requests for a
  specified amount of time.
* BITCOUNT performance improvements.
* CONFIG SET accepts memory values in different units (for example
  you can use "CONFIG SET maxmemory 1gb").
* Redis log format slightly changed reporting in each line the role of the
  instance (master/slave) or if it's a saving child log.
* INCR performance improvements.

>> Refactoring changes (no new features nor bug fixes)

* Blocking operations full refactoring (blocked.c)
* Client output buffer memory tracking refactored.

</ChangeLog>
---
 databases/redis/files/patch-src-Makefile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 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 c46535e86bd0..bfbe89b2d241 100644
--- a/databases/redis/files/patch-src-Makefile
+++ b/databases/redis/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2014-09-01 19:00:38.000000000 +0400
-+++ src/Makefile	2014-09-09 05:45:32.000000000 +0400
+--- 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
  OPT=$(OPTIMIZATION)
@@ -9,28 +9,27 @@
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,6 @@
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
 -DEBUG=-g -ggdb
-+#DEBUG=-g -ggdb
  
  ifeq ($(uname_S),SunOS)
  	# SunOS
-@@ -67,7 +67,10 @@
-         # AIX
-         FINAL_LDFLAGS+= -Wl,-bexpall
-         FINAL_LIBS+= -pthread -lcrypt -lbsd
--
-+else
+@@ -63,6 +62,11 @@
+ ifeq ($(uname_S),Darwin)
+ 	# Darwin (nothing to do)
+ else
 +ifeq ($(uname_S),FreeBSD)
++        # FreeBSD
 +        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+        FINAL_LDFLAGS= $(LDFLAGS)
- else
- 	# All the other OSes (notably Linux)
- 	FINAL_LDFLAGS+= -rdynamic
-@@ -75,6 +78,7 @@
++        FINAL_LDFLAGS= $(LDFLAGS) -pthread
++else
+ ifeq ($(uname_S),AIX)
+         # AIX
+         FINAL_LDFLAGS+= -Wl,-bexpall
+@@ -75,6 +79,7 @@
  endif
  endif
  endif
-- 
cgit v1.2.3