Date: Mon, 12 Mar 2018 19:04:59 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464273 - head/Mk Message-ID: <201803121904.w2CJ4x2J056536@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Mar 12 19:04:59 2018 New Revision: 464273 URL: https://svnweb.freebsd.org/changeset/ports/464273 Log: 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: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Mar 12 18:52:53 2018 (r464272) +++ head/Mk/bsd.port.mk Mon Mar 12 19:04:59 2018 (r464273) @@ -1492,6 +1492,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803121904.w2CJ4x2J056536>