From owner-svn-ports-branches@freebsd.org Mon Mar 12 19:05:30 2018 Return-Path: Delivered-To: svn-ports-branches@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 EB7DCF36FFD; Mon, 12 Mar 2018 19:05:29 +0000 (UTC) (envelope-from bdrewery@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 A0C256C2F1; Mon, 12 Mar 2018 19:05:29 +0000 (UTC) (envelope-from bdrewery@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 9BAE07B16; Mon, 12 Mar 2018 19:05:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2CJ5TgP056696; Mon, 12 Mar 2018 19:05:29 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2CJ5ToB056695; Mon, 12 Mar 2018 19:05:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201803121905.w2CJ5ToB056695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 12 Mar 2018 19:05:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r464274 - branches/2018Q1/Mk X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: branches/2018Q1/Mk X-SVN-Commit-Revision: 464274 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 19:05:30 -0000 Author: bdrewery Date: Mon Mar 12 19:05:29 2018 New Revision: 464274 URL: https://svnweb.freebsd.org/changeset/ports/464274 Log: MFH: r464273 FLAVORS: Reorder so the default is first. It is documented that the first FLAVOR is the default. Due to some use of DEFAULT_VERSIONS and USES, the default FLAVOR may be determined dynamically. Poudriere in particular expects the default to be first and does the wrong thing for emacs ports currently [1]. This resolves that and avoids other tools making the same mistake. PR: 225659 comment #14 Approved by: portmgr (implicit) Modified: branches/2018Q1/Mk/bsd.port.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/bsd.port.mk ============================================================================== --- branches/2018Q1/Mk/bsd.port.mk Mon Mar 12 19:04:59 2018 (r464273) +++ branches/2018Q1/Mk/bsd.port.mk Mon Mar 12 19:05:29 2018 (r464274) @@ -1488,6 +1488,11 @@ IGNORE= Unknown flavor '${FLAVOR}', possible flavors: FLAVOR= ${FLAVORS:[1]} .endif +# Reorder FLAVORS so the default is first if set by the port. +.if empty(_FLAVOR) && !empty(FLAVORS) && !empty(FLAVOR) +FLAVORS:= ${FLAVOR} ${FLAVORS:N${FLAVOR}} +.endif + .if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS) _DID_FLAVORS_HELPERS= yes _FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX