Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -4083,10 +4083,11 @@
 		${FALSE}; \
 	fi; \
 	for dir in $${recursive_dirs}; do \
-		unset flavor; \
+		flavor=""; \
 		case $${dir} in \
+			*@*/*) ;; \
 			*@*) \
-				flavor=$${dir\#*@}; \
+				flavor="FLAVOR=$${dir\#*@}"; \
 				dir=$${dir%@*}; \
 				;; \
 		esac; \
@@ -4094,7 +4095,7 @@
 		/*) ;; \
 		*) dir=${PORTSDIR}/$$dir ;; \
 		esac; \
-		(cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} $${recursive_cmd}); \
+		(cd $$dir; ${SETENV} $${flavor} ${MAKE} $${recursive_cmd}); \
 	done
 
 # This script is shared among several dependency list variables.  See file for