diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/configure/bsd.configure.mk | 4 | ||||
| -rw-r--r-- | mk/configure/configure.mk | 4 | ||||
| -rw-r--r-- | mk/extract/extract.mk | 4 | ||||
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6fe10423db7..88b612992b6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1876 2006/07/26 21:23:40 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1877 2006/07/27 13:47:29 jlam Exp $ # # This file is in the public domain. # @@ -12,9 +12,9 @@ # checksum # depends # tools -# wrapper # extract # patch +# wrapper # configure # build # diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index ec252b30767..2a592bdea93 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.8 2006/07/23 15:33:16 jlam Exp $ +# $NetBSD: bsd.configure.mk,v 1.9 2006/07/27 13:47:29 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to configuring packages for building. @@ -27,7 +27,7 @@ _COOKIE.configure= ${WRKDIR}/.configure_done configure: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) -configure: patch configure-cookie +configure: wrapper configure-cookie . else configure: barrier . endif diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 6a9bc89df30..44ba46a31ec 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.8 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: configure.mk,v 1.9 2006/07/27 13:47:29 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, @@ -39,7 +39,7 @@ _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS ### configure is a public target to configure the sources for building. ### _CONFIGURE_TARGETS+= check-vulnerable -_CONFIGURE_TARGETS+= patch +_CONFIGURE_TARGETS+= wrapper _CONFIGURE_TARGETS+= acquire-configure-lock _CONFIGURE_TARGETS+= ${_COOKIE.configure} _CONFIGURE_TARGETS+= release-configure-lock diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index 4a9e452518b..098c660f6b4 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.14 2006/07/26 18:29:46 drochner Exp $ +# $NetBSD: extract.mk,v 1.15 2006/07/27 13:47:29 jlam Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -43,7 +43,7 @@ _COOKIE.extract= ${WRKDIR}/.extract_done ### extract is a public target to perform extraction. ### _EXTRACT_TARGETS+= check-vulnerable -_EXTRACT_TARGETS+= wrapper +_EXTRACT_TARGETS+= tools _EXTRACT_TARGETS+= acquire-extract-lock _EXTRACT_TARGETS+= ${_COOKIE.extract} _EXTRACT_TARGETS+= release-extract-lock diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index ba89a8f75b5..f0824c16db2 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.50 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.51 2006/07/27 13:47:29 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -781,7 +781,7 @@ _COOKIE.wrapper= ${WRKDIR}/.wrapper_done wrapper: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) -wrapper: check-vulnerable tools acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock +wrapper: check-vulnerable patch acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock . else wrapper: barrier . endif |