kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This should not have been in either

Browse source
This commit is contained in:
Baptiste Daroussin 2013-06-10 08:22:34 +00:00
parent 4f36e07626
commit dfcbb8d250
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=320444
1 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Mk/bsd.options.mk
View file

@ -49,9 +49,7 @@
.if !defined(OPTIONSMKINCLUDED) .if !defined(OPTIONSMKINCLUDED)
OPTIONSMKINCLUDED= bsd.options.mk OPTIONSMKINCLUDED= bsd.options.mk
OPTIONS_NAME?= ${PKGORIGIN:S/\//_/}
OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options
OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options
#ALL_OPTIONS= DOCS \ #ALL_OPTIONS= DOCS \
# NLS # NLS
@ -178,7 +176,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
. endfor . endfor
# XXX To remove once UNIQUENAME will be removed
## Set the options specified per-port (set by user in make.conf) ## Set the options specified per-port (set by user in make.conf)
. for opt in ${${UNIQUENAME}_SET} . for opt in ${${UNIQUENAME}_SET}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) . if !empty(COMPLETE_OPTIONS_LIST:M${opt})
@ -191,22 +188,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
. for opt in ${${UNIQUENAME}_UNSET} . for opt in ${${UNIQUENAME}_UNSET}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
. endfor . 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})
PORT_OPTIONS+= ${opt}
. endif
. endfor
PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
## Unset the options excluded per-port (set by user in make.conf)
. for opt in ${${OPTIONS_NAME}_UNSET}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
. endfor
# XXX to remove once UNIQUENAME is removed
## options files (from dialog) ## options files (from dialog)
. if exists(${OPTIONSFILE}) && !make(rmconfig) . if exists(${OPTIONSFILE}) && !make(rmconfig)
. include "${OPTIONSFILE}" . include "${OPTIONSFILE}"
@ -214,15 +196,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
. if exists(${OPTIONSFILE}.local) . if exists(${OPTIONSFILE}.local)
. include "${OPTIONSFILE}.local" . include "${OPTIONSFILE}.local"
. endif . endif
# XXX to remove once UNIQUENAME is removed
## options files (from dialog)
. if exists(${OPTIONS_FILE}) && !make(rmconfig)
. include "${OPTIONS_FILE}"
. endif
. if exists(${OPTIONS_FILE}.local)
. include "${OPTIONS_FILE}.local"
. endif
### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile ### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
.for opt in ${ALL_OPTIONS} .for opt in ${ALL_OPTIONS}