diff options
| author | joerg <joerg> | 2008-05-22 20:11:55 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-05-22 20:11:55 +0000 |
| commit | 9100c72af91a41a71ca2185580ae22f3de2607af (patch) | |
| tree | 0d73c786757287a5cf4c608c47285983c7ed22fc /mk/tools | |
| parent | fd258a52982e4e146b82be04fccaafc978cc0578 (diff) | |
| download | pkgsrc-9100c72af91a41a71ca2185580ae22f3de2607af.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/tools')
| -rw-r--r-- | mk/tools/replace.mk | 12 | ||||
| -rw-r--r-- | mk/tools/tools.DragonFly.mk | 3 | ||||
| -rw-r--r-- | mk/tools/tools.NetBSD.mk | 3 |
3 files changed, 15 insertions, 3 deletions
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 |