From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 5 15:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 BF6BFC0D for ; Thu, 5 Dec 2013 15:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 919871395 for ; Thu, 5 Dec 2013 15:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5FK01S056555 for ; Thu, 5 Dec 2013 15:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB5FK0Fq056553; Thu, 5 Dec 2013 15:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 5 Dec 2013 15:20:00 GMT Resent-Message-Id: <201312051520.rB5FK0Fq056553@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mathieu Arnold Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F85BBFF for ; Thu, 5 Dec 2013 15:19:03 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 95541138D for ; Thu, 5 Dec 2013 15:19:00 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 0B814BDC24 for ; Thu, 5 Dec 2013 16:18:59 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id C3951BDC1D for ; Thu, 5 Dec 2013 16:18:58 +0100 (CET) Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225]) by gw.in.absolight.net (Postfix) with ESMTP id EFAB96113 for ; Thu, 5 Dec 2013 16:18:57 +0100 (CET) Received: by aragorn.in.absolight.net (Postfix, from userid 1000) id 91FBD14269C; Thu, 5 Dec 2013 16:18:57 +0100 (CET) Message-Id: <20131205151857.91FBD14269C@aragorn.in.absolight.net> Date: Thu, 5 Dec 2013 16:18:57 +0100 (CET) From: Mathieu Arnold To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/184519: [PATCH] security/broccoli: Fix build with python X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 15:20:00 -0000 >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 +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 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: