From a4e45d5de0dde7cbd46ca92f5364d9f355a2b750 Mon Sep 17 00:00:00 2001
From: Jrabbit <jackjrabbit@gmail.com>
Date: Sat, 25 Jun 2011 01:02:41 +0000
Subject: [PATCH] fixes

---
 dev-db/redis/patches/redis-2.2.11.diff | 82 --------------------------
 dev-db/redis/redis-2.2.11.bep          |  1 +
 2 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 dev-db/redis/patches/redis-2.2.11.diff

diff --git a/dev-db/redis/patches/redis-2.2.11.diff b/dev-db/redis/patches/redis-2.2.11.diff
deleted file mode 100644
index e67eccbc9..000000000
--- a/dev-db/redis/patches/redis-2.2.11.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile
-index b186e75..345a15d 100644
-diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile
-index 2a84b9b..9d50572 100644
---- redis-2.2.11/deps/hiredis/Makefile
-+++ redis-2.2.11/deps/hiredis/Makefile
-@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin)
-   STLIBNAME?=libhiredis.a
-   STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
- else
-+ifeq ($(uname_S),Haiku)
-+  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
-+  CCLINK?=-lroot -lnetwork
-+  LDFLAGS?=-L. -Wl,-rpath,.
-+  DYLIBNAME?=libhiredis.so
-+  DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
-+  STLIBNAME?=libhiredis.a
-+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+else
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
-   LDFLAGS?=-L. -Wl,-rpath,.
-diff --git redis-2.2.11/src/Makefile redis-2.2.11/src/Makefile
-index 292255c..51d2910 100644
---- redis-2.2.11/src/Makefile
-+++ redis-2.2.11/src/Makefile
-@@ -15,7 +15,12 @@ endif
- ifeq ($(uname_S),SunOS)
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
-   CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
--  DEBUG?=-g -ggdb 
-+  DEBUG?=-g -ggdb
-+else
-+ifeq ($(uname_S),Haiku)
-+  CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
-+  CCLINK?=-lroot -lnetwork
-+  DEBUG?=-g -ggdb
- else
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
---
-
-diff --git redis-2.2.11/src/aof.c redis-2.2.11/src/aof.c
-index e30c77f..2403e83 100644
---- redis-2.2.11/src/aof.c
-+++ redis-2.2.11/src/aof.c
-@@ -23,7 +23,7 @@ void stopAppendOnly(void) {
-         int statloc;
- 
-         if (kill(server.bgsavechildpid,SIGKILL) != -1)
--            wait3(&statloc,0,NULL);
-+            waitpid(&statloc,0,NULL);
-         /* reset the buffer accumulating changes while the child saves */
-         sdsfree(server.bgrewritebuf);
-         server.bgrewritebuf = sdsempty();
-diff --git redis-2.2.11/src/redis.c redis-2.2.11/src/redis.c
-index 45be893..b7d1b0b 100644
---- redis-2.2.11/src/redis.c
-+++ redis-2.2.11/src/redis.c
-@@ -589,7 +589,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
-         int statloc;
-         pid_t pid;
- 
--        if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
-+        if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) {
-             if (pid == server.bgsavechildpid) {
-                 backgroundSaveDoneHandler(statloc);
-             } else {
-diff --git redis-2.2.11/src/sha1.c redis-2.2.11/src/sha1.c
-index 2c50433..312c777 100644
---- redis-2.2.11/src/sha1.c
-+++ redis-2.2.11/src/sha1.c
-@@ -27,6 +27,9 @@ A million repetitions of "a"
- #if defined(__sun)
- #include "solarisfixes.h"
- #endif
-+#ifdef __HAIKU__
-+#include <stdint.h>
-+#endif
- #include "sha1.h"
- 
- #ifndef BYTE_ORDER
diff --git a/dev-db/redis/redis-2.2.11.bep b/dev-db/redis/redis-2.2.11.bep
index 05668aa46..09ff408a3 100644
--- a/dev-db/redis/redis-2.2.11.bep
+++ b/dev-db/redis/redis-2.2.11.bep
@@ -1,4 +1,5 @@
 HOMEPAGE= "http://redis.io/"
+DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets."
 SRC_URI= "http://redis.googlecode.com/files/redis-2.2.11.tar.gz"
 REVISION = "1"
 DEPEND=""