ports/184519: [PATCH] security/broccoli: Fix build with python

[Mathieu Arnold]

>Number:         184519
>Category:       ports
>Synopsis:       [PATCH] security/broccoli: Fix build with python
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 05 15:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Mathieu Arnold
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
I started because it wasn't building right with python, and I ended up doing a
bit more...

- Install python bits in a sensible place.
- Install ruby bits in a sensible place.
- Convert to new OPTIONS framework.
- Remove dependency on Perl, nothing in the sources needs it.
- Use new LIB_DEPENDS format.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- broccoli-2.2_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 335671)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	broccoli
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.bro.org/downloads/release/
 DISTNAME=	bro-${PORTVERSION}
@@ -14,59 +15,45 @@
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 
-EXTRACT_AFTER_ARGS= ${DISTNAME}/aux/broccoli
+EXTRACT_AFTER_ARGS=	${DISTNAME}/aux/broccoli
 
-USES=		cmake:outsource perl5
+USES=		cmake:outsource
 USE_LDCONFIG=	yes
-NO_MTREE=	yes
 CMAKE_SOURCE_PATH=	${WRKSRC}/aux/broccoli
 
 .if defined(BRO_PREFIX)
 PREFIX=${BRO_PREFIX}
 PLIST_SUB+=	CLEANUP_PREFIX=""
-NEED_ROOT=	yes
+NO_MTREE=	yes
 .else
 PLIST_SUB+=	CLEANUP_PREFIX="@comment "
 .endif
 CMAKE_ARGS+=	-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \
-		-D PY_MOD_INSTALL_DIR:PATH=${PREFIX}
+		-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc
 
 OPTIONS_DEFINE=	DEBUG PYTHON RUBY
+OPTIONS_SUB=
 
 DEBUG_DESC=	Compile in debugging mode
 PYTHON_DESC=	Build python bindings for broccoli
 RUBY_DESC=	Build ruby bindings for broccoli
 
-.include <bsd.port.options.mk>
+DEBUG_CMAKE_ON=	-D ENABLE_DEBUG:BOOL=true
+PYTHON_USE=	python=yes
+PYTHON_CMAKE_ON=	-D PY_MOD_INSTALL_DIR:PATH=${PYTHON_SITELIBDIR}
+PYTHON_CMAKE_OFF=	-D DISABLE_PYTHON_BINDINGS:BOOL=true
+RUBY_USE=	ruby=yes
+RUBY_CMAKE_ON=	-D RB_INSTALL_DIR:PATH=${RUBY_SITELIBDIR} \
+		-D RB_ARCH_INSTALL_DIR:PATH=${RUBY_SITEARCHLIBDIR}
+RUBY_CMAKE_OFF=		-D DISABLE_RUBY_BINDINGS:BOOL=true
 
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=		-D ENABLE_DEBUG:BOOL=true
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		yes
-PLIST_SUB+=		PYTHON=""
-.else
-CMAKE_ARGS+=		-D DISABLE_PYTHON_BINDINGS:BOOL=true
-PLIST_SUB+=		PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=		yes
-PLIST_SUB+=		RUBY=""
-.else
-CMAKE_ARGS+=		-D DISABLE_RUBY_BINDINGS:BOOL=true
-PLIST_SUB+=		RUBY="@comment "
-.endif
-
-post-stage::
+post-install::
 .if defined(BRO_PREFIX)
-	@${MKDIR} ${PREFIX}
+	@${MKDIR} ${STAGEDIR}${PREFIX}
 .endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
-	@${INSTALL_SCRIPT} ${WRKSRC}/aux/broccoli/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
+	@${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 335671)
+++ pkg-plist	(working copy)
@@ -7,9 +7,14 @@
 lib/libbroccoli.so
 lib/libbroccoli.so.5
 lib/libbroccoli.so.5.1.0
-%%PYTHON%%lib/python/_broccoli_intern.so
-%%PYTHON%%lib/python/broccoli.py
-%%RUBY%%lib/ruby/broccoli_ext.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_broccoli_intern.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/broccoli.py
+%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/connection.rb
+%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/event.rb
+%%RUBY%%%%RUBY_SITELIBDIR%%/Broccoli/record.rb
+%%RUBY%%%%RUBY_SITELIBDIR%%/broccoli.rb
+%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/broccoli_ext.so
+%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%/Broccoli
 %%CLEANUP_PREFIX%%@dirrmtry lib
 %%CLEANUP_PREFIX%%@dirrmtry include
 %%CLEANUP_PREFIX%%@dirrmtry etc
--- broccoli-2.2_1.patch ends here ---

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