svn commit: r301170 - in head/databases: . redis redis-devel redis-scripting

[Sergey A. Osokin]

Author: osa
Date: Thu Jul 19 17:29:30 2012
New Revision: 301170
URL: http://svn.freebsd.org/changeset/ports/301170

Log:
  Remove databases/redis-scripting, use databases/redis-devel instead.
  Update CONFLICTS for databases/redis and databases/redis-devel.

Deleted:
  head/databases/redis-scripting/
Modified:
  head/databases/Makefile
  head/databases/redis-devel/Makefile
  head/databases/redis/Makefile

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Thu Jul 19 17:29:14 2012	(r301169)
+++ head/databases/Makefile	Thu Jul 19 17:29:30 2012	(r301170)
@@ -751,7 +751,6 @@
     SUBDIR += rdfdb
     SUBDIR += redis
     SUBDIR += redis-devel
-    SUBDIR += redis-scripting
     SUBDIR += rrdman
     SUBDIR += rrdtool
     SUBDIR += rrdtool10

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Thu Jul 19 17:29:14 2012	(r301169)
+++ head/databases/redis-devel/Makefile	Thu Jul 19 17:29:30 2012	(r301170)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/deve
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-2.4.* redis-scripting-2.*
+CONFLICTS?=	redis-2.4.*
 
 USE_GMAKE=	yes
 MAKE_ENV=	"V=yo"

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Thu Jul 19 17:29:14 2012	(r301169)
+++ head/databases/redis/Makefile	Thu Jul 19 17:29:30 2012	(r301170)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/deve
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-scripting-2.*
+CONFLICTS?=	redis-devel-2.6.*
 
 USE_GMAKE=	yes
 MAKE_ENV=	"V=yo"