The cookie files are indirectly made using *-cookie targets, so verify

that they are never being created more than once by inserting a check
into the *-cookie targets.

11 files changed, 24 insertions, 11 deletions

diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 66a648f6faf..18521ce8a6e 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.4 2006/07/06 17:22:13 jlam Exp $
+# $NetBSD: bsd.build.mk,v 1.5 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -42,5 +42,6 @@ build: configure build-cookie pkginstall
 ###
 .PHONY: build-cookie
 build-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_BUILD_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_BUILD_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_BUILD_COOKIE}
diff --git a/mk/build/test.mk b/mk/build/test.mk
index e085fb4030c..3d9e50a6e94 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.3 2006/07/06 17:39:36 jlam Exp $
+# $NetBSD: test.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
 #
 # TEST_DIRS is the list of directories in which to perform the build
 #	process.  If the directories are relative paths, then they
@@ -126,5 +126,6 @@ post-test:
 ###
 .PHONY: test-cookie
 test-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_TEST_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_TEST_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_TEST_COOKIE}
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk
index a29370c8190..fba595a90bc 100644
--- a/mk/configure/bsd.configure.mk
+++ b/mk/configure/bsd.configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to configuring packages for building.
@@ -38,5 +38,6 @@ configure: wrapper configure-cookie
 ###
 .PHONY: configure-cookie
 configure-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_CONFIGURE_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_CONFIGURE_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_CONFIGURE_COOKIE}
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index 8c5bed66c44..ab3e3d0b358 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.6 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.depends.mk,v 1.7 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -77,6 +77,7 @@ depends-clean:
 .PHONY: depends-cookie
 .if !target(depends-cookie)
 depends-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_DEPENDS_COOKIE}
 .endif
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index 8ef2a36cad4..e57bacff622 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.9 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: extract.mk,v 1.10 2006/07/06 22:29:52 jlam Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -119,6 +119,7 @@ extract-check-interactive:
 ###
 .PHONY: extract-cookie
 extract-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_EXTRACT_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_EXTRACT_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_EXTRACT_COOKIE}
 
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk
index 7e9ca172c18..faac2b30dba 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/flavor/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.7 2006/06/14 03:00:03 jlam Exp $
+# $NetBSD: depends.mk,v 1.8 2006/07/06 22:29:52 jlam Exp $
 
 _DEPENDS_FILE=		${WRKDIR}/.depends
 _REDUCE_DEPENDS_CMD=	${SETENV} CAT=${CAT:Q}				\
@@ -36,6 +36,8 @@ show-depends:
 ###
 .PHONY: depends-cookie
 depends-cookie: ${_DEPENDS_FILE}
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_DEPENDS_COOKIE}
 
 ${_DEPENDS_FILE}:
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index 2f8383259d6..ecae846f7d4 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.5 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.6 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -41,4 +41,6 @@ install: ${_PKGSRC_BUILD_TARGETS} install-cookie
 ###
 .PHONY: install-cookie
 install-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_INSTALL_COOKIE} || ${FALSE}
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_INSTALL_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_INSTALL_COOKIE}
diff --git a/mk/package/package.mk b/mk/package/package.mk
index 5a70008711c..36af5ef3deb 100644
--- a/mk/package/package.mk
+++ b/mk/package/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.12 2006/07/06 22:08:32 jlam Exp $
+# $NetBSD: package.mk,v 1.13 2006/07/06 22:29:53 jlam Exp $
 
 ######################################################################
 ### package (PUBLIC)
@@ -63,6 +63,7 @@ package-message:
 ###
 .PHONY: package-cookie
 package-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PACKAGE_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PACKAGE_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_PACKAGE_COOKIE}
 
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk
index 5d88487346a..e6e0b3e4589 100644
--- a/mk/patch/patch.mk
+++ b/mk/patch/patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.6 2006/07/05 22:21:03 jlam Exp $
+# $NetBSD: patch.mk,v 1.7 2006/07/06 22:29:53 jlam Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -108,6 +108,7 @@ patch-message:
 ###
 .PHONY: patch-cookie
 patch-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PATCH_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${TEST} -f ${_PATCH_APPLIED_FILE:Q}; then			\
 		${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_PATCH_COOKIE:Q};	\
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index e0d72d958fe..e564adca511 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.40 2006/07/05 22:21:03 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.41 2006/07/06 22:29:53 jlam Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,6 +115,7 @@ tools-message:
 ###
 .PHONY: tools-cookie
 tools-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_TOOLS_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_TOOLS_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${USE_TOOLS:Q} > ${_TOOLS_COOKIE}
 
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 83a69781e32..42d9e988f6a 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.46 2006/07/06 18:19:45 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.47 2006/07/06 22:29:53 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -824,5 +824,6 @@ post-wrapper:
 
 .PHONY: wrapper-cookie
 wrapper-cookie:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_WRAPPER_COOKIE} || ${FALSE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_WRAPPER_COOKIE:H}
 	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_WRAPPER_COOKIE}