Revision: 21788
http://svnweb.midnightbsd.org/mports/?rev=21788
Author: laffer1
Date: 2016-08-20 23:08:02 -0400 (Sat, 20 Aug 2016)
Log Message:
-----------
change how we handle turning off items. this seems to fix the lcms2 port
Modified Paths:
--------------
trunk/Mk/components/options.mk
Modified: trunk/Mk/components/options.mk
===================================================================
--- trunk/Mk/components/options.mk 2016-08-21 02:33:21 UTC (rev 21787)
+++ trunk/Mk/components/options.mk 2016-08-21 03:08:02 UTC (rev 21788)
@@ -137,7 +137,6 @@
NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
. endif
. endfor
-PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
## Remove the options excluded system-wide (set by user in make.conf)
. for opt in ${OPTIONS_UNSET}
@@ -217,6 +216,7 @@
. for opt in ${OPTIONS_FILE_SET}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt})
PORT_OPTIONS+= ${opt}
+NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
. endif
. endfor
PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
@@ -223,6 +223,7 @@
.for opt in ${OPTIONS_FILE_UNSET}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
+NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
.endfor
.endif
@@ -232,6 +233,7 @@
.for opt in ${WITH}
. if !empty(COMPLETE_OPTIONS_LIST:M${opt})
PORT_OPTIONS+= ${opt}
+NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
. endif
.endfor
PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
@@ -238,6 +240,7 @@
.for opt in ${WITHOUT}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
+NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
.endfor
# Finally, add options required by slave ports
@@ -259,6 +262,7 @@
WITH_DEBUG= yes
.endif
+# TODO: deprecated
.if empty(PORT_OPTIONS:MNLS)
WITHOUT_NLS= yes
.endif
@@ -354,31 +358,6 @@
${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS}
. endif
. endfor
-. if defined(${opt}_CONFIGURE_DISABLE)
-. for iopt in ${${opt}_CONFIGURE_DISABLE}
-CONFIGURE_ARGS+= --disable-${iopt}
-. endfor
-. endif
-. if defined(${opt}_CONFIGURE_WITHOUT)
-. for iopt in ${${opt}_CONFIGURE_WITHOUT}
-CONFIGURE_ARGS+= --without-${iopt:C/=.*//}
-. endfor
-. endif
-. for configure in CONFIGURE CMAKE QMAKE
-. if defined(${opt}_${configure}_OFF)
-${configure}_ARGS+= ${${opt}_${configure}_OFF}
-. endif
-. endfor
-. for flags in ${_OPTIONS_FLAGS}
-. if defined(${opt}_${flags}_OFF)
-${flags}+= ${${opt}_${flags}_OFF}
-. endif
-. endfor
-. for deptype in ${_OPTIONS_DEPENDS}
-. if defined(${opt}_${deptype}_DEPENDS_OFF)
-${deptype}_DEPENDS+= ${${opt}_${deptype}_DEPENDS_OFF}
-. endif
-. endfor
. for target in ${_OPTIONS_TARGETS}
_target= ${target:C/:.*//}
_prio= ${target:C/.*:(.*):.*/\1/}
@@ -408,6 +387,12 @@
. if defined(${opt}_CONFIGURE_WITH)
CONFIGURE_ARGS+= ${${opt}_CONFIGURE_WITH:S/^/--without-/:C/=.*//}
. endif
+. if defined(${opt}_CMAKE_BOOL)
+CMAKE_ARGS+= ${${opt}_CMAKE_BOOL:C/.*/-D&:BOOL=false/}
+. endif
+. if defined(${opt}_CMAKE_BOOL_OFF)
+CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/}
+. endif
. for configure in CONFIGURE CMAKE QMAKE
. if defined(${opt}_${configure}_OFF)
${configure}_ARGS+= ${${opt}_${configure}_OFF}