From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 23 Jan 2014 10:38:26 +0000 (+0100)
Subject: Replace wget with ftp as default in fetch scripts
X-Git-Tag: v3.3.0~439
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/dnssec-dsfromkey.html?a=commitdiff_plain;h=29b8e5ff06775f48546ddc9f3b03875fac0231fd;p=minix.git

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 8cce87ba6..2943d0e21 100755
--- 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 de2a3cd63..66e689d11 100755
--- 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 3a1050cf3..0a478cdf1 100755
--- 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 612be44a7..a899ffeb0 100755
--- 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 81f642c7f..c4ed7810d 100755
--- 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 ba74f088f..678d508d6 100755
--- 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 ];