From fa3eef274074b54c49e6a43f93c2d1f12aba6e4f Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 24 Feb 2011 19:57:41 +0000
Subject: [PATCH] Update to latest stable version 2.2.1. Remove CONFLICTS with
 redis-1. Remove NO_LATEST_LINK.

---
 databases/redis/Makefile | 5 ++---
 databases/redis/distinfo | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 71e3d1263ab0..142a736e5366 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	redis
-DISTVERSION=	2.2.0-rc4
+PORTVERSION=	2.2.1
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -17,11 +17,10 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-1.* redis-2.0.*
+CONFLICTS?=	redis-2.0.*
 
 USE_GMAKE=	yes
 USE_RC_SUBR=	redis.sh
-NO_LATEST_LINK=	yes
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
 		redis-cli redis-server
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index ef21051501d9..3944a1f93e4b 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.2.0-rc4.tar.gz) = 5f3398c0b6d8e01132ea07f2b3143193db0a1e4dc8408cc5bd789a1e97cffc85
-SIZE (redis-2.2.0-rc4.tar.gz) = 445431
+SHA256 (redis-2.2.1.tar.gz) = 509219fd656516152f2c11d5d4959238c2c86d0392f1443eaf56dec5e6642eda
+SIZE (redis-2.2.1.tar.gz) = 446179