pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Removed _INTERACTIVE_COOKIE, after asking on tech-p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7a31fa96b32b
branches: trunk
changeset: 536007:7a31fa96b32b
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Dec 01 11:11:53 2007 +0000
description:
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.
diffstat:
mk/bsd.pkg.mk | 3 +--
mk/build/build.mk | 5 ++---
mk/build/test.mk | 5 ++---
mk/bulk/bsd.bulk-pkg.mk | 10 +---------
mk/configure/configure.mk | 5 ++---
mk/extract/extract.mk | 5 ++---
mk/fetch/fetch.mk | 3 +--
mk/install/install.mk | 3 +--
8 files changed, 12 insertions(+), 27 deletions(-)
diffs (158 lines):
diff -r e979c0a1769f -r 7a31fa96b32b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/bsd.pkg.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
# 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 -r e979c0a1769f -r 7a31fa96b32b mk/build/build.mk
--- a/mk/build/build.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/build/build.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
@${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 -r e979c0a1769f -r 7a31fa96b32b mk/build/test.mk
--- a/mk/build/test.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/build/test.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
@${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 -r e979c0a1769f -r 7a31fa96b32b mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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@localhost>
@@ -431,11 +431,6 @@
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 @@
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 -r e979c0a1769f -r 7a31fa96b32b mk/configure/configure.mk
--- a/mk/configure/configure.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/configure/configure.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
@${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 -r e979c0a1769f -r 7a31fa96b32b mk/extract/extract.mk
--- a/mk/extract/extract.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/extract/extract.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
@${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 -r e979c0a1769f -r 7a31fa96b32b mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/fetch/fetch.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
${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 -r e979c0a1769f -r 7a31fa96b32b mk/install/install.mk
--- a/mk/install/install.mk Sat Dec 01 10:56:31 2007 +0000
+++ b/mk/install/install.mk Sat Dec 01 11:11:53 2007 +0000
@@ -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 @@
@${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}
Home |
Main Index |
Thread Index |
Old Index