From owner-svn-ports-all@freebsd.org Mon Sep 10 14:40:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B07A10919C5; Mon, 10 Sep 2018 14:40:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51374840E8; Mon, 10 Sep 2018 14:40:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C3EE1AEE; Mon, 10 Sep 2018 14:40:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8AEewqs016102; Mon, 10 Sep 2018 14:40:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8AEewkq016101; Mon, 10 Sep 2018 14:40:58 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201809101440.w8AEewkq016101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 10 Sep 2018 14:40:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479428 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 479428 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2018 14:40:58 -0000 Author: mat Date: Mon Sep 10 14:40:57 2018 New Revision: 479428 URL: https://svnweb.freebsd.org/changeset/ports/479428 Log: Do not enable options that do not exist. Differential Revision: https://reviews.freebsd.org/D13953 Modified: head/Mk/bsd.options.mk (contents, props changed) Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Sep 10 14:40:53 2018 (r479427) +++ head/Mk/bsd.options.mk Mon Sep 10 14:40:57 2018 (r479428) @@ -197,8 +197,6 @@ _OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700 package:300:pre package:500:do package:700:post \ stage:800:post -PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6 - # Add per arch options .for opt in ${OPTIONS_DEFINE_${ARCH}} .if empty(OPTIONS_DEFINE:M${opt}) @@ -223,11 +221,10 @@ _ALL_EXCLUDE+= ${opt} . endif .endfor -# Remove options the port maintainer doesn't want +# Remove options the port maintainer doesn't want, part 1 .for opt in ${_ALL_EXCLUDE:O:u} OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:N${opt}} OPTIONS_DEFINE:= ${OPTIONS_DEFINE:N${opt}} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . for otype in SINGLE RADIO MULTI GROUP . for m in ${OPTIONS_${otype}} OPTIONS_${otype}_${m}:= ${OPTIONS_${otype}_${m}:N${opt}} @@ -255,6 +252,18 @@ COMPLETE_OPTIONS_LIST= ${ALL_OPTIONS} . for m in ${OPTIONS_${otype}} COMPLETE_OPTIONS_LIST+= ${OPTIONS_${otype}_${m}} . endfor +.endfor + +# Some options are always enabled by default. +.for _opt in DOCS NLS EXAMPLES IPV6 +.if ${COMPLETE_OPTIONS_LIST:M${_opt}} +PORT_OPTIONS+= ${_opt} +.endif +.endfor + +# Remove options the port maintainer doesn't want, part 2 +.for opt in ${_ALL_EXCLUDE:O:u} +PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} .endfor ## Now create the list of activated options