On 2012-07-25 20:18, Scot Hetzel wrote:
> On Wed, Jul 25, 2012 at 12:09 PM, Oliver Fromme <o...@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
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
