pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Rename <phase>_COOKIE variables to _COOKIE.<phase>....
details: https://anonhg.NetBSD.org/pkgsrc/rev/460421753aad
branches: trunk
changeset: 515779:460421753aad
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jul 07 21:24:27 2006 +0000
description:
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private
variables so there are no user-visible changes. This change just makes
it a little easier to write for loops.
diffstat:
mk/bsd.pkg.barrier.mk | 12 ++++++------
mk/bsd.pkg.mk | 4 ++--
mk/build/bsd.build.mk | 16 ++++++++--------
mk/build/build.mk | 14 +++++++-------
mk/build/test.mk | 20 ++++++++++----------
mk/buildlink3/bsd.buildlink3.mk | 4 ++--
mk/configure/bsd.configure.mk | 14 +++++++-------
mk/configure/configure.mk | 14 +++++++-------
mk/depends/bsd.depends-vars.mk | 4 ++--
mk/depends/bsd.depends.mk | 14 +++++++-------
mk/depends/depends.mk | 12 ++++++------
mk/extract/extract.mk | 20 ++++++++++----------
mk/flavor/pkg/depends.mk | 12 ++++++------
mk/flavor/pkg/install.mk | 4 ++--
mk/flavor/pkg/metadata.mk | 6 +++---
mk/flavor/pkg/replace.mk | 12 ++++++------
mk/install/bsd.install.mk | 14 +++++++-------
mk/install/install.mk | 20 ++++++++++----------
mk/install/replace.mk | 4 ++--
mk/package/bsd.package.mk | 10 +++++-----
mk/package/package.mk | 20 ++++++++++----------
mk/patch/patch.mk | 20 ++++++++++----------
mk/plist/print-plist.mk | 6 +++---
mk/tools/bsd.tools.mk | 20 ++++++++++----------
mk/wrapper/bsd.wrapper.mk | 24 ++++++++++++------------
25 files changed, 160 insertions(+), 160 deletions(-)
diffs (truncated from 1006 to 300 lines):
diff -r 8ad255d6f8e3 -r 460421753aad mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/bsd.pkg.barrier.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.5 2006/07/06 22:17:57 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.6 2006/07/07 21:24:27 jlam Exp $
-_BARRIER_COOKIE= ${WRKDIR}/.barrier_cookie
+_COOKIE.barrier= ${WRKDIR}/.barrier_cookie
# _BARRIER_PRE_TARGETS is a list of the targets that must be built before
# the "barrier" target invokes a new make.
@@ -38,7 +38,7 @@
### target invokes a new make should be listed in _BARRIER_POST_TARGETS,
### and should be of the form:
###
-### .if !exists(${_BARRIER_COOKIE})
+### .if !exists(${_COOKIE.barrier})
### foo: barrier
### .else
### foo: foo's real source dependencies
@@ -49,8 +49,8 @@
###
.PHONY: barrier
-barrier: ${_BARRIER_PRE_TARGETS} ${_BARRIER_COOKIE}
-.if !exists(${_BARRIER_COOKIE})
+barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
+.if !exists(${_COOKIE.barrier})
. if defined(PKG_VERBOSE)
@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
. endif
@@ -65,6 +65,6 @@
######################################################################
### barrier-cookie creates the "barrier" cookie file.
###
-${_BARRIER_COOKIE}:
+${_COOKIE.barrier}:
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${.TARGET}
diff -r 8ad255d6f8e3 -r 460421753aad mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/bsd.pkg.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1865 2006/07/07 15:59:06 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1866 2006/07/07 21:24:27 jlam Exp $
#
# This file is in the public domain.
#
@@ -653,7 +653,7 @@
# Disable checksum
.PHONY: checksum
-.if (defined(NO_CHECKSUM) || exists(${_EXTRACT_COOKIE})) && !target(checksum)
+.if (defined(NO_CHECKSUM) || exists(${_COOKIE.extract})) && !target(checksum)
checksum: fetch
@${DO_NADA}
.endif
diff -r 8ad255d6f8e3 -r 460421753aad mk/build/bsd.build.mk
--- a/mk/build/bsd.build.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/build/bsd.build.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.6 2006/07/07 13:06:45 seb Exp $
+# $NetBSD: bsd.build.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to building sources for a package.
@@ -13,8 +13,8 @@
# pre-test, do-test, post-test
#
-_BUILD_COOKIE= ${WRKDIR}/.build_done
-_TEST_COOKIE= ${WRKDIR}/.test_done
+_COOKIE.build= ${WRKDIR}/.build_done
+_COOKIE.test= ${WRKDIR}/.test_done
######################################################################
### build (PUBLIC)
@@ -25,10 +25,10 @@
.if !defined(NO_BUILD)
. include "${PKGSRCDIR}/mk/build/build.mk"
.elif !target(build)
-. if exists(${_BUILD_COOKIE})
+. if exists(${_COOKIE.build})
build:
@${DO_NADA}
-. elif exists(${_BARRIER_COOKIE})
+. elif exists(${_COOKIE.barrier})
build: configure build-cookie pkginstall
. else
build: barrier
@@ -44,6 +44,6 @@
###
.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}
+ ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.build} || ${FALSE}
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.build:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.build}
diff -r 8ad255d6f8e3 -r 460421753aad mk/build/build.mk
--- a/mk/build/build.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/build/build.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: build.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $
#
# BUILD_MAKE_FLAGS is the list of arguments that is passed to the make
# process.
@@ -17,16 +17,16 @@
_BUILD_TARGETS+= check-vulnerable
_BUILD_TARGETS+= configure
_BUILD_TARGETS+= acquire-build-lock
-_BUILD_TARGETS+= ${_BUILD_COOKIE}
+_BUILD_TARGETS+= ${_COOKIE.build}
_BUILD_TARGETS+= release-build-lock
_BUILD_TARGETS+= pkginstall
.PHONY: build
.if !target(build)
-. if exists(${_BUILD_COOKIE})
+. if exists(${_COOKIE.build})
build:
@${DO_NADA}
-. elif exists(${_BARRIER_COOKIE})
+. elif exists(${_COOKIE.barrier})
build: ${_BUILD_TARGETS}
. else
build: barrier
@@ -37,11 +37,11 @@
acquire-build-lock: acquire-lock
release-build-lock: release-lock
-.if exists(${_BUILD_COOKIE})
-${_BUILD_COOKIE}:
+.if exists(${_COOKIE.build})
+${_COOKIE.build}:
@${DO_NADA}
.else
-${_BUILD_COOKIE}: real-build
+${_COOKIE.build}: real-build
.endif
######################################################################
diff -r 8ad255d6f8e3 -r 460421753aad mk/build/test.mk
--- a/mk/build/test.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/build/test.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: test.mk,v 1.5 2006/07/07 21:24:28 jlam Exp $
#
# TEST_DIRS is the list of directories in which to perform the build
# process. If the directories are relative paths, then they
@@ -22,15 +22,15 @@
_TEST_TARGETS+= check-vulnerable
_TEST_TARGETS+= build
_TEST_TARGETS+= acquire-test-lock
-_TEST_TARGETS+= ${_TEST_COOKIE}
+_TEST_TARGETS+= ${_COOKIE.test}
_TEST_TARGETS+= release-test-lock
.PHONY: test
.if !target(test)
-. if exists(${_TEST_COOKIE})
+. if exists(${_COOKIE.test})
test:
@${DO_NADA}
-. elif exists(${_BARRIER_COOKIE})
+. elif exists(${_COOKIE.barrier})
test: ${_TEST_TARGETS}
. else
test: barrier
@@ -41,11 +41,11 @@
acquire-test-lock: acquire-lock
release-test-lock: release-lock
-.if exists(${_TEST_COOKIE})
-${_TEST_COOKIE}:
+.if exists(${_COOKIE.test})
+${_COOKIE.test}:
@${DO_NADA}
.else
-${_TEST_COOKIE}: real-test
+${_COOKIE.test}: real-test
.endif
######################################################################
@@ -126,6 +126,6 @@
###
.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}
+ ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.test} || ${FALSE}
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.test:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.test}
diff -r 8ad255d6f8e3 -r 460421753aad mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.180 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.181 2006/07/07 21:24:28 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -206,7 +206,7 @@
###
### BEGIN: after the barrier
###
-.if exists(${_BARRIER_COOKIE})
+.if exists(${_COOKIE.barrier})
# Generate default values for:
#
diff -r 8ad255d6f8e3 -r 460421753aad mk/configure/bsd.configure.mk
--- a/mk/configure/bsd.configure.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/configure/bsd.configure.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to configuring packages for building.
@@ -12,7 +12,7 @@
# pre-configure, do-configure, post-configure
#
-_CONFIGURE_COOKIE= ${WRKDIR}/.configure_done
+_COOKIE.configure= ${WRKDIR}/.configure_done
######################################################################
### configure (PUBLIC)
@@ -23,10 +23,10 @@
.if !defined(NO_CONFIGURE)
. include "${PKGSRCDIR}/mk/configure/configure.mk"
.elif !target(configure)
-. if exists(${_CONFIGURE_COOKIE})
+. if exists(${_COOKIE.configure})
configure:
@${DO_NADA}
-. elif exists(${_BARRIER_COOKIE})
+. elif exists(${_COOKIE.barrier})
configure: wrapper configure-cookie
. else
configure: barrier
@@ -40,6 +40,6 @@
###
.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}
+ ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.configure} || ${FALSE}
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.configure:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.configure}
diff -r 8ad255d6f8e3 -r 460421753aad mk/configure/configure.mk
--- a/mk/configure/configure.mk Fri Jul 07 19:38:06 2006 +0000
+++ b/mk/configure/configure.mk Fri Jul 07 21:24:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: configure.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $
#
# CONFIGURE_SCRIPT is the path to the script to run in order to
# configure the software for building. If the path is relative,
@@ -43,15 +43,15 @@
_CONFIGURE_TARGETS+= check-vulnerable
_CONFIGURE_TARGETS+= wrapper
_CONFIGURE_TARGETS+= acquire-configure-lock
-_CONFIGURE_TARGETS+= ${_CONFIGURE_COOKIE}
+_CONFIGURE_TARGETS+= ${_COOKIE.configure}
_CONFIGURE_TARGETS+= release-configure-lock
.PHONY: configure
.if !target(configure)
-. if exists(${_CONFIGURE_COOKIE})
+. if exists(${_COOKIE.configure})
configure:
@${DO_NADA}
-. elif exists(${_BARRIER_COOKIE})
+. elif exists(${_COOKIE.barrier})
configure: ${_CONFIGURE_TARGETS}
. else
configure: barrier
@@ -62,11 +62,11 @@
acquire-configure-lock: acquire-lock
release-configure-lock: release-lock
-.if exists(${_CONFIGURE_COOKIE})
-${_CONFIGURE_COOKIE}:
+.if exists(${_COOKIE.configure})
+${_COOKIE.configure}:
@${DO_NADA}
.else
-${_CONFIGURE_COOKIE}: real-configure
+${_COOKIE.configure}: real-configure
.endif
######################################################################
Home |
Main Index |
Thread Index |
Old Index