Replace wget with ftp as default in fetch scripts

This default is overriden by curl when it is available on the system.

This allows for the fetch script to work on MINIX systems without any
additions from PKGSRC, while requiring either a netbsd compatible ftp or
curl to be installed on other systems.

Change-Id: Id79f799e1ef0f5fde6bb1c0e570984b7579519fb

diff --git a/external/gpl3/binutils/fetch.sh b/external/gpl3/binutils/fetch.sh
index 8cce87ba6b5e1e61ef7bcc46a1f1d7b3384b3aff..2943d0e218b7c74f62efef3effcf240943f12b7f 100755 (executable)
--- a/external/gpl3/binutils/fetch.sh
+++ b/external/gpl3/binutils/fetch.sh
@@ -7,7 +7,7 @@ cd `dirname $0`
 # Configure fetch method
 URL="http://www.minix3.org/distfiles-minix/binutils-2.22.tar.bz2"
 BACKUP_URL="http://ftp.gnu.org/gnu/binutils/binutils-2.22.tar.bz2"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"

diff --git a/external/gpl3/gcc/fetch.sh b/external/gpl3/gcc/fetch.sh
index de2a3cd637cd6e2ca0574d62e5e1fb5a384666c4..66e689d1120fc65550d87cc57e235e6bfba7d93d 100755 (executable)
--- a/external/gpl3/gcc/fetch.sh
+++ b/external/gpl3/gcc/fetch.sh
@@ -7,7 +7,7 @@ cd `dirname $0`
 # Configure fetch method
 URL="http://www.minix3.org/distfiles-minix/gcc-4.5.3.tar.bz2"
 BACKUP_URL="ftp://ftp.gwdg.de/pub/misc/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"

diff --git a/external/lgpl3/gmp/fetch.sh b/external/lgpl3/gmp/fetch.sh
index 3a1050cf3c8e450fed4e2f2c132bbd9536f6d6af..0a478cdf16a1080f17e27a0834d1cbbb4295d6f8 100755 (executable)
--- a/external/lgpl3/gmp/fetch.sh
+++ b/external/lgpl3/gmp/fetch.sh
@@ -7,7 +7,7 @@ cd `dirname $0`
 # Configure fetch method
 URL="http://www.minix3.org/distfiles-minix/gmp-5.1.2.tar.bz2"
 BACKUP_URL="ftp://ftp.gmplib.org/pub/gmp-5.1.2/gmp-5.1.2.tar.bz2"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"

diff --git a/external/lgpl3/mpc/fetch.sh b/external/lgpl3/mpc/fetch.sh
index 612be44a76d7bd11e778a14957647cf3dc61b687..a899ffeb0f2bed5e8c5f36b775fcb836061782f2 100755 (executable)
--- a/external/lgpl3/mpc/fetch.sh
+++ b/external/lgpl3/mpc/fetch.sh
@@ -7,7 +7,7 @@ cd `dirname $0`
 # Configure fetch method
 URL="http://www.minix3.org/distfiles-minix/mpc-1.0.1.tar.gz"
 BACKUP_URL="http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"

diff --git a/external/lgpl3/mpfr/fetch.sh b/external/lgpl3/mpfr/fetch.sh
index 81f642c7f50f6fe506c28b4dfc1e7f3c94a3c256..c4ed7810d14a9376a125f26d2f2d98db5f4124d3 100755 (executable)
--- a/external/lgpl3/mpfr/fetch.sh
+++ b/external/lgpl3/mpfr/fetch.sh
@@ -7,7 +7,7 @@ cd `dirname $0`
 # Configure fetch method
 URL="http://www.minix3.org/distfiles-minix/mpfr-3.1.2.tar.bz2"
 BACKUP_URL="http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.bz2"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"

diff --git a/gnu/dist/fetch.sh b/gnu/dist/fetch.sh
index ba74f088f4f3f676af1977dece2d616a05fa044d..678d508d667b3ff254a6170b0785e5e1e94cc5ce 100755 (executable)
--- a/gnu/dist/fetch.sh
+++ b/gnu/dist/fetch.sh
@@ -4,15 +4,16 @@
 echo $0
 cd `dirname $0`
 
-# Configure fetch method - GMAKE
-URL="http://www.minix3.org/distfiles-minix/make-3.80.tar.bz2"
-BACKUP_URL="ftp://ftp.gnu.org/gnu/make/make-3.80.tar.bz2"
-FETCH=wget
+FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
        FETCH="curl -O -f"
 fi
 
+# Configure fetch method - GMAKE
+URL="http://www.minix3.org/distfiles-minix/make-3.80.tar.bz2"
+BACKUP_URL="ftp://ftp.gnu.org/gnu/make/make-3.80.tar.bz2"
+
 # Fetch sources if not available
 if [ ! -d gmake ];
 then
@@ -32,11 +33,6 @@ fi
 # Configure fetch method - TEXINFO
 URL="http://www.minix3.org/distfiles-minix/texinfo-4.8.tar.bz2"
 BACKUP_URL="ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2"
-FETCH=wget
-which curl >/dev/null
-if [ $? -eq 0 ]; then
-       FETCH="curl -O -f"
-fi
 
 # Fetch sources if not available
 if [ ! -d texinfo ];