Update from 2.4.17 to latest stable version 2.6.2.

Feature safe:	yes

6 files changed, 34 insertions, 50 deletions

diff --git a/databases/redis/files/patch-deps::Makefile b/databases/redis/files/patch-deps::Makefile
new file mode 100644
index 000000000000..793a03c9bc61
--- /dev/null
+++ b/databases/redis/files/patch-deps::Makefile
@@ -0,0 +1,17 @@
+--- deps/Makefile.orig	2012-07-02 04:18:07.000000000 +0400
++++ deps/Makefile	2012-07-02 04:18:56.000000000 +0400
+@@ -58,12 +58,12 @@
+   LUA_CFLAGS= -D__C99FEATURES__=1
+ endif
+ 
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS)
+ LUA_LDFLAGS+= $(LDFLAGS)
+ 
+ lua: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
++	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
+ 
+ .PHONY: lua
+ 
diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile
index 92197663ac82..b0cfcd406885 100644
--- a/databases/redis/files/patch-deps::hiredis::Makefile
+++ b/databases/redis/files/patch-deps::hiredis::Makefile
@@ -20,8 +20,8 @@
  endif
 +ifeq ($(uname_S),FreeBSD)
 +  CFLAGS?=$(CFLAGS)
-+  CCLINK?=$(PTHREAD_LIBS)
-+  LDFLAGS?=$(LDFLAGS)
++  CCLINK?=-pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
 +  DYLIBNAME?=libhiredis.so
 +  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
 +  STLIBNAME?=libhiredis.a
diff --git a/databases/redis/files/patch-deps::linenoise::Makefile b/databases/redis/files/patch-deps::linenoise::Makefile
deleted file mode 100644
index de4181edbd6c..000000000000
--- a/databases/redis/files/patch-deps::linenoise::Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
- 
- linenoise_example: linenoise.o example.o
--	$(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o
-+	$(CC) $(CFLAGS) -o linenoise_example linenoise.o example.o
- 
- .c.o:
--	$(CC) $(ARCH) -c -Wall -W -Os -g $<
-+	$(CC) $(CFLAGS) -c $<
- 
- clean:
- 	rm -f linenoise_example *.o
diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
index 1d51eecd7743..9641f2e4115f 100644
--- a/databases/redis/files/patch-src::Makefile
+++ b/databases/redis/files/patch-src::Makefile
@@ -1,24 +1,21 @@
---- src/Makefile.orig	2012-05-28 11:14:39.000000000 +0400
-+++ src/Makefile	2012-05-28 11:15:45.000000000 +0400
-@@ -28,6 +28,9 @@
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
-   CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
-   DEBUG?=-g -ggdb
+--- 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)
-+  CFLAGS?= $(CFLAGS)
-+  CCLINK?= $(LDFLAGS)
++  FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++  FINAL_LDFLAGS= $(LDFLAGS)
  else
-   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
-   CCLINK?=-lm -pthread
-@@ -52,9 +55,9 @@
-   ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
- endif
- 
--CCOPT= $(CFLAGS) $(ARCH) $(PROF)
-+CCOPT= $(CFLAGS) $(PROF)
+   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)
  
 -PREFIX?=/usr/local
-+PREFIX:= ${PREFIX}
++PREFIX:=${PREFIX}
  INSTALL_BIN= $(PREFIX)/bin
  INSTALL= cp -pf
  
diff --git a/databases/redis/files/patch-src::redis.c b/databases/redis/files/patch-src::redis.c
deleted file mode 100644
index 87f2777936ff..000000000000
--- a/databases/redis/files/patch-src::redis.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/redis.c.orig	2011-11-28 14:22:08.000000000 +0400
-+++ src/redis.c	2011-12-02 06:23:15.000000000 +0400
-@@ -1685,7 +1685,11 @@
- #ifdef HAVE_BACKTRACE
- static void *getMcontextEip(ucontext_t *uc) {
- #if defined(__FreeBSD__)
--    return (void*) uc->uc_mcontext.mc_eip;
-+  #if __x86_64__
-+    return (void*) uc->uc_mcontext.mc_rip;
-+  #elif __i386__
-+    return (void*) uc->uc_mcontext.mc_eip;
-+  #endif
- #elif defined(__dietlibc__)
-     return (void*) uc->uc_mcontext.eip;
- #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
diff --git a/databases/redis/files/redis.in b/databases/redis/files/redis.in
index 70bf3a691bc3..0e232f79f251 100644
--- a/databases/redis/files/redis.in
+++ b/databases/redis/files/redis.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="redis"
-rcvar=redis_enable
+rcvar=`set_rcvar`
 
 extra_commands="reload"