From 811231a38c6f9edb9019c85ec101279a1555d298 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 4 Apr 2015 16:12:09 +0200
Subject: [PATCH 2/2] Remove support for NO_STAGE

---
 src/share/poudriere/common.sh | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index a0a171e..ad63a2b 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -1970,7 +1970,6 @@ _real_build_port() {
 	local listfilecmd network
 	local hangstatus
 	local pkgenv phaseenv jpkg
-	local no_stage=$(injail make -C ${portdir} -VNO_STAGE)
 	local targets install_order
 	local jailuser
 	local testfailure=0
@@ -1992,23 +1991,19 @@ _real_build_port() {
 
 	# Must install run-depends as 'actual-package-depends' and autodeps
 	# only consider installed packages as dependencies
-	if [ -n "${no_stage}" ]; then
-		install_order="run-depends install-mtree install package"
-	else
-		jailuser=root
-		if [ "${BUILD_AS_NON_ROOT}" = "yes" ] &&
-		    [ -z "$(injail make -C ${portdir} -VNEED_ROOT)" ]; then
-			jailuser=${PORTBUILD_USER}
-			chown -R ${jailuser} ${mnt}/wrkdirs
-		fi
-		# XXX: run-depends can come out of here with some bsd.port.mk
-		# changes. Easier once pkg_install is EOL.
-		install_order="run-depends stage package"
-		# Don't need to install if only making packages and not
-		# testing.
-		[ -n "${PORTTESTING}" ] && \
-		    install_order="${install_order} install-mtree install"
+	jailuser=root
+	if [ "${BUILD_AS_NON_ROOT}" = "yes" ] &&
+	    [ -z "$(injail make -C ${portdir} -VNEED_ROOT)" ]; then
+		jailuser=${PORTBUILD_USER}
+		chown -R ${jailuser} ${mnt}/wrkdirs
 	fi
+	# XXX: run-depends can come out of here with some bsd.port.mk
+	# changes. Easier once pkg_install is EOL.
+	install_order="run-depends stage package"
+	# Don't need to install if only making packages and not
+	# testing.
+	[ -n "${PORTTESTING}" ] && \
+	    install_order="${install_order} install-mtree install"
 	targets="check-sanity pkg-depends fetch-depends fetch checksum \
 		  extract-depends extract patch-depends patch build-depends \
 		  lib-depends configure build ${install_order} \
@@ -2023,7 +2018,6 @@ _real_build_port() {
 	for phase in ${targets}; do
 		max_execution_time=${MAX_EXECUTION_TIME}
 		phaseenv=
-		[ -z "${no_stage}" ] && JUSER=${jailuser}
 		bset_job_status "${phase}" "${port}"
 		job_msg_verbose "Status for build ${COLOR_PORT}${port}${COLOR_RESET}: ${COLOR_PHASE}${phase}"
 		[ -n "${PORTTESTING}" ] && \
@@ -2070,17 +2064,6 @@ _real_build_port() {
 			;;
 		package)
 			max_execution_time=3600
-			if [ -n "${PORTTESTING}" ] &&
-			    [ -z "${no_stage}" ]; then
-				check_fs_violation ${mnt} prestage "${port}" \
-				    "Checking for staging violations" \
-				    "Filesystem touched during stage (files must install to \${STAGEDIR}):" \
-				    "stage_fs_violation" || if [ "${PORTTESTING_FATAL}" != "no" ]; then
-					return 1
-				else
-					testfailure=2
-				fi
-			fi
 			;;
 		deinstall)
 			max_execution_time=3600
-- 
2.3.4