4 files changed, 39 insertions, 38 deletions
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)
diff --git a/databases/redis/files/patch-deps::linenoise::Makefile b/databases/redis/files/patch-deps::linenoise::Makefile
index 2a79e2e3208c..de4181edbd6c 100644
--- a/databases/redis/files/patch-deps::linenoise::Makefile
+++ b/databases/redis/files/patch-deps::linenoise::Makefile
@@ -1,5 +1,5 @@
---- deps/linenoise/Makefile.orig	2010-12-24 09:27:03.000000000 +0300
-+++ deps/linenoise/Makefile	2010-12-24 09:27:47.000000000 +0300
+--- deps/linenoise/Makefile.orig	2012-02-22 17:23:43.000000000 +0400
++++ deps/linenoise/Makefile	2012-02-24 16:48:55.000000000 +0400
 @@ -1,10 +1,10 @@
  linenoise_example: linenoise.h linenoise.c
  
diff --git a/databases/redis/files/patch-deps:hiredis:hiredis.c b/databases/redis/files/patch-deps:hiredis:hiredis.c
deleted file mode 100644
index db4496d75c13..000000000000
--- a/databases/redis/files/patch-deps:hiredis:hiredis.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/hiredis/hiredis.c.orig	2011-11-23 15:42:15.000000000 +0400
-+++ deps/hiredis/hiredis.c	2011-11-23 15:42:45.000000000 +0400
-@@ -697,7 +697,7 @@
-                     }
- 
-                     /* Consume and discard vararg */
--                    va_arg(ap,void);
-+                    va_arg(ap,void*);
-                 }
-             }
-             touched = 1;
diff --git a/databases/redis/files/patch-src::config.h b/databases/redis/files/patch-src::config.h
index d69cd179d65e..ae6f5cb4fde2 100644
--- a/databases/redis/files/patch-src::config.h
+++ b/databases/redis/files/patch-src::config.h
@@ -1,11 +1,11 @@
---- src/config.h.orig	2011-11-30 16:28:05.000000000 +0400
-+++ src/config.h	2011-11-30 16:28:19.000000000 +0400
+--- src/config.h.orig	2012-02-24 16:56:36.000000000 +0400
++++ src/config.h	2012-02-24 16:57:01.000000000 +0400
 @@ -25,7 +25,7 @@
  #endif
  
  /* Test for backtrace() */
--#if defined(__APPLE__) || defined(__linux__)
-+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
+-#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
++#if defined(__APPLE__) || defined(__linux__) || defined(__sun) || defined(__FreeBSD__)
  #define HAVE_BACKTRACE 1
  #endif