From dc4070b05d80b7060e4c5703c2cf69fc7a2258ba Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sat, 6 Oct 2012 13:54:19 +0000
Subject: Update from 2.6.0rc7 to 2.6.0rc8. Add TEST option for running unit
 tests. Add test and regression-test targets. Remove needless patch. New
 Makefile header convention.

PR:	172396

<ChangeLog>

* [BUGFIX]   Fixed compilation on FreeBSD.
* [IMPROVED] SRANDMEMBER <count> that returns multiple random elements.
* [IMPROVED] Sentinel backported to 2.6. It will be taken in sync with 2.8.
* [IMPROVED] Helper function for scripting to return errors and status replies.
* [IMPROVED] SORT by nosort [ASC|DESC] uses sorted set elements ordering.
* [BUGFIX]   Better resistence to system clock skew.
* [IMPROVED] Warn the user when the configured maxmemory seems odd.
* [BUGFIX]   Hashing function is now murmurhash2 for security purposes.
* [IMPROVED] Install script no longer uses a template but redis.conf itself.

</ChangeLog>
---
 databases/redis-devel/Makefile                     | 22 ++++++++++++++++------
 databases/redis-devel/distinfo                     |  4 ++--
 .../redis-devel/files/patch-src::replication.c     | 10 ----------
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 databases/redis-devel/files/patch-src::replication.c

(limited to 'databases')

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 950a29c469bc..84bc2ce855eb 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	redis
-# Date created:	   03 Jul 2009
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	redis
-DISTVERSION=	2.6.0-rc7
+DISTVERSION=	2.6.0-rc8
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-devel
@@ -18,6 +14,15 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
+OPTIONS_DEFINE=	TESTS
+TESTS_DESC=	Install lang/tcl for redis unit tests
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+USE_TCL_BUILD=	yes
+.endif
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
 
@@ -64,4 +69,9 @@ post-install:
 	[ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d}
 .endfor
 
+test: build
+	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
+
+regression-test: test
+
 .include <bsd.port.mk>
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 78338be92e56..2af14d5e71e7 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.0-rc7.tar.gz) = 538e68479465b074497c1e76df70e40a61e6cfcb5e8f9dce5eaabc5448eedd43
-SIZE (redis-2.6.0-rc7.tar.gz) = 973045
+SHA256 (redis-2.6.0-rc8.tar.gz) = e3b843c960cb2d6512f208181880b4cb42877368f457d1df7af808918b97e36c
+SIZE (redis-2.6.0-rc8.tar.gz) = 999715
diff --git a/databases/redis-devel/files/patch-src::replication.c b/databases/redis-devel/files/patch-src::replication.c
deleted file mode 100644
index 3b99f53c2d6d..000000000000
--- a/databases/redis-devel/files/patch-src::replication.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/replication.c.orig	2012-09-19 10:46:28.000000000 +0400
-+++ src/replication.c	2012-09-19 10:47:01.000000000 +0400
-@@ -1,5 +1,7 @@
- #include "redis.h"
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
- #include <fcntl.h>
-- 
cgit v1.2.3