Index: mk/fetch/bsd.fetch-vars.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fetch/bsd.fetch-vars.mk,v
retrieving revision 1.13
diff -u -r1.13 bsd.fetch-vars.mk
--- mk/fetch/bsd.fetch-vars.mk	20 Mar 2009 16:23:48 -0000	1.13
+++ mk/fetch/bsd.fetch-vars.mk	27 Jul 2012 15:38:25 -0000
@@ -80,7 +80,7 @@
 _FETCH_TOOLS.ftp=		ftp
 _FETCH_TOOLS.fetch=		fetch
 _FETCH_DEPENDS.wget=		wget-[0-9]*:../../net/wget
-_FETCH_DEPENDS.curl=		curl-[0-9]*:../../www/curl
+_FETCH_TOOLS.curl=		curl
 _FETCH_TOOLS.manual=		false
 
 .if !empty(_ALLFILES)
Index: mk/fetch/fetch.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fetch/fetch.mk,v
retrieving revision 1.55
diff -u -r1.55 fetch.mk
--- mk/fetch/fetch.mk	6 Feb 2012 12:49:38 -0000	1.55
+++ mk/fetch/fetch.mk	27 Jul 2012 15:38:25 -0000
@@ -229,7 +229,7 @@
 _FETCH_AFTER_ARGS.curl=		-O # must be here to honor -o option
 _FETCH_RESUME_ARGS.curl=	-C -
 _FETCH_OUTPUT_ARGS.curl=	-o
-_FETCH_CMD.curl=		${PREFIX}/bin/curl
+_FETCH_CMD.curl=		${TOOLS_PATH.curl}
 
 _FETCH_CMD.manual=		${TOOLS_PATH.false}
 
Index: mk/tools/replace.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/replace.mk,v
retrieving revision 1.249
diff -u -r1.249 replace.mk
--- mk/tools/replace.mk	30 May 2012 12:02:28 -0000	1.249
+++ mk/tools/replace.mk	27 Jul 2012 15:38:25 -0000
@@ -331,6 +331,16 @@
 .  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=
Index: mk/tools/tools.Darwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.Darwin.mk,v
retrieving revision 1.45
diff -u -r1.45 tools.Darwin.mk
--- mk/tools/tools.Darwin.mk	18 May 2012 20:45:15 -0000	1.45
+++ mk/tools/tools.Darwin.mk	27 Jul 2012 15:38:25 -0000
@@ -26,6 +26,9 @@
 TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
 TOOLS_PLATFORM.cp?=		/bin/cp
 TOOLS_PLATFORM.csh?=		/bin/tcsh
+.if exists(/usr/bin/curl)
+TOOLS_PLATFORM.curl?=		/usr/bin/curl
+.endif
 TOOLS_PLATFORM.cut?=		/usr/bin/cut
 TOOLS_PLATFORM.date?=		/bin/date
 TOOLS_PLATFORM.diff?=		/usr/bin/diff
Index: mk/tools/tools.Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.Linux.mk,v
retrieving revision 1.48
diff -u -r1.48 tools.Linux.mk
--- mk/tools/tools.Linux.mk	14 Dec 2011 03:17:25 -0000	1.48
+++ mk/tools/tools.Linux.mk	27 Jul 2012 15:38:25 -0000
@@ -47,6 +47,9 @@
 .if exists(/bin/tcsh)
 TOOLS_PLATFORM.csh?=		/bin/tcsh
 .endif
+.if exists(/usr/bin/curl)
+TOOLS_PLATFORM.curl?=		/usr/bin/curl
+.endif
 .if exists(/bin/cut)
 TOOLS_PLATFORM.cut?=		/bin/cut
 .elif exists(/usr/bin/cut)
Index: mk/tools/tools.SunOS.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.SunOS.mk,v
retrieving revision 1.40
diff -u -r1.40 tools.SunOS.mk
--- mk/tools/tools.SunOS.mk	25 Jun 2012 22:05:17 -0000	1.40
+++ mk/tools/tools.SunOS.mk	27 Jul 2012 15:38:25 -0000
@@ -38,6 +38,9 @@
 .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)