Date: Wed, 25 Jul 2012 23:24:27 +0200 From: Olli Hauer <ohauer@FreeBSD.org> To: freebsd-ports <freebsd-ports@FreeBSD.org> Cc: bapt@freebsd.org, Scot Hetzel <swhetzel@gmail.com>, Oliver Fromme <olli@lurza.secnetix.de> Subject: Re: Question about new options framework (regression?) Message-ID: <5010640B.6070107@FreeBSD.org> In-Reply-To: <CACdU%2Bf_RW6eWdW9sZsTDfx7bz7L54u5C6qj-e9cBy714WM6KQA@mail.gmail.com> References: <20120725155932.GA13771@ithaqua.etoilebsd.net> <201207251709.q6PH9mpJ086314@lurza.secnetix.de> <CACdU%2Bf_RW6eWdW9sZsTDfx7bz7L54u5C6qj-e9cBy714WM6KQA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2012-07-25 20:18, Scot Hetzel wrote:
> On Wed, Jul 25, 2012 at 12:09 PM, Oliver Fromme <olli@lurza.secnetix.de> wrote:
The following diff will restore the old behavior so make.conf and command params have priority.
(Place the make.conf part after the OPTIONS_FILE_SET part)
Until now I cannot see why the OPTIONS file should always win.
Index: bsd.options.mk
===================================================================
--- bsd.options.mk (revision 301530)
+++ bsd.options.mk (working copy)
@@ -173,17 +173,6 @@
. include "${OPTIONSFILE}.local"
. endif
-### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
-.for opt in ${ALL_OPTIONS}
-.if defined(WITH_${opt})
-PORT_OPTIONS+= ${opt}
-PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
-.endif
-.if defined(WITHOUT_${opt})
-PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
-.endif
-.endfor
-
## Finish by using the options set by the port config dialog, if any
. for opt in ${OPTIONS_FILE_SET}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt})
@@ -199,6 +188,17 @@
.endif
+### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
+.for opt in ${ALL_OPTIONS}
+.if defined(WITH_${opt})
+PORT_OPTIONS+= ${opt}
+PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
+.endif
+.if defined(WITHOUT_${opt})
+PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
+.endif
+.endfor
+
## Now some compatibility
.if empty(PORT_OPTIONS:MDOCS)
NOPORTDOCS= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5010640B.6070107>