summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-13 14:02:34 +0000
committerjlam <jlam>2006-07-13 14:02:34 +0000
commited67a0012cd95416627746ed6dbf78f0f7fb54b0 (patch)
tree054a4952b111d37e6eb8aaa78c0125d125c86d9a /mk/install
parent1d7d975664df301741d33d2d6e9fefd86f9cb5f4 (diff)
downloadpkgsrc-ed67a0012cd95416627746ed6dbf78f0f7fb54b0.tar.gz
* Add a new stage "bootstrap-depends" that happens before all other
stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS. The bootstrap-depends step works just like the normal depends step and honors the value of DEPENDS_TARGET. It's now possible to add dependencies solely to facilitate fetching the distfiles, e.g. BOOTSTRAP_DEPENDS+= curl-[0-9]*:../../www/curl * Teach the tools framework about ":bootstrap" as a tools modifier which indicates the tool should be added as a dependency via BOOTSTRAP_DEPENDS. * Add "digest" to the tools framework. * Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest before anything else. Get rid of unused "uptodate-digest" target and related digest version-checking code. * Finish the refactoring work: split checksum-related code out of bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum" target command list with a script that does all the real work. * Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private variables by prepending them with an underscore. Also, rename _PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the makepatchsum target to allow that variable to contain a list of algorithms, all of which are used when creating the patch checksums for ${DISTINFO_FILE}.
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/bsd.install-vars.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/install/bsd.install-vars.mk b/mk/install/bsd.install-vars.mk
index a00828d7dee..e95c317775d 100644
--- a/mk/install/bsd.install-vars.mk
+++ b/mk/install/bsd.install-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.3 2006/07/13 14:02:34 jlam Exp $
#
# This Makefile fragment is included separately by bsd.pkg.mk and
# defines some variables which must be defined earlier than where
@@ -19,9 +19,8 @@ NO_MTREE= yes
.if (${PKG_INSTALLATION_TYPE} == "pkgviews") && defined(CROSSBASE)
NO_MTREE= yes
.endif
-.if !defined(NO_MTREE)
-USE_TOOLS+= mtree
-.endif
+
+USE_TOOLS+= ${NO_MTREE:D:Umtree\:bootstrap}
# If MANZ is defined, then we want the final man pages to be compressed.
# If MANZ is not defined, then we want the final man pages to be