ports/185814: [PATCH] security/broccoli: Fix PYTHON for BRO_PREFIX case

[Craig Leres]

>Number:         185814
>Category:       ports
>Synopsis:       [PATCH] security/broccoli: Fix PYTHON for BRO_PREFIX case
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 15 22:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Craig Leres
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
System: FreeBSD fun.ee.lbl.gov 9.1-RELEASE FreeBSD 9.1-RELEASE #12 r27: Wed Oct 30 16:07:54 PDT 2013 leres at fun.ee.lbl.gov:/sys/amd64/compile/LBL amd64


	
>Description:
	Fix make package when BRO_PREFIX is defined and PYTHON is
	enabled.

>How-To-Repeat:
	If BRO_PREFIX is set to /usr/local/bro-2.2 in /etc/make.conf,
	the stage directory has files in PYTHONPREFIX_LIBDIR which
	is outside of what PREFIX is set to for this case.

>Fix:
	Install the python module in BRO_PREFIX and create links
	in PYTHON_SITELIBDIR.

	Also:

	    Update LICENSE
	    Use new *_DEPENDS format
	    Clean up possible .pyc file


--- patch.txt begins here ---
--- Makefile.orig	2013-12-24 04:25:18.000000000 -0800
+++ Makefile	2014-01-15 14:08:10.000000000 -0800
@@ -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 @@
 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 @@
 	# 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 !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX)
--- pkg-plist.orig	2013-12-14 04:25:19.000000000 -0800
+++ pkg-plist	2014-01-15 14:08:10.000000000 -0800
@@ -8,7 +8,12 @@
 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
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: