From owner-svn-ports-head@FreeBSD.ORG  Wed Jul 18 17:21:58 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D0DED1065673;
	Wed, 18 Jul 2012 17:21:58 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC5EA8FC1B;
	Wed, 18 Jul 2012 17:21:58 +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 q6IHLwne093010;
	Wed, 18 Jul 2012 17:21:58 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6IHLw56093007;
	Wed, 18 Jul 2012 17:21:58 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201207181721.q6IHLw56093007@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Wed, 18 Jul 2012 17:21:58 +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: r301106 - in head/sysutils: lbl-cf lbl-hf
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2012 17:21:59 -0000

Author: rm
Date: Wed Jul 18 17:21:58 2012
New Revision: 301106
URL: http://svn.freebsd.org/changeset/ports/301106

Log:
  Remove CONFLICTS with security/bro. They are no more relevant.
  Pending update of security/bro to 2.0 depend on this two ports by default.
  
  This is non-functional change.

Modified:
  head/sysutils/lbl-cf/Makefile
  head/sysutils/lbl-hf/Makefile

Modified: head/sysutils/lbl-cf/Makefile
==============================================================================
--- head/sysutils/lbl-cf/Makefile	Wed Jul 18 17:18:25 2012	(r301105)
+++ head/sysutils/lbl-cf/Makefile	Wed Jul 18 17:21:58 2012	(r301106)
@@ -17,8 +17,6 @@ PKGNAMEPREFIX=	lbl-
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	Unix time to formated time and date filter
 
-CONFLICTS=	security/bro-1.*
-
 PLIST_FILES=	bin/cf
 
 MAN1=		cf.1

Modified: head/sysutils/lbl-hf/Makefile
==============================================================================
--- head/sysutils/lbl-hf/Makefile	Wed Jul 18 17:18:25 2012	(r301105)
+++ head/sysutils/lbl-hf/Makefile	Wed Jul 18 17:21:58 2012	(r301106)
@@ -21,7 +21,7 @@ COMMENT=	Address to hostname filter
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS=	hf-[0-9]* bro-1.[0-9]*
+CONFLICTS=	hf-[0-9]*
 
 PLIST_FILES=	bin/hf