diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-07-27 10:48:36 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-07-27 10:48:36 +0000 |
| commit | 4cf96d2ffb27f05581180d2342c8641cb56afdaf (patch) | |
| tree | d51375a5ce768169d6b4e26fc4c340907a1a036c /mk/tools | |
| parent | c9e21d595ca4ff6063d9f73b6d9defe9f2338547 (diff) | |
| download | pkgsrc-4cf96d2ffb27f05581180d2342c8641cb56afdaf.tar.gz | |
Make curl a tool. Add support for /usr/bin/curl, if available, on Solaris.
SmartOS and OmniOS users can now set FETCH_USING=curl and no longer require
pkgsrc dependencies for downloading distfiles.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 12 | ||||
| -rw-r--r-- | mk/tools/tools.SunOS.mk | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index df34c516ba0..067a28dd4d5 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.250 2012/07/06 14:08:50 wiz Exp $ +# $NetBSD: replace.mk,v 1.251 2012/07/27 10:48:36 jperkin Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -331,6 +331,16 @@ TOOLS_PATH.csh= ${TOOLS_PREFIX.csh}/bin/tcsh . endif .endif +.if !defined(TOOLS_IGNORE.curl) && !empty(_USE_TOOLS:Mcurl) +. if !empty(PKGPATH:Mwww/curl) +MAKEFLAGS+= TOOLS_IGNORE.curl= +. elif !empty(_TOOLS_USE_PKGSRC.curl:M[yY][eE][sS]) +TOOLS_DEPENDS.curl?= curl-[0-9]*:../../www/curl +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.curl=curl +TOOLS_PATH.curl= ${TOOLS_PREFIX.curl}/bin/curl +. endif +.endif + .if !defined(TOOLS_IGNORE.fetch) && !empty(_USE_TOOLS:Mfetch) . if !empty(PKGPATH:Mnet/fetch) MAKEFLAGS+= TOOLS_IGNORE.fetch= diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk index 82e582dd960..bd4ff3b0bf9 100644 --- a/mk/tools/tools.SunOS.mk +++ b/mk/tools/tools.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.SunOS.mk,v 1.40 2012/06/25 22:05:17 jperkin Exp $ +# $NetBSD: tools.SunOS.mk,v 1.41 2012/07/27 10:48:36 jperkin Exp $ # # System-supplied tools for the Solaris operating system. # @@ -38,6 +38,9 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp .endif TOOLS_PLATFORM.cp?= /bin/cp TOOLS_PLATFORM.csh?= /bin/csh +.if exists(/usr/bin/curl) +TOOLS_PLATFORM.curl?= /usr/bin/curl +.endif TOOLS_PLATFORM.cut?= /usr/bin/cut TOOLS_PLATFORM.date?= /usr/xpg4/bin/date .if exists(/usr/bin/gdiff) |