diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-04-02 22:41:20 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-04-02 22:41:20 +0000 |
| commit | 14489fef6b99b23a7c4cd090c09883665e0f742d (patch) | |
| tree | b8bec65ea75238b256af95c981fc5de0a856c3a0 /Mk | |
| parent | - Remove now unused tcl81 category, add new categories tcl and tk (diff) | |
- Fix handling of OPTIONS default values when configuration files wasn't
written yet (make depends, make describe), and for options missing from
existing configuration files
PR: ports/96777
Submitted by: rafan (in follow-up)
Tested on: pointyhat exp-run
Notes
Notes:
svn path=/head/; revision=189049
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index ae5e60ba2327..230e9f7137b5 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1273,7 +1273,13 @@ UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options _OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" .if defined(OPTIONS) -. if defined(PACKAGE_BUILDING) || (defined(BATCH) && !exists(${_OPTIONSFILE})) +# include OPTIONSFILE first if exists +. if exists(${_OPTIONSFILE}) && !make(rmconfig) +. include "${_OPTIONSFILE}" +. endif +. if exists(${_OPTIONSFILE}.local) +. include "${_OPTIONSFILE}.local" +. endif WITHOUT:= WITH:= . if defined(OPTIONS) @@ -1289,23 +1295,21 @@ WITH:= ${WITH} ${OPT} OPT:=${RO} . endfor . endif +# define only if NO WITH/WITHOUT_${W} is defined . for W in ${WITH} +. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) WITH_${W}:= true +. endif . endfor . for W in ${WITHOUT} +. if !defined(WITH_${W}) && !defined(WITHOUT_${W}) WITHOUT_${W}:= true +. endif . endfor . undef WITH . undef WITHOUT . undef RO . undef REALOPTIONS -. endif -. if exists(${_OPTIONSFILE}) && !make(rmconfig) -. include "${_OPTIONSFILE}" -. endif -. if exists(${_OPTIONSFILE}.local) -. include "${_OPTIONSFILE}.local" -. endif .endif .endif |