Update from 2.6.14 to 2.8.0-rc2.

Changes:	https://raw.github.com/antirez/redis/2.8/00-RELEASENOTES

6 files changed, 59 insertions, 57 deletions

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 8d940cf6fb59..e451c28d9c40 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.14
+DISTVERSION=	2.8.0-rc2
 CATEGORIES=	databases
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	osa@FreeBSD.org
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 1405166dff97..b799973fce07 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.14.tar.gz) = fdf61c693e5c4908b4bb44c428d4a2b7568f05566c144c58fdf19c5cb12a9caf
-SIZE (redis-2.6.14.tar.gz) = 995036
+SHA256 (redis-2.8.0-rc2.tar.gz) = 7a3abcd79e33faef35b699ea5b8870d052aa38c86253f7b16fc8cb40abd5b69b
+SIZE (redis-2.8.0-rc2.tar.gz) = 1031289
diff --git a/databases/redis-devel/files/extra-patch-src-Makefile b/databases/redis-devel/files/extra-patch-src-Makefile
index b0d026db6754..a996b6fedfc8 100644
--- a/databases/redis-devel/files/extra-patch-src-Makefile
+++ b/databases/redis-devel/files/extra-patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2012-12-25 23:11:28.000000000 +0400
-+++ src/Makefile	2012-12-25 23:13:53.000000000 +0400
+--- src/Makefile.orig	2013-08-13 15:52:22.000000000 +0400
++++ src/Makefile	2013-08-13 15:54:55.000000000 +0400
 @@ -15,7 +15,7 @@
  release_hdr := $(shell sh -c './mkreleasehdr.sh')
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -8,18 +8,18 @@
 +DEPENDENCY_TARGETS=hiredis linenoise
  
  # Default settings
- STD= -std=c99 -pedantic
-@@ -61,7 +61,7 @@
- endif
- 
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
+ STD=-std=c99 -pedantic
+@@ -49,7 +49,7 @@
+ # Override default settings if possible
+ -include .make-settings
  
- ifeq ($(MALLOC),tcmalloc)
-   FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -79,6 +79,9 @@
-   FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+@@ -85,6 +85,9 @@
+ 	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
  endif
  
 +FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0
@@ -28,15 +28,15 @@
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -103,6 +106,7 @@
- REDIS_SERVER_NAME= redis-server
- REDIS_SENTINEL_NAME= redis-sentinel
- REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o
+@@ -105,6 +108,7 @@
+ REDIS_SERVER_NAME=redis-server
+ REDIS_SENTINEL_NAME=redis-sentinel
+ REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o
 +REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME= redis-cli
- REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o
- REDIS_BENCHMARK_NAME= redis-benchmark
-@@ -157,7 +161,7 @@
+ REDIS_CLI_NAME=redis-cli
+ REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
+ REDIS_BENCHMARK_NAME=redis-benchmark
+@@ -159,7 +163,7 @@
  
  # redis-server
  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf
index d105b89a9e95..0ade1ddf1195 100644
--- a/databases/redis-devel/files/patch-redis.conf
+++ b/databases/redis-devel/files/patch-redis.conf
@@ -1,5 +1,5 @@
---- redis.conf.orig	2010-07-02 16:00:49.000000000 +0400
-+++ redis.conf	2010-07-02 16:01:46.000000000 +0400
+--- redis.conf.orig	2013-08-13 15:40:42.000000000 +0400
++++ redis.conf	2013-08-13 15:42:50.000000000 +0400
 @@ -14,11 +14,11 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -12,19 +12,19 @@
 -pidfile /var/run/redis.pid
 +pidfile %%REDIS_RUNDIR%%/redis.pid
  
- # Accept connections on the specified port, default is 6379
- port 6379
-@@ -42,7 +42,7 @@
- # Specify the log file name. Also 'stdout' can be used to force
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -71,7 +71,7 @@
+ # Specify the log file name. Also the emptry string can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
--logfile stdout
+-logfile ""
 +logfile %%REDIS_LOGDIR%%/redis.log
  
- # Set the number of databases. The default database is DB 0, you can select
- # a different one on a per-connection basis using SELECT <dbid> where
-@@ -86,7 +86,7 @@
- # Also the Append Only File will be created inside this directory.
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -155,7 +155,7 @@
+ # The Append Only File will also be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
 -dir ./
diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile
index 9641f2e4115f..af4557cfdbb0 100644
--- a/databases/redis-devel/files/patch-src-Makefile
+++ b/databases/redis-devel/files/patch-src-Makefile
@@ -1,21 +1,23 @@
---- src/Makefile.orig	2012-08-01 14:06:03.000000000 +0400
-+++ src/Makefile	2012-08-02 22:24:01.000000000 +0400
-@@ -50,6 +50,9 @@
-   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
-   FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread
-   DEBUG= -g -ggdb
-+else ifeq ($(uname_S),FreeBSD)
-+  FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+  FINAL_LDFLAGS= $(LDFLAGS)
- else
-   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
-   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
-@@ -79,7 +82,7 @@
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+--- src/Makefile.orig	2013-08-13 15:32:55.000000000 +0400
++++ src/Makefile	2013-08-13 15:35:00.000000000 +0400
+@@ -22,7 +22,7 @@
+ WARN=-Wall
+ OPT=$(OPTIMIZATION)
  
 -PREFIX?=/usr/local
-+PREFIX:=${PREFIX}
- INSTALL_BIN= $(PREFIX)/bin
- INSTALL= cp -pf
++PREFIX:=$(PREFIX)
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
  
+@@ -58,8 +58,9 @@
+ 	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)
++	FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++	FINAL_LDFLAGS= $(LDFLAGS)
+ else
+ 	FINAL_LDFLAGS+= -rdynamic
+ 	FINAL_LIBS+= -pthread
diff --git a/databases/redis-devel/files/patch-src-mkreleasehdr.sh b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
index 41eac24ceca2..898eca80bfdb 100644
--- a/databases/redis-devel/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
@@ -1,11 +1,11 @@
---- src/mkreleasehdr.sh.orig	2013-03-12 22:27:27.000000000 +0400
-+++ src/mkreleasehdr.sh	2013-03-12 22:27:37.000000000 +0400
+--- src/mkreleasehdr.sh.orig	2013-08-13 15:39:40.000000000 +0400
++++ src/mkreleasehdr.sh	2013-08-13 15:39:55.000000000 +0400
 @@ -1,6 +1,6 @@
  #!/bin/sh
 -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
 -GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
+ BUILD_ID=`uname -n`"-"`date +%s`
  test -f release.h || touch release.h
  (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
- (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date