Removed _INTERACTIVE_COOKIE, after asking on tech-pkg if anyone needs

it. It had only been used to change the "nerrors" variable in bulk
builds, but this variable is not used further anyway.

8 files changed, 12 insertions, 27 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9884570265b..882f9dde2ed 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1928 2007/10/13 11:04:16 dsl Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1929 2007/12/01 11:11:53 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -248,7 +248,6 @@ _NONZERO_FILESIZE_P=	${AWK} 'END { exit (NR > 0) ? 0 : 1; }'
 # Automatically increase process limit where necessary for building.
 _ULIMIT_CMD=		${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@}
 
-_INTERACTIVE_COOKIE=	${.CURDIR}/.interactive_stage
 _NULL_COOKIE=		${WRKDIR}/.null
 
 # Miscellaneous overridable commands:
diff --git a/mk/build/build.mk b/mk/build/build.mk
index b8b15cb02d3..5ec43257f52 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.14 2007/11/30 18:54:40 rillig Exp $
+# $NetBSD: build.mk,v 1.15 2007/12/01 11:11:54 rillig Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -125,8 +125,7 @@ build-check-interactive:
 	@${ERROR_MSG} "The build stage of this package requires user interaction"
 	@${ERROR_MSG} "Please build manually with:"
 	@${ERROR_MSG} "    \"cd ${.CURDIR} && ${MAKE} build\""
-	@${TOUCH} ${_INTERACTIVE_COOKIE}
-	@${FALSE}
+	${RUN} ${FALSE}
 .else
 	@${DO_NADA}
 .endif
diff --git a/mk/build/test.mk b/mk/build/test.mk
index d66ad8256d4..a0f31ea7396 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.12 2007/03/15 22:54:24 rillig Exp $
+# $NetBSD: test.mk,v 1.13 2007/12/01 11:11:54 rillig Exp $
 #
 # After the "build" phase, many packages provide some sort of self-test
 # that can be run on the not-yet installed package. To enable these
@@ -112,8 +112,7 @@ test-check-interactive:
 	@${ERROR_MSG} "The test stage of this package requires user interaction"
 	@${ERROR_MSG} "Please test manually with:"
 	@${ERROR_MSG} "    \"cd ${.CURDIR} && ${MAKE} test\""
-	@${TOUCH} ${_INTERACTIVE_COOKIE}
-	@${FALSE}
+	${RUN} ${FALSE}
 .else
 	@${DO_NADA}
 .endif
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 8a47b4b98cc..46f08de57e3 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.144 2007/06/15 22:28:53 wiz Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.145 2007/12/01 11:11:55 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -431,11 +431,6 @@ bulk-package:
 				fi ;\
 			done ;\
 		fi ;\
-		if [ -f ${_INTERACTIVE_COOKIE} ]; then \
-			${BULK_MSG} "Removing old marker for INTERACTIVE_STAGE..." ; \
-			${ECHO_MSG} ${RM} -f ${_INTERACTIVE_COOKIE} ; \
-			${DO}       ${RM} -f ${_INTERACTIVE_COOKIE} ; \
-		fi ;\
 		${ECHO_MSG} ${MAKE} package '(${PKGNAME})' 2>&1 ; \
 		${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} package; \
 		${ECHO} "";						\
@@ -521,9 +516,6 @@ bulk-package:
 				fi ;\
 			fi ;\
 			nerrors=`${GREP} -c '^\*\*\* Error code' ${_BROKENFILE:Q} || true`; \
-			if [ -f ${_INTERACTIVE_COOKIE} ]; then \
-				nerrors="0"; \
-			fi; \
 			${ECHO} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${BULKFILESDIR:Q}/${BROKENFILE:Q} \
 			) 2>&1 | ${TEE} -a ${_BROKENFILE:Q}; \
 		fi ; \
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk
index 340ab4a8cf6..3f8566c663c 100644
--- a/mk/configure/configure.mk
+++ b/mk/configure/configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.19 2007/11/01 08:37:24 rillig Exp $
+# $NetBSD: configure.mk,v 1.20 2007/12/01 11:11:55 rillig Exp $
 #
 # = Package-settable variables =
 #
@@ -151,8 +151,7 @@ configure-check-interactive:
 	@${ERROR_MSG} "The configure stage of this package requires user interaction"
 	@${ERROR_MSG} "Please configure manually with:"
 	@${ERROR_MSG} "    \"cd ${.CURDIR} && ${MAKE} configure\""
-	@${TOUCH} ${_INTERACTIVE_COOKIE}
-	@${FALSE}
+	${RUN} ${FALSE}
 .else
 	@${DO_NADA}
 .endif
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index ddc68ce8ad1..a836a2dba56 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.20 2007/07/31 17:42:40 jlam Exp $
+# $NetBSD: extract.mk,v 1.21 2007/12/01 11:11:55 rillig Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -118,8 +118,7 @@ extract-check-interactive:
 	@${ERROR_MSG} "The extract stage of this package requires user interaction"
 	@${ERROR_MSG} "Please extract manually with:"
 	@${ERROR_MSG} "    \"cd ${.CURDIR} && ${MAKE} extract\""
-	@${TOUCH} ${_INTERACTIVE_COOKIE}
-	@${FALSE}
+	${RUN} ${FALSE}
 .else
 	@${DO_NADA}
 .endif
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk
index b248f1fa28b..6ff7ef4ed09 100644
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.31 2007/12/01 10:56:31 rillig Exp $
+# $NetBSD: fetch.mk,v 1.32 2007/12/01 11:11:56 rillig Exp $
 
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -166,7 +166,6 @@ fetch-check-interactive: .USEBEFORE
 		${ERROR_MSG} "See the following URL for more details:";	\
 		${ERROR_MSG} "    "${HOMEPAGE:Q};			\
 	fi;								\
-	${TOUCH} ${_INTERACTIVE_COOKIE};				\
 	exit 1
 .elif defined(FETCH_MESSAGE) && !empty(FETCH_MESSAGE)
 	@${TEST} ! -f ${.TARGET} || exit 0;				\
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 3d344ff0e2f..4e787bd6104 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.47 2007/09/13 09:44:58 rillig Exp $
+# $NetBSD: install.mk,v 1.48 2007/12/01 11:11:56 rillig Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -102,7 +102,6 @@ install-check-interactive: .PHONY
 	@${ERROR_MSG} "The installation stage of this package requires user interaction"
 	@${ERROR_MSG} "Please install manually with:"
 	@${ERROR_MSG} "	\"cd ${.CURDIR} && ${MAKE} install\""
-	${RUN} ${TOUCH} ${_INTERACTIVE_COOKIE}
 	${RUN} ${FALSE}
 .else
 	@${DO_NADA}