Use autoconf to set full path to curl and cvs.

This fixes fetching on systems that have curl/cvs installed outside of the default dports binpath (ie, FreeBSD).

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@9679 d073be05-634f-4543-b044-5fe20cf6d1d6

configure.ac

@@ -10,6 +10,8 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
+AC_PATH_PROG(CURL, [curl], [])
+AC_PATH_PROG(CVS, [cvs], [])
 
 # Quiche eaters options.
 if test x$GCC = xyes; then
@@ -120,9 +122,15 @@ dnl SC_CONFIG_MANPAGES
 
 # Output
 
-AC_CONFIG_FILES([Makefile Mk/dports.autoconf.mk doc/prefix.mtree
-		doc/ports.conf src/darwinports1.0/darwinports_autoconf.tcl
-		src/darwinports1.0/darwinports_fastload.tcl
-		src/programs/Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	Mk/dports.autoconf.mk
+	doc/prefix.mtree
+	doc/ports.conf
+	src/darwinports1.0/darwinports_autoconf.tcl
+	src/port1.0/port_autoconf.tcl
+	src/programs/Makefile
+	src/darwinports1.0/darwinports_fastload.tcl
+])
 
 AC_OUTPUT

src/port1.0/Makefile

@@ -3,7 +3,8 @@ INSTALLDIR=	${DESTDIR}${datadir}/darwinports/Tcl/port1.0
 SRCS=	port.tcl portchecksum.tcl portconfigure.tcl portextract.tcl	    \
 	portfetch.tcl portmain.tcl portbuild.tcl portpatch.tcl portutil.tcl \
 	portinstall.tcl portdepends.tcl portdestroot.tcl portdistclean.tcl \
-        portclean.tcl porttest.tcl portactivate.tcl portsubmit.tcl
+        portclean.tcl porttest.tcl portactivate.tcl portsubmit.tcl \
+	port_autoconf.tcl
 
 SUBDIR=		resources
 
@@ -15,6 +16,7 @@ all::
 clean::
 
 distclean::
+	rm -f port_autoconf.tcl
 
 install::
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m 775 ${DESTDIR}${datadir}/darwinports

src/port1.0/port_autoconf.tcl.in

@@ -0,0 +1,35 @@
+# darwinports-autoconf.tcl.in
+#
+# Copyright (c) 2002 - 2004 Apple Computer, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+package provide port 1.0
+
+namespace eval portutil::autoconf {
+	variable curl_path "@CURL@"
+	variable cvs_path "@CVS@"
+}

src/port1.0/portfetch.tcl

@@ -48,7 +48,7 @@ commands fetch
 # Defaults
 default extract.suffix .tar.gz
 default fetch.type standard
-default cvs.cmd cvs
+default cvs.cmd {$portutil::autoconf::cvs_path}
 default cvs.password ""
 default cvs.dir {${workpath}}
 default cvs.module {$distname}
@@ -62,7 +62,7 @@ default cvs.post_args {"${cvs.module}"}
 default distfiles {[suffix $distname]}
 default dist_subdir {${portname}}
 
-default fetch.cmd curl
+default fetch.cmd {$portutil::autoconf::curl_path}
 default fetch.dir {${distpath}}
 default fetch.pre_args {"-f -L -o ${distfile}.TMP"}
 default fetch.post_args {[portfetch::assemble_url ${site} ${distfile}]}