svn commit: r342364 - branches/2014Q1/security/broccoli
Carlo Strub
cs at FreeBSD.org
Sun Feb 2 20:45:17 UTC 2014
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 <leres at ee.lbl.gov> (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 at 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
More information about the svn-ports-all
mailing list