From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 15 19:30: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 C280B2D3 for ; Sun, 15 Dec 2013 19:30: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 9D5E51B22 for ; Sun, 15 Dec 2013 19:30: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 rBFJU065091859 for ; Sun, 15 Dec 2013 19:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBFJU0EC091858; Sun, 15 Dec 2013 19:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 15 Dec 2013 19:30:00 GMT Resent-Message-Id: <201312151930.rBFJU0EC091858@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, Craig Leres 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 72A39FAA for ; Sun, 15 Dec 2013 19:26:26 +0000 (UTC) Received: from fun.ee.lbl.gov (fun.ee.lbl.gov [IPv6:2620:83:8000:102::ca]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D5691B05 for ; Sun, 15 Dec 2013 19:26:26 +0000 (UTC) Received: from fun.ee.lbl.gov (localhost [127.0.0.1]) by fun.ee.lbl.gov (8.14.7/8.14.7) with ESMTP id rBFJQOlI024144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 15 Dec 2013 11:26:24 -0800 (PST) Received: (from leres@localhost) by fun.ee.lbl.gov (8.14.7/8.14.7/Submit) id rBFJQOWM024143; Sun, 15 Dec 2013 11:26:24 -0800 (PST) Message-Id: <201312151926.rBFJQOWM024143@fun.ee.lbl.gov> Date: Sun, 15 Dec 2013 11:26:24 -0800 (PST) From: Craig Leres To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/184784: [PATCH] security/broccoli: Unbreak make package without PYTHON Cc: leres@ee.lbl.gov X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Craig Leres List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:30:00 -0000 >Number: 184784 >Category: ports >Synopsis: [PATCH] security/broccoli: Unbreak make package without PYTHON >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: Sun Dec 15 19:30:00 UTC 2013 >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@fun.ee.lbl.gov:/sys/amd64/compile/LBL amd64 >Description: >How-To-Repeat: # bsd.python.mk isn't PREFIX-safe yet. mv: rename /home/u2/FreeBSD-current/ports/security/broccoli/work/stage to /home/u2/FreeBSD-current/ports/security/broccoli/work/stage/stage: Invalid argument *** Error code 1 Stop in /home/u2/FreeBSD-current/ports/security/broccoli. *** Error code 1 Stop in /home/u2/FreeBSD-current/ports/security/broccoli. >Fix: --- patch.txt begins here --- --- Makefile.orig 2013-12-15 11:15:25.000000000 -0800 +++ Makefile 2013-12-15 11:20:41.000000000 -0800 @@ -59,7 +59,7 @@ .endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc @${MV} ${STAGEDIR}${PREFIX}/etc/broccoli.conf ${STAGEDIR}${PREFIX}/etc/broccoli.conf.example -.if defined(BRO_PREFIX) +.if !empty(${PORT_OPTIONS:MPYTHON}) && defined(BRO_PREFIX) # bsd.python.mk isn't PREFIX-safe yet. @${MV} ${STAGEDIR}${PYTHON_LIBDIR} ${STAGEDIR}${PYTHON_LIBDIR:S/${LOCALBASE}/${PREFIX}/} .endif --- patch.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: