From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 19 13:25:00 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 31DBBA7E;
 Sat, 19 Oct 2013 13:25:00 +0000 (UTC)
 (envelope-from tabthorpe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0506B2A4F;
 Sat, 19 Oct 2013 13:25:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JDOx6Q047586;
 Sat, 19 Oct 2013 13:24:59 GMT
 (envelope-from tabthorpe@svn.freebsd.org)
Received: (from tabthorpe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JDOx64047584;
 Sat, 19 Oct 2013 13:24:59 GMT
 (envelope-from tabthorpe@svn.freebsd.org)
Message-Id: <201310191324.r9JDOx64047584@svn.freebsd.org>
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Sat, 19 Oct 2013 13:24:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330864 - in head/security/bro: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Sat, 19 Oct 2013 13:25:00 -0000

Author: tabthorpe
Date: Sat Oct 19 13:24:59 2013
New Revision: 330864
URL: http://svnweb.freebsd.org/changeset/ports/330864

Log:
  - Remove the real un-needed patch
  - Restore needed file
  - Bump PORTREVISION
  
  Submitted by:	maintainer
  Pointyhat to:	tabthorpe

Added:
  head/security/bro/files/patch-CMakeLists.txt   (contents, props changed)
Deleted:
  head/security/bro/files/patch-aux-broccoli-CMakeLists.txt
Modified:
  head/security/bro/Makefile

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Sat Oct 19 12:28:02 2013	(r330863)
+++ head/security/bro/Makefile	Sat Oct 19 13:24:59 2013	(r330864)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bro
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.bro-ids.org/downloads/release/
 

Added: head/security/bro/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bro/files/patch-CMakeLists.txt	Sat Oct 19 13:24:59 2013	(r330864)
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig	2013-03-12 19:08:46.000000000 -0700
++++ CMakeLists.txt	2013-03-12 19:09:12.000000000 -0700
+@@ -187,7 +187,7 @@
+ 
+ CheckOptionalBuildSources(aux/broctl   Broctl   INSTALL_BROCTL)
+ CheckOptionalBuildSources(aux/bro-aux  Bro-Aux  INSTALL_AUX_TOOLS)
+-CheckOptionalBuildSources(aux/broccoli Broccoli INSTALL_BROCCOLI)
++#CheckOptionalBuildSources(aux/broccoli Broccoli INSTALL_BROCCOLI)
+ 
+ ########################################################################
+ ## Packaging Setup
+@@ -225,7 +225,7 @@
+     "\nCXXFLAGS:          ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BuildType}}"
+     "\nCPP:               ${CMAKE_CXX_COMPILER}"
+     "\n"
+-    "\nBroccoli:          ${INSTALL_BROCCOLI}"
++#    "\nBroccoli:          ${INSTALL_BROCCOLI}"
+     "\nBroctl:            ${INSTALL_BROCTL}"
+     "\nAux. Tools:        ${INSTALL_AUX_TOOLS}"
+     "\n"