Index: databases/Makefile
===================================================================
--- databases/Makefile	(revision 510963)
+++ databases/Makefile	(working copy)
@@ -832,6 +832,7 @@
     SUBDIR += py-queries
     SUBDIR += py-rb
     SUBDIR += py-redis
+    SUBDIR += py-redis2
     SUBDIR += py-riak
     SUBDIR += py-rrdtool_lgpl
     SUBDIR += py-sispy
Index: databases/py-redis/Makefile
===================================================================
--- databases/py-redis/Makefile	(revision 510963)
+++ databases/py-redis/Makefile	(working copy)
@@ -28,6 +28,7 @@
 GH_PROJECT=	${PORTNAME}-py
 
 NO_ARCH=	yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis2
 
 # Needs redis-server to be running
 do-test:
Index: databases/py-redis2/Makefile
===================================================================
--- databases/py-redis2/Makefile	(revision 510963)
+++ databases/py-redis2/Makefile	(working copy)
@@ -5,6 +5,7 @@
 PORTVERSION=	2.10.6
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Python client for Redis key-value store
@@ -28,6 +29,7 @@
 GH_PROJECT=	${PORTNAME}-py
 
 NO_ARCH=	yes
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis
 
 # Needs redis-server to be running
 do-test:
Index: databases/py-redis2/distinfo
===================================================================
Index: databases/py-redis2/pkg-descr
===================================================================
Index: databases/py-rb/Makefile
===================================================================
--- databases/py-rb/Makefile	(revision 510963)
+++ databases/py-rb/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rb
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis2>=2.6:databases/py-redis2@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
Index: devel/py-eventlib/Makefile
===================================================================
--- devel/py-eventlib/Makefile	(revision 510963)
+++ devel/py-eventlib/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	eventlib
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@
 		${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ejson>=0:devel/py-ejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}logan>=0.5.0:devel/py-logan@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}redis>=2.7.1:databases/py-redis@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}redis2>=2.7.1:databases/py-redis2@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils