Date: Fri, 7 Jun 2013 08:06:18 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320177 - head/Mk Message-ID: <201306070806.r5786Ifi011875@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jun 7 08:06:17 2013 New Revision: 320177 URL: http://svnweb.freebsd.org/changeset/ports/320177 Log: Do not automatically popup dialog in case only options from global options are defined Requested by: many Modified: head/Mk/bsd.options.mk head/Mk/bsd.port.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Fri Jun 7 08:00:38 2013 (r320176) +++ head/Mk/bsd.options.mk Fri Jun 7 08:06:17 2013 (r320177) @@ -54,6 +54,8 @@ OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME #ALL_OPTIONS= DOCS \ # NLS +GLOBAL_OPTIONS= DOCS NLS EXAMPLES IPV6 + # Set the default values for the global options, as defined by portmgr .if !defined(NOPORTDOCS) PORT_OPTIONS+= DOCS @@ -315,3 +317,8 @@ WITH_${opt}:= true .endfor .endif ### + +_OPTIONS_WITHOUT_GLOBALS:= ${COMPLETE_OPTIONS_LIST} +.for opt in ${GLOBAL_OPTIONS} +_OPTIONS_WITHOUT_GLOBALS:= ${_OPTIONS_WITHOUT_GLOBALS:N${opt}} +.endfor Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Jun 7 08:00:38 2013 (r320176) +++ head/Mk/bsd.port.mk Fri Jun 7 08:06:17 2013 (r320177) @@ -6180,7 +6180,7 @@ config-recursive: .if !target(config-conditional) config-conditional: pre-config -.if defined(COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG) +.if defined(COMPLETE_OPTIONS_LIST) && !empty(_OPTIONS_WITHOUT_GLOBALS) && !defined(NO_DIALOG) . if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O} @cd ${.CURDIR} && ${MAKE} do-config; . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306070806.r5786Ifi011875>