From owner-svn-ports-all@freebsd.org Mon Sep 10 13:16:29 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 A153A108F7E2; Mon, 10 Sep 2018 13:16:29 +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 4A31680677; Mon, 10 Sep 2018 13:16:28 +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 D4E1CD48; Mon, 10 Sep 2018 13:16:27 +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 w8ADGRWB073484; Mon, 10 Sep 2018 13:16:27 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8ADGR6f073483; Mon, 10 Sep 2018 13:16:27 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201809101316.w8ADGR6f073483@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 13:16:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479410 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 479410 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 13:16:29 -0000 Author: mat Date: Mon Sep 10 13:16:27 2018 New Revision: 479410 URL: https://svnweb.freebsd.org/changeset/ports/479410 Log: Only set %%PORTDOCS%%/%%PORTEXAMPLES%% if a DOCS/EXAMPLES option is defined. PR: 230864 Submitted by: mat exp-runs by: antoine Differential Revision: https://reviews.freebsd.org/D13651 Modified: head/Mk/bsd.options.mk (contents, props changed) Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Sep 10 13:16:24 2018 (r479409) +++ head/Mk/bsd.options.mk Mon Sep 10 13:16:27 2018 (r479410) @@ -410,18 +410,19 @@ PORT_OPTIONS+= ${OPTIONS_SLAVE} # Sort options and eliminate duplicates PORT_OPTIONS:= ${PORT_OPTIONS:O:u} -## Now some compatibility -.if empty(PORT_OPTIONS:MDOCS) -PLIST_SUB+= PORTDOCS="@comment " -.else -PLIST_SUB+= PORTDOCS="" -.endif +_REALLY_ALL_POSSIBLE_OPTIONS:= ${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE} +_REALLY_ALL_POSSIBLE_OPTIONS:= ${_REALLY_ALL_POSSIBLE_OPTIONS:O:u} -.if empty(PORT_OPTIONS:MEXAMPLES) -PLIST_SUB+= PORTEXAMPLES="@comment " -.else -PLIST_SUB+= PORTEXAMPLES="" -.endif +# Handle PORTDOCS and PORTEXAMPLES +.for _type in DOCS EXAMPLES +. if !empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type}) +. if empty(PORT_OPTIONS:M${_type}) +PLIST_SUB+= PORT${_type}="@comment " +. else +PLIST_SUB+= PORT${_type}="" +. endif +. endif +.endfor .if defined(NO_OPTIONS_SORT) ALL_OPTIONS= ${OPTIONS_DEFINE} @@ -431,7 +432,7 @@ ALL_OPTIONS= ${OPTIONS_DEFINE} _OPTIONS_${target}?= .endfor -.for opt in ${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE:O:u} +.for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS} # PLIST_SUB PLIST_SUB?= SUB_LIST?=