From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 19 17:29:30 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDC78106566C;
	Thu, 19 Jul 2012 17:29:30 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B82598FC08;
	Thu, 19 Jul 2012 17:29:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6JHTUZJ003359;
	Thu, 19 Jul 2012 17:29:30 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6JHTUki003353;
	Thu, 19 Jul 2012 17:29:30 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201207191729.q6JHTUki003353@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 19 Jul 2012 17:29:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301170 - in head/databases: . redis redis-devel
	redis-scripting
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jul 2012 17:29:31 -0000

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"