summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2008-05-22 20:11:55 +0000
committerjoerg <joerg@pkgsrc.org>2008-05-22 20:11:55 +0000
commit4a202fc0c81c533da67ea1b7b42db4b4d1a2d155 (patch)
tree0d73c786757287a5cf4c608c47285983c7ed22fc /mk
parentdff5175c58160681f1f7d9e8f3c5bfc0513171a8 (diff)
downloadpkgsrc-4a202fc0c81c533da67ea1b7b42db4b4d1a2d155.tar.gz
Add ftp as tool. On NetBSD and DragonFly, this will use the system
version of tnftp, otherwise it will use net/tnftp. Require ftp as bootstrap dependency when the package has files to fetch. The dependency is currently unconditional and FETCH_CMD is set to TOOLS_PATH.ftp by default.
Diffstat (limited to 'mk')
-rw-r--r--mk/defaults/mk.conf8
-rw-r--r--mk/fetch/bsd.fetch-vars.mk4
-rw-r--r--mk/tools/replace.mk12
-rw-r--r--mk/tools/tools.DragonFly.mk3
-rw-r--r--mk/tools/tools.NetBSD.mk3
5 files changed, 19 insertions, 11 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index b841e3ed3e4..b9d8b7d382d 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.175 2008/05/22 15:51:35 tnn Exp $
+# $NetBSD: mk.conf,v 1.176 2008/05/22 20:11:55 joerg Exp $
#
# This file provides default values for variables that may be overridden
@@ -344,11 +344,7 @@ DEFAULT_VIEW?= ""
# This is the default view to which packages are added after installation.
# Default: "" (the empty view)
-.if exists(${LOCALBASE}/bin/ftp)
-FETCH_CMD?= ${LOCALBASE}/bin/ftp
-.else
-FETCH_CMD?= /usr/bin/ftp
-.endif
+FETCH_CMD?= ${TOOLS_PATH.ftp}
# Default program to fetch the files with pkgsrc.
# Default: NetBSD's ftp(1).
# Possible: any.
diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk
index 4dd9c0269e6..8427fa0c42d 100644
--- a/mk/fetch/bsd.fetch-vars.mk
+++ b/mk/fetch/bsd.fetch-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.10 2008/05/22 16:27:22 joerg Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.11 2008/05/22 20:11:55 joerg Exp $
#
# This Makefile fragment is included separately by bsd.pkg.mk and
# defines some variables which must be defined earlier than where
@@ -74,7 +74,7 @@ _BOOTSTRAP_VERBOSE= # defined
.endif
.if !empty(_CKSUMFILES)
-#USE_TOOLS+= ftp:bootstrap
+USE_TOOLS+= ftp:bootstrap
. if defined(FAILOVER_FETCH)
USE_TOOLS+= digest:bootstrap
. endif
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 0c517c81d32..55bd57146d9 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.210 2008/04/15 13:00:11 tron Exp $
+# $NetBSD: replace.mk,v 1.211 2008/05/22 20:11:55 joerg Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -357,6 +357,16 @@ TOOLS_PATH.flex= ${TOOLS_PREFIX.flex}/bin/flex
TOOLS_ALIASES.flex= lex
.endif
+.if !defined(TOOLS_IGNORE.ftp) && !empty(_USE_TOOLS:Mftp)
+. if !empty(PKGPATH:Mnet/tnftp)
+MAKEFLAGS+= TOOLS_IGNORE.ftp=
+. elif !empty(_TOOLS_USE_PKGSRC.ftp:M[yY][eE][sS])
+TOOLS_DEPENDS.ftp?= tnftp-[0-9]*:../../net/tnftp
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.ftp=ftp
+TOOLS_PATH.ftp= ${TOOLS_PREFIX.ftp}/bin/ftp
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk)
. if !empty(PKGPATH:Mlang/gawk)
MAKEFLAGS+= TOOLS_IGNORE.gawk=
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index e7419626633..2a87dfbbad3 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.33 2007/08/20 11:00:33 joerg Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.34 2008/05/22 20:11:55 joerg Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -29,6 +29,7 @@ TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.flex?= /usr/bin/lex
+TOOLS_PLATFORM.ftp?= /usr/bin/ftp
TOOLS_PLATFORM.grep?= /usr/bin/grep
TOOLS_PLATFORM.groff?= /usr/bin/groff
.if exists(/usr/bin/gtar)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 8b30f20451b..06f201821ef 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.40 2007/09/30 12:19:12 rillig Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.41 2008/05/22 20:11:55 joerg Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -31,6 +31,7 @@ TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.flex?= /usr/bin/lex
+TOOLS_PLATFORM.ftp?= /usr/bin/ftp
.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
TOOLS_PLATFORM.gawk?= ${TOOLS_PLATFORM.awk}
.endif