From 6489697c3407e2ee698be85da0a0595675ab55c3 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 24 Feb 2011 19:53:09 +0000
Subject: [PATCH] Update CONFLICTS after removing redis-1.*. Add
 NO_LATEST_LINK.

Bump RORTREVISION.
---
 databases/redis2/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/databases/redis2/Makefile b/databases/redis2/Makefile
index 5f9b8dac15ce..5d529a17ff71 100644
--- a/databases/redis2/Makefile
+++ b/databases/redis2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	redis
-PORTREVISION=	1
 DISTVERSION=	2.0.4
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -18,10 +18,11 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-1.* redis-2.2.*
+CONFLICTS?=	redis-2.2.*
 
 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