Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 15 Dec 2013 11:26:24 -0800 (PST)
From:      Craig Leres <leres@ee.lbl.gov>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        leres@ee.lbl.gov
Subject:   ports/184784: [PATCH] security/broccoli: Unbreak make package without PYTHON
Message-ID:  <201312151926.rBFJQOWM024143@fun.ee.lbl.gov>
Resent-Message-ID: <201312151930.rBFJU0EC091858@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312151926.rBFJQOWM024143>