diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
| commit | 21a283f3bec444388d1448f993783ec673a06502 (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 /Mk/bsd.options.mk | |
| parent | cda45bfa8a05d49eb690397ab1b7facd622490a7 (diff) | |
| download | ports-21a283f3bec444388d1448f993783ec673a06502.tar.gz ports-21a283f3bec444388d1448f993783ec673a06502.zip | |
Notes
Diffstat (limited to 'Mk/bsd.options.mk')
| -rw-r--r-- | Mk/bsd.options.mk | 49 |
1 files changed, 8 insertions, 41 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 7a198af8dd04..19a5b924ec93 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -127,7 +127,6 @@ OPTIONSMKINCLUDED= bsd.options.mk OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} -OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ @@ -244,22 +243,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -274,14 +257,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX to remove once UNIQUENAME is removed -## options files (from dialog) -. if exists(${OPTIONSFILE}) && !make(rmconfig) -. include "${OPTIONSFILE}" -. endif -. sinclude "${OPTIONSFILE}.local" -# XXX to remove once UNIQUENAME is removed - ## options files (from dialog) . if exists(${OPTIONS_FILE}) && !make(rmconfig) . include "${OPTIONS_FILE}" @@ -303,6 +278,14 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} .endif .endfor +_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} +.for _k in SET UNSET SET_FORCE UNSET_FORCE +.if defined(${_OPTIONS_UNIQUENAME}_${_k}) +WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:" +WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" +.endif +.endfor + .if defined(OPTIONS_WARNINGS) WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}" WARNING+= "If you added them on the command line, you should replace them by" @@ -355,22 +338,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET_FORCE} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET_FORCE} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET_FORCE} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) |