From owner-svn-ports-branches@FreeBSD.ORG Sun Feb 2 20:45:17 2014 Return-Path: Delivered-To: svn-ports-branches@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 ESMTPS id 3F648958; Sun, 2 Feb 2014 20:45:17 +0000 (UTC) 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 1FC6E1CE9; Sun, 2 Feb 2014 20:45:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12KjG6K061499; Sun, 2 Feb 2014 20:45:16 GMT (envelope-from cs@svn.freebsd.org) Received: (from cs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12KjGJ3061497; Sun, 2 Feb 2014 20:45:16 GMT (envelope-from cs@svn.freebsd.org) Message-Id: <201402022045.s12KjGJ3061497@svn.freebsd.org> From: Carlo Strub Date: Sun, 2 Feb 2014 20:45:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r342364 - branches/2014Q1/security/broccoli X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2014 20:45:17 -0000 Author: cs Date: Sun Feb 2 20:45:16 2014 New Revision: 342364 URL: http://svnweb.freebsd.org/changeset/ports/342364 QAT: https://qat.redports.org/buildarchive/r342364/ Log: MFH: r342076 Fix make package when BRO_PREFIX is defined and PYTHON is enabled. PR: ports/185814 Submitted by: Craig Leres (maintainer) Approved by: portmgr Modified: branches/2014Q1/security/broccoli/Makefile branches/2014Q1/security/broccoli/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/broccoli/Makefile ============================================================================== --- branches/2014Q1/security/broccoli/Makefile Sun Feb 2 20:16:51 2014 (r342363) +++ branches/2014Q1/security/broccoli/Makefile Sun Feb 2 20:45:16 2014 (r342364) @@ -3,7 +3,7 @@ PORTNAME= broccoli PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ DISTNAME= bro-${PORTVERSION} @@ -11,10 +11,10 @@ DISTNAME= bro-${PORTVERSION} MAINTAINER= leres@ee.lbl.gov COMMENT= The Bro Client Communications Library -LICENSE= BSD +LICENSE= BSD3CLAUSE -BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - swig:${PORTSDIR}/devel/swig13 +BUILD_DEPENDS= ${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison \ + ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP EXTRACT_AFTER_ARGS= ${DISTNAME}/aux/broccoli @@ -57,6 +57,10 @@ post-install:: # pkg_install needs PREFIX in order to make a package from STAGEDIR/PREFIX. @${MKDIR} ${PREFIX} .endif +.if defined(BRO_PREFIX) && empty(${PORT_OPTIONS:MPYTHON}) + # Move lib/pythonX.X tree into BRO_PREFIX + ${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PREFIX}/lib +.endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example .if defined(BRO_PREFIX) Modified: branches/2014Q1/security/broccoli/pkg-plist ============================================================================== --- branches/2014Q1/security/broccoli/pkg-plist Sun Feb 2 20:16:51 2014 (r342363) +++ branches/2014Q1/security/broccoli/pkg-plist Sun Feb 2 20:45:16 2014 (r342364) @@ -8,7 +8,12 @@ lib/libbroccoli.so lib/libbroccoli.so.5 lib/libbroccoli.so.5.1.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so +%%PYTHON%%@exec ln -f %%PREFIX%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so +%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/_broccoli_intern.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py +%%PYTHON%%@exec ln -f %%PREFIX%%/%%PYTHON_SITELIBDIR%%/broccoli.py %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py +%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.py +%%PYTHON%%@unexec rm -f %%LOCALBASE%%/%%PYTHON_SITELIBDIR%%/broccoli.pyc %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/event.rb %%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/record.rb