View | Details | Raw Unified | Return to bug 227276
Collapse All | Expand All

(-)portmaster (-6 / +7 lines)
Lines 1284-1293 Link Here
1284
			fail "Empty origin in $package"
1284
			fail "Empty origin in $package"
1285
		origin=${origin#@comment ORIGIN:}
1285
		origin=${origin#@comment ORIGIN:}
1286
		origin=${origin#origin: }
1286
		origin=${origin#origin: }
1287
		flavor=`pkg query -F $package "%At:%Av" 2>/dev/null | awk -F: '/^flavor:/ {print $2}'`
1287
1288
1288
		if [ -z "$PM_INDEX" ]; then
1289
		if [ -z "$PM_INDEX" ]; then
1289
			if pm_isdir_pd "$origin"; then
1290
			if pm_isdir_pd "$origin"; then
1290
				pm_cd $pd/$origin && port_ver=`pm_make -V PKGNAME`
1291
				pm_cd $pd/$origin && port_ver=`export FLAVOR=$flavor; pm_make -V PKGNAME`
1291
				[ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?"
1292
				[ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?"
1292
			else
1293
			else
1293
				echo "===>>> The origin for ${package##*/} ($origin) is missing"
1294
				echo "===>>> The origin for ${package##*/} ($origin) is missing"
Lines 1462-1468 Link Here
1462
	portdir=$(dir_part "$1")
1463
	portdir=$(dir_part "$1")
1463
	flavor=$(flavor_part "$1")
1464
	flavor=$(flavor_part "$1")
1464
	if pm_cd_pd $portdir; then
1465
	if pm_cd_pd $portdir; then
1465
		new_port=`FLAVOR=$flavor pm_make -V PKGNAME`
1466
		new_port=`export FLAVOR=$flavor; pm_make -V PKGNAME`
1466
	else
1467
	else
1467
		new_port=`parse_index $portdir name` ||
1468
		new_port=`parse_index $portdir name` ||
1468
			fail "No entry for $portdir in $PM_INDEX"
1469
			fail "No entry for $portdir in $PM_INDEX"
Lines 1512-1518 Link Here
1512
				fail "Cannot cd to port directory: $pd/$origin"
1513
				fail "Cannot cd to port directory: $pd/$origin"
1513
			fi
1514
			fi
1514
		fi
1515
		fi
1515
		port_ver=`FLAVOR=$flavor pm_make -V PKGNAME`
1516
		port_ver=`export FLAVOR=$flavor; pm_make -V PKGNAME`
1516
		[ -z "$port_ver" ] && fail "Is $pd/$origin/Makefile missing?"
1517
		[ -z "$port_ver" ] && fail "Is $pd/$origin/Makefile missing?"
1517
	elif [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ]; then
1518
	elif [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ]; then
1518
		find_moved_port $origin $iport $nf
1519
		find_moved_port $origin $iport $nf
Lines 2447-2453 Link Here
2447
			conflicts=''
2448
			conflicts=''
2448
			pm_cd "$pd/$dir" || fail "Cannot cd to $dir"
2449
			pm_cd "$pd/$dir" || fail "Cannot cd to $dir"
2449
			if grep -ql ^CONFLICTS Makefile ; then
2450
			if grep -ql ^CONFLICTS Makefile ; then
2450
				conflicts=`FLAVOR=$flavor pm_make_b -V CONFLICTS -V CONFLICTS_BUILD -V CONFLICTS_INSTALL`	 
2451
				conflicts=`export FLAVOR=$flavor; pm_make_b -V CONFLICTS -V CONFLICTS_BUILD -V CONFLICTS_INSTALL`	 
2451
			fi
2452
			fi
2452
			for glob in $conflicts; do
2453
			for glob in $conflicts; do
2453
				confl_p=`pkg query -g "%n-%v" $glob 2>/dev/null`
2454
				confl_p=`pkg query -g "%n-%v" $glob 2>/dev/null`
Lines 3902-3911 Link Here
3902
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
3903
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
3903
	for dir in $post_clean_l; do
3904
	for dir in $post_clean_l; do
3904
		pm_v "===>>> Running 'make clean' for special build dependency $dir"
3905
		pm_v "===>>> Running 'make clean' for special build dependency $dir"
3905
		(FLAVOR=$(flavor_part $portdir) pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
3906
		(export FLAVOR=$(flavor_part $portdir); pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
3906
	done
3907
	done
3907
	pm_v "===>>> Running 'make clean' in the background"
3908
	pm_v "===>>> Running 'make clean' in the background"
3908
	(FLAVOR=$(flavor_part $portdir) pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
3909
	(export FLAVOR=$(flavor_part $portdir); pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
3909
	pm_v
3910
	pm_v
3910
fi
3911
fi
3911
if [ -n "$ro_opd" ]; then
3912
if [ -n "$ro_opd" ]; then

Return to bug 227276