From fd5f4b82242d2ef5246d4258e54de660e086320f Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Fri, 24 Feb 2012 13:04:14 +0000
Subject: Update from 2.4.7 to 2.4.8.

<ChangeLog>

UPGRADE URGENCY: moderate if you don't experience any of the fixed problems.

* [BUGFIX] Make install now uses cp -f to avoid 'text file busy' errors.
* [BUGFIX] redis-check-aof is now large files safe also on 32 bit systems.
* [BUGFIX] Issue #327 fixed: maxmemory and replication now work much better.
* [BUGFIX] Now HINCRBY can detect overflows too. Fix for issue #330.
* [BUGFIX] Fixed compilation with latest clang.
* [BUGFIX] Fixed handling of empty sorted sets produced in RDB by
           very old Redis versions (1.2.x).

</ChangeLog>
---
 .../redis/files/patch-deps::hiredis::Makefile      | 54 +++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

(limited to 'databases/redis/files/patch-deps::hiredis::Makefile')

diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile
index f6d34bd3a9de..b0cfcd406885 100644
--- a/databases/redis/files/patch-deps::hiredis::Makefile
+++ b/databases/redis/files/patch-deps::hiredis::Makefile
@@ -1,10 +1,24 @@
---- deps/hiredis/Makefile.orig	2010-12-23 15:17:54.000000000 +0300
-+++ deps/hiredis/Makefile	2010-12-24 09:24:45.000000000 +0300
-@@ -24,6 +24,14 @@
-   DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
-   STLIBNAME?=libhiredis.a
-   STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
-+else ifeq ($(uname_S),FreeBSD)
+--- deps/hiredis/Makefile.orig	2012-02-22 17:23:43.000000000 +0400
++++ deps/hiredis/Makefile	2012-02-24 16:46:44.000000000 +0400
+@@ -12,10 +12,10 @@
+ 
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-OPTIMIZATION?=-O3
++#OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
+-DEBUG?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
++#DEBUG?= -g -ggdb
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG)
+ REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
+ 
+ DYLIBSUFFIX=so
+@@ -34,6 +34,15 @@
+   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+   INSTALL= cp -r
+ endif
++ifeq ($(uname_S),FreeBSD)
 +  CFLAGS?=$(CFLAGS)
 +  CCLINK?=-pthread
 +  LDFLAGS?=-L. -Wl,-rpath,.
@@ -12,18 +26,16 @@
 +  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
 +  STLIBNAME?=libhiredis.a
 +  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
- else
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
-@@ -34,9 +42,9 @@
-   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
- endif
- CCOPT= $(CFLAGS) $(CCLINK)
--DEBUG?= -g -ggdb
-+#DEBUG?= -g -ggdb
++endif
+ ifeq ($(uname_S),Darwin)
+   DYLIBSUFFIX=dylib
+   DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
+@@ -104,7 +113,7 @@
+ 	$(CC) -MM *.c
  
--PREFIX?= /usr/local
-+PREFIX?= ${PREFIX}
- INSTALL_INC= $(PREFIX)/include/hiredis
- INSTALL_LIB= $(PREFIX)/lib
- INSTALL= cp -a
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
-- 
cgit v1.2.3