diff options
| author | bapt <bapt@FreeBSD.org> | 2012-06-04 10:23:42 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-06-04 10:23:42 +0000 |
| commit | 2ec14440d3bf61c19059645a467a2ec579c1c816 (patch) | |
| tree | 06238e2e70bcc44b7b646f98e3efec886d0cf44a /Mk/bsd.options.mk | |
| parent | 8675377d4b42503f9194d8ae9dce2ac127964ff2 (diff) | |
| download | FreeBSD-ports-2ec14440d3bf61c19059645a467a2ec579c1c816.zip FreeBSD-ports-2ec14440d3bf61c19059645a467a2ec579c1c816.tar.gz | |
Fix loading of old options
Tested by: flo@, gelraen (via IRC)
Diffstat (limited to 'Mk/bsd.options.mk')
| -rw-r--r-- | Mk/bsd.options.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 89df399..ab3e3ee 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -17,7 +17,10 @@ OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options .if !defined(NOPORTDOCS) PORT_OPTIONS+= DOCS .endif + +.if !defined(WITHOUT_NLS) PORT_OPTIONS+= NLS +.endif # Set the default values for the global options, as defined by portmgr .if !defined(NOPORTEXAMPLES) @@ -107,6 +110,9 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . endfor ## options files (from dialog) +# unset the old WITH/WITHOUT +.for opt in ${ALL_OPTIONS} +.endfor . if exists(${OPTIONSFILE}) && !make(rmconfig) . include "${OPTIONSFILE}" . endif @@ -114,20 +120,16 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . include "${OPTIONSFILE}.local" . endif -# XXX(to be removed) -. if defined(OPTIONS) -. undef optname -. for O in ${OPTIONS:C/".*"//g} -. if defined(WITH_${O}) -PORT_OPTIONS+= ${O} +### 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_${O}) -PORT_OPTIONS:= ${PORT_OPTIONS:N${O}} -. endif -. endfor -. endif -# XXX(end to be removed) +.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} |
