Attachment 139549 Details for Bug 185814 – patch.txt

patch.txt

patch.txt (text/plain), 2.06 KB, created by Craig Leres on 2014-01-15 22:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2014-01-15 22:30:00 UTC

Size: 2.06 KB

patch

obsolete

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

Actions: View

Attachments on bug 185814: 139549