--- portmaster.orig2	2018-03-30 20:31:59.540200000 +0900
+++ portmaster	2018-03-30 20:36:59.116119000 +0900
@@ -1284,10 +1284,11 @@
 			fail "Empty origin in $package"
 		origin=${origin#@comment ORIGIN:}
 		origin=${origin#origin: }
+		flavor=`pkg query -F $package "%At:%Av" 2>/dev/null | awk -F: '/^flavor:/ {print $2}'`
 
 		if [ -z "$PM_INDEX" ]; then
 			if pm_isdir_pd "$origin"; then
-				pm_cd $pd/$origin && port_ver=`pm_make -V PKGNAME`
+				pm_cd $pd/$origin && port_ver=`export FLAVOR=$flavor; pm_make -V PKGNAME`
 				[ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?"
 			else
 				echo "===>>> The origin for ${package##*/} ($origin) is missing"
@@ -1462,7 +1463,7 @@
 	portdir=$(dir_part "$1")
 	flavor=$(flavor_part "$1")
 	if pm_cd_pd $portdir; then
-		new_port=`FLAVOR=$flavor pm_make -V PKGNAME`
+		new_port=`export FLAVOR=$flavor; pm_make -V PKGNAME`
 	else
 		new_port=`parse_index $portdir name` ||
 			fail "No entry for $portdir in $PM_INDEX"
@@ -1512,7 +1513,7 @@
 				fail "Cannot cd to port directory: $pd/$origin"
 			fi
 		fi
-		port_ver=`FLAVOR=$flavor pm_make -V PKGNAME`
+		port_ver=`export FLAVOR=$flavor; pm_make -V PKGNAME`
 		[ -z "$port_ver" ] && fail "Is $pd/$origin/Makefile missing?"
 	elif [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ]; then
 		find_moved_port $origin $iport $nf
@@ -2447,7 +2448,7 @@
 			conflicts=''
 			pm_cd "$pd/$dir" || fail "Cannot cd to $dir"
 			if grep -ql ^CONFLICTS Makefile ; then
-				conflicts=`FLAVOR=$flavor pm_make_b -V CONFLICTS -V CONFLICTS_BUILD -V CONFLICTS_INSTALL`	 
+				conflicts=`export FLAVOR=$flavor; pm_make_b -V CONFLICTS -V CONFLICTS_BUILD -V CONFLICTS_INSTALL`	 
 			fi
 			for glob in $conflicts; do
 				confl_p=`pkg query -g "%n-%v" $glob 2>/dev/null`
@@ -3902,10 +3903,10 @@
 if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
 	for dir in $post_clean_l; do
 		pm_v "===>>> Running 'make clean' for special build dependency $dir"
-		(FLAVOR=$(flavor_part $portdir) pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
+		(export FLAVOR=$(flavor_part $portdir); pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
 	done
 	pm_v "===>>> Running 'make clean' in the background"
-	(FLAVOR=$(flavor_part $portdir) pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
+	(export FLAVOR=$(flavor_part $portdir); pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
 	pm_v
 fi
 if [ -n "$ro_opd" ]; then