Index: bsd.port.mk
===================================================================
--- bsd.port.mk	(revision 466839)
+++ bsd.port.mk	(working copy)
@@ -1660,10 +1660,10 @@
 CONFIGURE_ENV+=	PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}"
 .endif
 
-.if empty(FLAVOR)
+.if !empty(FLAVOR) && !empty(FLAVORS)
+_WRKDIR=	work-${FLAVOR}
+.else
 _WRKDIR=	work
-.else
-_WRKDIR=	work-${FLAVOR}
 .endif
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
@@ -3801,7 +3801,7 @@
 clean: ${CLEAN_DEPENDENCIES}
 .endif
 
-.if !empty(_FLAVOR)
+.if !empty(_FLAVOR) && !empty(FLAVORS)
 _CLEANFLAVORS=	${_FLAVOR}
 .else
 _CLEANFLAVORS=	${FLAVORS}