diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.barrier.mk | 12 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
-rw-r--r-- | mk/build/bsd.build.mk | 16 | ||||
-rw-r--r-- | mk/build/build.mk | 14 | ||||
-rw-r--r-- | mk/build/test.mk | 20 | ||||
-rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/configure/bsd.configure.mk | 14 | ||||
-rw-r--r-- | mk/configure/configure.mk | 14 | ||||
-rw-r--r-- | mk/depends/bsd.depends-vars.mk | 4 | ||||
-rw-r--r-- | mk/depends/bsd.depends.mk | 14 | ||||
-rw-r--r-- | mk/depends/depends.mk | 12 | ||||
-rw-r--r-- | mk/extract/extract.mk | 20 | ||||
-rw-r--r-- | mk/flavor/pkg/depends.mk | 12 | ||||
-rw-r--r-- | mk/flavor/pkg/install.mk | 4 | ||||
-rw-r--r-- | mk/flavor/pkg/metadata.mk | 6 | ||||
-rw-r--r-- | mk/flavor/pkg/replace.mk | 12 | ||||
-rw-r--r-- | mk/install/bsd.install.mk | 14 | ||||
-rw-r--r-- | mk/install/install.mk | 20 | ||||
-rw-r--r-- | mk/install/replace.mk | 4 | ||||
-rw-r--r-- | mk/package/bsd.package.mk | 10 | ||||
-rw-r--r-- | mk/package/package.mk | 20 | ||||
-rw-r--r-- | mk/patch/patch.mk | 20 | ||||
-rw-r--r-- | mk/plist/print-plist.mk | 6 | ||||
-rw-r--r-- | mk/tools/bsd.tools.mk | 20 | ||||
-rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 24 |
25 files changed, 160 insertions, 160 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 3e302a3a6c2..35ac5bddb18 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -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 @@ _BARRIER_CMDLINE_TARGETS+= ${_target_} ### 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 @@ _BARRIER_CMDLINE_TARGETS+= ${_target_} ### .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: ${_BARRIER_PRE_TARGETS} ${_BARRIER_COOKIE} ###################################################################### ### 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 --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7663fd53cc6..433bb182890 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ all: ${_PKGSRC_BUILD_TARGETS} # 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 --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk index 4e0b601cda0..7942c347faa 100644 --- a/mk/build/bsd.build.mk +++ b/mk/build/bsd.build.mk @@ -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 @@ _TEST_COOKIE= ${WRKDIR}/.test_done .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 @@ build: barrier ### .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 --git a/mk/build/build.mk b/mk/build/build.mk index a9747acb12b..ebab48b20fa 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -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_TARGET?= all _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 @@ build: barrier 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 --git a/mk/build/test.mk b/mk/build/test.mk index 3d9e50a6e94..d0476e9b7d5 100644 --- a/mk/build/test.mk +++ b/mk/build/test.mk @@ -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_MAKE_FLAGS?= ${MAKE_FLAGS} _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 @@ test: barrier 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 @@ 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} + ${_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 --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index ab2549e2a03..7c33469362c 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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 @@ ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} ### ### BEGIN: after the barrier ### -.if exists(${_BARRIER_COOKIE}) +.if exists(${_COOKIE.barrier}) # Generate default values for: # diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index 46da9d1bcff..ce752d3aefb 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -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 @@ _CONFIGURE_COOKIE= ${WRKDIR}/.configure_done .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 @@ configure: barrier ### .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 --git a/mk/configure/configure.mk b/mk/configure/configure.mk index c416d02d08e..bc3d99128d9 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -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 @@ BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS _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 @@ configure: barrier 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 ###################################################################### diff --git a/mk/depends/bsd.depends-vars.mk b/mk/depends/bsd.depends-vars.mk index ab180031278..464869112b5 100644 --- a/mk/depends/bsd.depends-vars.mk +++ b/mk/depends/bsd.depends-vars.mk @@ -1,8 +1,8 @@ -# $NetBSD: bsd.depends-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $ +# $NetBSD: bsd.depends-vars.mk,v 1.3 2006/07/07 21:24:28 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where # bsd.depends.mk is included. # -_DEPENDS_COOKIE= ${WRKDIR}/.depends_done +_COOKIE.depends= ${WRKDIR}/.depends_done diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index ab3e3d0b358..453d939e29a 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.7 2006/07/06 22:29:52 jlam Exp $ +# $NetBSD: bsd.depends.mk,v 1.8 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 dependencies. @@ -37,7 +37,7 @@ DEPENDS_TARGET= reinstall .if !defined(NO_DEPENDS) . include "${PKGSRCDIR}/mk/depends/depends.mk" .elif !target(depends) -. if exists(${_DEPENDS_COOKIE}) +. if exists(${_COOKIE.depends}) depends: @${DO_NADA} . else @@ -64,9 +64,9 @@ install-depends: depends depends-clean ### target so that "depends" may be re-invoked. ### depends-clean: - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_DEPENDS_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.depends} ${_PKG_SILENT}${_PKG_DEBUG} \ - ${RMDIR} -p ${_DEPENDS_COOKIE:H} 2>/dev/null || ${TRUE} + ${RMDIR} -p ${_COOKIE.depends:H} 2>/dev/null || ${TRUE} ###################################################################### ### depends-cookie (PRIVATE, override) @@ -77,8 +77,8 @@ 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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H} + ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_COOKIE.depends} .endif diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index 354b7c49c5c..2b423feb0b2 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.9 2006/07/05 22:21:02 jlam Exp $ +# $NetBSD: depends.mk,v 1.10 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### depends (PUBLIC) @@ -7,12 +7,12 @@ ### the package. ### _DEPENDS_TARGETS+= acquire-depends-lock -_DEPENDS_TARGETS+= ${_DEPENDS_COOKIE} +_DEPENDS_TARGETS+= ${_COOKIE.depends} _DEPENDS_TARGETS+= release-depends-lock .PHONY: depends .if !target(depends) -. if exists(${_DEPENDS_COOKIE}) +. if exists(${_COOKIE.depends}) depends: @${DO_NADA} . else @@ -24,11 +24,11 @@ depends: ${_DEPENDS_TARGETS} acquire-depends-lock: acquire-lock release-depends-lock: release-lock -.if exists(${_DEPENDS_COOKIE}) -${_DEPENDS_COOKIE}: +.if exists(${_COOKIE.depends}) +${_COOKIE.depends}: @${DO_NADA} .else -${_DEPENDS_COOKIE}: real-depends +${_COOKIE.depends}: real-depends .endif ###################################################################### diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index e57bacff622..51c66b423e5 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.10 2006/07/06 22:29:52 jlam Exp $ +# $NetBSD: extract.mk,v 1.11 2006/07/07 21:24:28 jlam Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -35,7 +35,7 @@ # EXTRACT_OPTS, EXTRACT_USING and EXTRACT_ELEMENTS. # -_EXTRACT_COOKIE= ${WRKDIR}/.extract_done +_COOKIE.extract= ${WRKDIR}/.extract_done ###################################################################### ### extract (PUBLIC) @@ -48,12 +48,12 @@ _EXTRACT_TARGETS+= makedirs _EXTRACT_TARGETS+= depends _EXTRACT_TARGETS+= tools _EXTRACT_TARGETS+= acquire-extract-lock -_EXTRACT_TARGETS+= ${_EXTRACT_COOKIE} +_EXTRACT_TARGETS+= ${_COOKIE.extract} _EXTRACT_TARGETS+= release-extract-lock .PHONY: extract .if !target(extract) -. if exists(${_EXTRACT_COOKIE}) +. if exists(${_COOKIE.extract}) extract: @${DO_NADA} . else @@ -65,11 +65,11 @@ extract: ${_EXTRACT_TARGETS} acquire-extract-lock: acquire-lock release-extract-lock: release-lock -.if exists(${_EXTRACT_COOKIE}) -${_EXTRACT_COOKIE}: +.if exists(${_COOKIE.extract}) +${_COOKIE.extract}: @${DO_NADA} .else -${_EXTRACT_COOKIE}: real-extract +${_COOKIE.extract}: real-extract .endif ###################################################################### @@ -119,9 +119,9 @@ 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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.extract} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.extract:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.extract} ###################################################################### ### pre-extract, do-extract, post-extract (PUBLIC, override) diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index faac2b30dba..a2b3fcfab8e 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.8 2006/07/06 22:29:52 jlam Exp $ +# $NetBSD: depends.mk,v 1.9 2006/07/07 21:24:28 jlam Exp $ _DEPENDS_FILE= ${WRKDIR}/.depends _REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \ @@ -10,8 +10,8 @@ _REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \ # dependencies of the package. # _DEPENDS_PATTERNS_CMD= \ - if ${TEST} -f ${_DEPENDS_COOKIE}; then \ - ${CAT} ${_DEPENDS_COOKIE} | \ + if ${TEST} -f ${_COOKIE.depends}; then \ + ${CAT} ${_COOKIE.depends} | \ ${AWK} '/^full/ { print $$2 } { next }'; \ fi @@ -36,9 +36,9 @@ 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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H} + ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_COOKIE.depends} ${_DEPENDS_FILE}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk index 0057e454f41..2ecd6273b87 100644 --- a/mk/flavor/pkg/install.mk +++ b/mk/flavor/pkg/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.7 2006/06/09 13:59:08 jlam Exp $ +# $NetBSD: install.mk,v 1.8 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk) @@ -60,7 +60,7 @@ _REGISTER_DEPENDENCIES= \ ${SH} ${PKGSRCDIR}/mk/flavor/pkg/register-dependencies .PHONY: register-pkg -register-pkg: generate-metadata ${_DEPENDS_COOKIE} +register-pkg: generate-metadata ${_COOKIE.depends} @${STEP_MSG} "Registering installation for ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME} diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index 78b45768371..2f207fb5e13 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.6 2006/06/09 16:41:09 jlam Exp $ +# $NetBSD: metadata.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -272,7 +272,7 @@ ${_PRESERVE_FILE}: _SIZE_ALL_FILE= ${PKG_DB_TMPDIR}/+SIZE_ALL _METADATA_TARGETS+= ${_SIZE_ALL_FILE} -${_SIZE_ALL_FILE}: ${_DEPENDS_COOKIE} +${_SIZE_ALL_FILE}: ${_COOKIE.depends} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ ${_DEPENDS_PATTERNS_CMD} | \ @@ -353,7 +353,7 @@ _INSTALL_ARG_cmd= if ${TEST} -f ${INSTALL_FILE}; then \ _CONTENTS_TARGETS+= ${_BUILD_INFO_FILE} _CONTENTS_TARGETS+= ${_BUILD_VERSION_FILE} _CONTENTS_TARGETS+= ${_COMMENT_FILE} -_CONTENTS_TARGETS+= ${_DEPENDS_COOKIE} +_CONTENTS_TARGETS+= ${_COOKIE.depends} _CONTENTS_TARGETS+= ${_DESCR_FILE} _CONTENTS_TARGETS+= ${_MESSAGE_FILE} _CONTENTS_TARGETS+= plist diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index a552478fcb7..2cf660ba90d 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.3 2006/07/05 19:13:46 jlam Exp $ +# $NetBSD: replace.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### replace-pkg (PRIVATE, pkgsrc/mk/install/replace.mk) @@ -32,7 +32,7 @@ undo-replace-pkg: ${_UNDO_REPLACE_PKG_TARGETS} _REQUIRED_BY_FILE= ${PKG_DB_TMPDIR}/+REQUIRED_BY -_REPLACE_COOKIE= ${WRKDIR}/.replace_done +_COOKIE.replace= ${WRKDIR}/.replace_done _REPLACE_OLDNAME_FILE= ${WRKDIR}/.replace_oldname _REPLACE_NEWNAME_FILE= ${WRKDIR}/.replace_newname @@ -45,7 +45,7 @@ _REPLACE_NEWNAME_FILE= ${WRKDIR}/.replace_newname .PHONY: undo-replace-check undo-replace-check: ${_PKG_SILENT}${_PKG_DEBUG} \ - ${TEST} ! -f ${_REPLACE_COOKIE} || exit 0; \ + ${TEST} ! -f ${_COOKIE.replace} || exit 0; \ ${ERROR_MSG} "No replacment to undo!"; \ exit 1 @@ -95,14 +95,14 @@ replace-names: ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO} ${PKGNAME} > ${_REPLACE_NEWNAME_FILE} ${_PKG_SILENT}${_PKG_DEBUG} \ - ${CP} -f ${_REPLACE_NEWNAME_FILE} ${_REPLACE_COOKIE} + ${CP} -f ${_REPLACE_NEWNAME_FILE} ${_COOKIE.replace} .PHONY: undo-replace-names undo-replace-names: ${_PKG_SILENT}${_PKG_DEBUG} \ ${ECHO} ${PKGNAME} > ${_REPLACE_OLDNAME_FILE} ${_PKG_SILENT}${_PKG_DEBUG} \ - ${CP} -f ${_REPLACE_COOKIE} ${_REPLACE_NEWNAME_FILE} + ${CP} -f ${_COOKIE.replace} ${_REPLACE_NEWNAME_FILE} ###################################################################### ### replace-preserve-required-by (PRIVATE) @@ -170,4 +170,4 @@ replace-clean: ${RM} -f ${WRKDIR}/$$newname${PKG_SUFX} ${_PKG_SILENT}${_PKG_DEBUG} \ ${RM} -f ${_REPLACE_OLDNAME_FILE} ${_REPLACE_NEWNAME_FILE} \ - ${_REPLACE_COOKIE} + ${_COOKIE.replace} diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 00aaa557fe1..1b9e5172cb4 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.7 2006/07/07 13:39:52 jlam Exp $ +# $NetBSD: bsd.install.mk,v 1.8 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 installing packages. @@ -12,7 +12,7 @@ # pre-install, do-install, post-install # -_INSTALL_COOKIE= ${WRKDIR}/.install_done +_COOKIE.install= ${WRKDIR}/.install_done ###################################################################### ### install (PUBLIC) @@ -23,10 +23,10 @@ _INSTALL_COOKIE= ${WRKDIR}/.install_done .if !defined(NO_INSTALL) . include "${PKGSRCDIR}/mk/install/install.mk" .elif !target(install) -. if exists(${_INSTALL_COOKIE}) +. if exists(${_COOKIE.install}) install: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) install: ${_PKGSRC_BUILD_TARGETS} install-cookie . else install: barrier @@ -43,6 +43,6 @@ install: barrier ### .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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.install} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.install:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.install} diff --git a/mk/install/install.mk b/mk/install/install.mk index bc952a1d7b2..7dc9c43d527 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.10 2006/07/05 22:21:02 jlam Exp $ +# $NetBSD: install.mk,v 1.11 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### install (PUBLIC) @@ -9,15 +9,15 @@ _INSTALL_TARGETS+= check-vulnerable _INSTALL_TARGETS+= ${_PKGSRC_BUILD_TARGETS} _INSTALL_TARGETS+= acquire-install-lock -_INSTALL_TARGETS+= ${_INSTALL_COOKIE} +_INSTALL_TARGETS+= ${_COOKIE.install} _INSTALL_TARGETS+= release-install-lock .PHONY: install .if !target(install) -. if exists(${_INSTALL_COOKIE}) +. if exists(${_COOKIE.install}) install: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) install: ${_INSTALL_TARGETS} . else install: barrier @@ -28,11 +28,11 @@ install: barrier acquire-install-lock: acquire-lock release-install-lock: release-lock -.if exists(${_INSTALL_COOKIE}) -${_INSTALL_COOKIE}: +.if exists(${_COOKIE.install}) +${_COOKIE.install}: @${DO_NADA} .else -${_INSTALL_COOKIE}: real-install +${_COOKIE.install}: real-install .endif ###################################################################### @@ -93,9 +93,9 @@ unprivileged-install-hook: ### This is a check against stale work directories. ### .PHONY: install-check-version -install-check-version: ${_EXTRACT_COOKIE} +install-check-version: ${_COOKIE.extract} ${_PKG_SILENT}${_PKG_DEBUG} \ - extractname=`${CAT} ${_EXTRACT_COOKIE}`; \ + extractname=`${CAT} ${_COOKIE.extract}`; \ pkgname=${PKGNAME}; \ case "$$extractname" in \ "") ${WARNING_MSG} "${WRKDIR} may contain an older version of ${PKGBASE}" ;; \ @@ -325,4 +325,4 @@ privileged-install-hook: ### later phases so that the "install" target may be re-invoked. ### install-clean: package-clean check-clean - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${PLIST} ${_INSTALL_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${PLIST} ${_COOKIE.install} diff --git a/mk/install/replace.mk b/mk/install/replace.mk index a529bff3456..d2ed28f9f38 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.5 2006/07/05 22:21:02 jlam Exp $ +# $NetBSD: replace.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### replace (PUBLIC) @@ -12,7 +12,7 @@ _REPLACE_TARGETS+= unprivileged-install-hook .PHONY: replace su-replace .if !target(replace) -. if exists(${_BARRIER_COOKIE}) +. if exists(${_COOKIE.barrier}) replace: ${_REPLACE_TARGETS} su-target . else replace: barrier diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 1c89941f234..16257ac4daf 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $ +# $NetBSD: bsd.package.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 binary packages. @@ -8,7 +8,7 @@ # package, repackage # -_PACKAGE_COOKIE= ${WRKDIR}/.package_done +_COOKIE.package= ${WRKDIR}/.package_done ###################################################################### ### package (PUBLIC) @@ -19,10 +19,10 @@ _PACKAGE_COOKIE= ${WRKDIR}/.package_done .if !defined(NO_PACKAGE) . include "${PKGSRCDIR}/mk/package/package.mk" .elif !target(package) -. if exists(${_PACKAGE_COOKIE}) +. if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) package: install . if defined(SKIP_SILENT) @${DO_NADA} @@ -51,4 +51,4 @@ repackage: package-clean package ### phase so that the "package" target may be re-invoked. ### package-clean: - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_PACKAGE_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_COOKIE.package} diff --git a/mk/package/package.mk b/mk/package/package.mk index 36af5ef3deb..7098dec3184 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.13 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: package.mk,v 1.14 2006/07/07 21:24:28 jlam Exp $ ###################################################################### ### package (PUBLIC) @@ -13,15 +13,15 @@ _PACKAGE_TARGETS+= replace _PACKAGE_TARGETS+= install .endif _PACKAGE_TARGETS+= acquire-package-lock -_PACKAGE_TARGETS+= ${_PACKAGE_COOKIE} +_PACKAGE_TARGETS+= ${_COOKIE.package} _PACKAGE_TARGETS+= release-package-lock .PHONY: package .if !target(package) -. if exists(${_PACKAGE_COOKIE}) +. if exists(${_COOKIE.package}) package: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) +. elif exists(${_COOKIE.barrier}) package: ${_PACKAGE_TARGETS} . else package: barrier @@ -32,11 +32,11 @@ package: barrier acquire-package-lock: acquire-lock release-package-lock: release-lock -.if exists(${_PACKAGE_COOKIE}) -${_PACKAGE_COOKIE}: +.if exists(${_COOKIE.package}) +${_COOKIE.package}: @${DO_NADA} .else -${_PACKAGE_COOKIE}: real-package +${_COOKIE.package}: real-package .endif ###################################################################### @@ -63,9 +63,9 @@ 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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.package} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.package:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.package} ###################################################################### ### The targets below are run with elevated privileges. diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk index e6e0b3e4589..c4e0984732b 100644 --- a/mk/patch/patch.mk +++ b/mk/patch/patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: patch.mk,v 1.7 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: patch.mk,v 1.8 2006/07/07 21:24:29 jlam Exp $ # # The following variables may be set in a package Makefile and control # how pkgsrc patches are applied. @@ -44,7 +44,7 @@ # _PATCH_APPLIED_FILE= ${WRKDIR}/.patch -_PATCH_COOKIE= ${WRKDIR}/.patch_done +_COOKIE.patch= ${WRKDIR}/.patch_done ###################################################################### ### patch (PUBLIC) @@ -55,12 +55,12 @@ _PATCH_COOKIE= ${WRKDIR}/.patch_done _PATCH_TARGETS+= check-vulnerable _PATCH_TARGETS+= extract _PATCH_TARGETS+= acquire-patch-lock -_PATCH_TARGETS+= ${_PATCH_COOKIE} +_PATCH_TARGETS+= ${_COOKIE.patch} _PATCH_TARGETS+= release-patch-lock .PHONY: patch .if !target(patch) -. if exists(${_PATCH_COOKIE}) +. if exists(${_COOKIE.patch}) patch: @${DO_NADA} . else @@ -72,11 +72,11 @@ patch: ${_PATCH_TARGETS} acquire-patch-lock: acquire-lock release-patch-lock: release-lock -.if exists(${_PATCH_COOKIE}) -${_PATCH_COOKIE}: +.if exists(${_COOKIE.patch}) +${_COOKIE.patch}: @${DO_NADA} .else -${_PATCH_COOKIE}: real-patch +${_COOKIE.patch}: real-patch .endif ###################################################################### @@ -108,12 +108,12 @@ patch-message: ### .PHONY: patch-cookie patch-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PATCH_COOKIE} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.patch} || ${FALSE} ${_PKG_SILENT}${_PKG_DEBUG} \ if ${TEST} -f ${_PATCH_APPLIED_FILE:Q}; then \ - ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_PATCH_COOKIE:Q}; \ + ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_COOKIE.patch:Q}; \ else \ - ${TOUCH} ${TOUCH_FLAGS} ${_PATCH_COOKIE:Q}; \ + ${TOUCH} ${TOUCH_FLAGS} ${_COOKIE.patch:Q}; \ fi ###################################################################### diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index 329d63f3c28..1fb2ae6d22e 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: print-plist.mk,v 1.8 2006/05/14 14:27:41 seb Exp $ +# $NetBSD: print-plist.mk,v 1.9 2006/07/07 21:24:29 jlam Exp $ ### ### Automatic PLIST generation @@ -76,9 +76,9 @@ _PRINT_PLIST_COMMON_DIRS!= ${AWK} 'BEGIN { \ # XXX should check $LOCALBASE and $X11BASE, and add @cwd statements _PRINT_PLIST_FILES_CMD= \ - ${FIND} ${PREFIX}/. -xdev -newer ${_EXTRACT_COOKIE} \! -type d -print + ${FIND} ${PREFIX}/. -xdev -newer ${_COOKIE.extract} \! -type d -print _PRINT_PLIST_DIRS_CMD= \ - ${FIND} ${PREFIX}/. -xdev -newer ${_EXTRACT_COOKIE} -type d -print + ${FIND} ${PREFIX}/. -xdev -newer ${_COOKIE.extract} -type d -print .if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS]) _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index e564adca511..2c1b56d32f8 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.41 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: bsd.tools.mk,v 1.42 2006/07/07 21:24:29 jlam Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -54,7 +54,7 @@ _TOOLS_WRAP_LOG= ${WRKLOG} USE_TOOLS?= # empty -_TOOLS_COOKIE= ${WRKDIR}/.tools_done +_COOKIE.tools= ${WRKDIR}/.tools_done ###################################################################### ### tools (PUBLIC) @@ -63,12 +63,12 @@ _TOOLS_COOKIE= ${WRKDIR}/.tools_done ### specified by USE_TOOLS. ### _TOOLS_TARGETS+= acquire-tools-lock -_TOOLS_TARGETS+= ${_TOOLS_COOKIE} +_TOOLS_TARGETS+= ${_COOKIE.tools} _TOOLS_TARGETS+= release-tools-lock .PHONY: tools .if !target(tools) -. if exists(${_TOOLS_COOKIE}) +. if exists(${_COOKIE.tools}) tools: @${DO_NADA} . else @@ -80,11 +80,11 @@ tools: ${_TOOLS_TARGETS} acquire-tools-lock: acquire-lock release-tools-lock: release-lock -.if exists(${_TOOLS_COOKIE}) -${_TOOLS_COOKIE}: +.if exists(${_COOKIE.tools}) +${_COOKIE.tools}: @${DO_NADA} .else -${_TOOLS_COOKIE}: real-tools +${_COOKIE.tools}: real-tools .endif ###################################################################### @@ -115,9 +115,9 @@ 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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.tools} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.tools:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${USE_TOOLS:Q} > ${_COOKIE.tools} ###################################################################### ### override-tools (PRIVATE) diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 42d9e988f6a..5ffccd966c7 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.47 2006/07/06 22:29:53 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.48 2006/07/07 21:24:29 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -57,7 +57,7 @@ PREPEND_PATH+= ${WRAPPER_BINDIR} ### ### BEGIN: after the barrier ### -.if exists(${_BARRIER_COOKIE}) +.if exists(${_COOKIE.barrier}) WRAPPER_DEBUG?= yes CONFIGURE_ENV+= WRAPPER_DEBUG=${WRAPPER_DEBUG:Q} @@ -773,15 +773,15 @@ SUBST_POSTCMD.unwrap= ${DO_NADA} ###################################################################### ###################################################################### -_WRAPPER_COOKIE= ${WRKDIR}/.wrapper_done +_COOKIE.wrapper= ${WRKDIR}/.wrapper_done .PHONY: wrapper .if !target(wrapper) -. if exists(${_WRAPPER_COOKIE}) +. if exists(${_COOKIE.wrapper}) wrapper: @${DO_NADA} -. elif exists(${_BARRIER_COOKIE}) -wrapper: check-vulnerable patch acquire-wrapper-lock ${_WRAPPER_COOKIE} release-wrapper-lock +. elif exists(${_COOKIE.barrier}) +wrapper: check-vulnerable patch acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock . else wrapper: barrier . endif @@ -791,11 +791,11 @@ wrapper: barrier acquire-wrapper-lock: acquire-lock release-wrapper-lock: release-lock -.if exists(${_WRAPPER_COOKIE}) -${_WRAPPER_COOKIE}: +.if exists(${_COOKIE.wrapper}) +${_COOKIE.wrapper}: @${DO_NADA} .else -${_WRAPPER_COOKIE}: real-wrapper +${_COOKIE.wrapper}: real-wrapper .endif .PHONY: real-wrapper @@ -824,6 +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} + ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.wrapper} || ${FALSE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.wrapper:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.wrapper} |