svn commit: r458395 - branches/2018Q1/Mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Jan  8 00:25:28 2018
New Revision: 458395
URL: https://svnweb.freebsd.org/changeset/ports/458395

Log:
  MFH: r458394
  
  Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set.
  
  The helpers were being evaluated before the default FLAVOR was set. The
  helpers worked fine if the FLAVOR was specified by the user but not if
  it was left to the default value. Resolve this by moving the helpers
  right after the default FLAVOR is set.
  
  PR:		224879
  exp-run by:	antoine
  Approved by:	portmgr (implicit)
  Differential Revision:	https://reviews.freebsd.org/D13756

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 Jan  8 00:24:48 2018	(r458394)
+++ branches/2018Q1/Mk/bsd.port.mk	Mon Jan  8 00:25:28 2018	(r458395)
@@ -1089,34 +1089,6 @@ _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} 
 # Do not leak flavors to childs make
 .MAKEOVERRIDES:=	${.MAKEOVERRIDES:NFLAVOR}
 
-.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
-_DID_FLAVORS_HELPERS=	yes
-_FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
-_FLAVOR_HELPERS_APPEND=	 	CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
-							PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
-							FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \
-							RUN_DEPENDS TEST_DEPENDS
-# These overwrite the current value
-.for v in ${_FLAVOR_HELPERS_OVERRIDE}
-.if defined(${FLAVOR}_${v})
-${v}=	${${FLAVOR}_${v}}
-.endif
-.endfor
-
-# These append to the current value
-.for v in ${_FLAVOR_HELPERS_APPEND}
-.if defined(${FLAVOR}_${v})
-${v}+=	${${FLAVOR}_${v}}
-.endif
-.endfor
-
-.for v in BROKEN IGNORE
-.if defined(${FLAVOR}_${v})
-${v}=	flavor "${FLAVOR}" ${${FLAVOR}_${v}}
-.endif
-.endfor
-.endif # defined(${FLAVOR})
-
 .if defined(CROSS_TOOLCHAIN)
 .if !defined(CROSS_SYSROOT)
 IGNORE=	CROSS_SYSROOT should be defined
@@ -1515,6 +1487,35 @@ IGNORE=	Unknown flavor '${FLAVOR}', possible flavors: 
 .if !empty(FLAVORS) && empty(FLAVOR)
 FLAVOR=	${FLAVORS:[1]}
 .endif
+
+.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
+_DID_FLAVORS_HELPERS=	yes
+_FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
+_FLAVOR_HELPERS_APPEND=	 	CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
+							PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
+							FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \
+							RUN_DEPENDS TEST_DEPENDS
+# These overwrite the current value
+.for v in ${_FLAVOR_HELPERS_OVERRIDE}
+.if defined(${FLAVOR}_${v})
+${v}=	${${FLAVOR}_${v}}
+.endif
+.endfor
+
+# These append to the current value
+.for v in ${_FLAVOR_HELPERS_APPEND}
+.if defined(${FLAVOR}_${v})
+${v}+=	${${FLAVOR}_${v}}
+.endif
+.endfor
+
+.for v in BROKEN IGNORE
+.if defined(${FLAVOR}_${v})
+${v}=	flavor "${FLAVOR}" ${${FLAVOR}_${v}}
+.endif
+.endfor
+.endif # defined(${FLAVOR})
+
 
 EXTRACT_SUFX?=			.tar.gz