6 files changed, 28 insertions, 26 deletions

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 43e59537321a..ddcecaf33643 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.8.3
+DISTVERSION=	2.8.4
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index fc261103c4c4..59ab5943f49f 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.8.3.tar.gz) = c0aa8065c230f9df1b77d1dd1e8840655e7846e23fe23f8e339d6246aec3e63f
-SIZE (redis-2.8.3.tar.gz) = 1046106
+SHA256 (redis-2.8.4.tar.gz) = 6b6602321536401b8b46aa05ec509141506b689b420675685ffe147ae08c0c86
+SIZE (redis-2.8.4.tar.gz) = 1048914
diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile
index 701d4fab774f..8846533cdd23 100644
--- a/databases/redis-devel/files/patch-src-Makefile
+++ b/databases/redis-devel/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2013-07-30 22:20:02.000000000 +0400
-+++ src/Makefile	2013-08-13 22:36:30.000000000 +0400
+--- src/Makefile.orig	2014-01-14 14:17:43.000000000 +0400
++++ src/Makefile	2014-01-14 14:19:31.000000000 +0400
 @@ -22,7 +22,7 @@
  WARN=-Wall
  OPT=$(OPTIMIZATION)
@@ -9,7 +9,7 @@
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  
-@@ -52,14 +52,15 @@
+@@ -52,7 +52,7 @@
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
@@ -17,14 +17,15 @@
 +#DEBUG=-g -ggdb
  
  ifeq ($(uname_S),SunOS)
- 	INSTALL=cp -pf
- 	FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
- 	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
--else ifeq ($(uname_S),Darwin)
--	
-+else ifeq ($(uname_S),FreeBSD)
+ 	# SunOS
+@@ -63,6 +63,7 @@
+-ifeq ($(uname_S),Darwin)
+-	# Darwin (nothing to do)
+-else
++ifeq ($(uname_S),FreeBSD)
 +	FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
 +	FINAL_LDFLAGS= $(LDFLAGS)
- else
++else
+ 	# All the other OSes (notably Linux)
  	FINAL_LDFLAGS+= -rdynamic
  	FINAL_LIBS+= -pthread
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index e22371bbefb2..a16153524ecf 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.8.3
+DISTVERSION=	2.8.4
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index fc261103c4c4..59ab5943f49f 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.8.3.tar.gz) = c0aa8065c230f9df1b77d1dd1e8840655e7846e23fe23f8e339d6246aec3e63f
-SIZE (redis-2.8.3.tar.gz) = 1046106
+SHA256 (redis-2.8.4.tar.gz) = 6b6602321536401b8b46aa05ec509141506b689b420675685ffe147ae08c0c86
+SIZE (redis-2.8.4.tar.gz) = 1048914
diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile
index 701d4fab774f..8846533cdd23 100644
--- a/databases/redis/files/patch-src-Makefile
+++ b/databases/redis/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2013-07-30 22:20:02.000000000 +0400
-+++ src/Makefile	2013-08-13 22:36:30.000000000 +0400
+--- src/Makefile.orig	2014-01-14 14:17:43.000000000 +0400
++++ src/Makefile	2014-01-14 14:19:31.000000000 +0400
 @@ -22,7 +22,7 @@
  WARN=-Wall
  OPT=$(OPTIMIZATION)
@@ -9,7 +9,7 @@
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  
-@@ -52,14 +52,15 @@
+@@ -52,7 +52,7 @@
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
@@ -17,14 +17,15 @@
 +#DEBUG=-g -ggdb
  
  ifeq ($(uname_S),SunOS)
- 	INSTALL=cp -pf
- 	FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
- 	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
--else ifeq ($(uname_S),Darwin)
--	
-+else ifeq ($(uname_S),FreeBSD)
+ 	# SunOS
+@@ -63,6 +63,7 @@
+-ifeq ($(uname_S),Darwin)
+-	# Darwin (nothing to do)
+-else
++ifeq ($(uname_S),FreeBSD)
 +	FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
 +	FINAL_LDFLAGS= $(LDFLAGS)
- else
++else
+ 	# All the other OSes (notably Linux)
  	FINAL_LDFLAGS+= -rdynamic
  	FINAL_LIBS+= -pthread