svn commit: r301106 - in head/sysutils: lbl-cf lbl-hf

[Ruslan Mahmatkhanov]

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 at 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