merge

7 files changed, 25 insertions, 5 deletions

diff --git a/doc/index.html b/doc/index.html
index ba7bbe9..e7be34d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -215,7 +215,7 @@
     When everything is fine, download the
     <a href="#latest-release">latest release</a>:
     </p>
-    <pre>wget http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-<span class="version">X.Y</span>.tar.gz</pre>
+    <pre>wget https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-<span class="version">X.Y</span>.tar.gz</pre>
     <p>
     and unpack the tarball:
     </p>
@@ -442,11 +442,11 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <dl>
 
-    <dt>2011-xx-xx &ndash; Release <span id="latest-version">2.20</span></dt>
+    <dt>2011-xx-xx &ndash; Release <span id="latest-version">2.21</span></dt>
     <dd>
         <p>
-        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.20.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.20">Changelog</a>
+        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.21.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.21">Changelog</a>
         </p>
 
         <p>
@@ -1124,6 +1124,20 @@ https://...</pre>
 
     <dl>
 
+    <dt>2011-04-05 &ndash; Release 2.20</dt>
+    <dd>
+        <p>
+        <a href="https://bitbucket.org/vog/mingw-cross-env/downloads/mingw-cross-env-2.20.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.20">Changelog</a>
+        </p>
+
+        <p>
+        This release fixes a download error caused by the pixman project
+        (a sudden change of their URL scheme without proper redirects).
+        <a href="http://www.w3.org/Provider/Style/URI">That sort of thing should never happen!</a>
+        </p>
+    </dd>
+
     <dt>2011-03-19 &ndash; Release 2.19</dt>
     <dd>
         <p>
diff --git a/src/blas.mk b/src/blas.mk
index 1f588ec..9294acd 100644
--- a/src/blas.mk
+++ b/src/blas.mk
@@ -10,6 +10,7 @@ $(PKG)_SUBDIR   := BLAS
 $(PKG)_FILE     := $(PKG).tgz
 $(PKG)_WEBSITE  := http://www.netlib.org/$(PKG)/
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/cblas.mk b/src/cblas.mk
index b1e0f6d..52c8b3c 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -10,6 +10,7 @@ $(PKG)_SUBDIR   := CBLAS
 $(PKG)_FILE     := $(PKG).tgz
 $(PKG)_WEBSITE  := http://www.netlib.org/blas/
 $(PKG)_URL      := http://www.netlib.org/blas/blast-forum/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/blast-forum/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/freetds.mk b/src/freetds.mk
index 77af37f..ec80044 100644
--- a/src/freetds.mk
+++ b/src/freetds.mk
@@ -10,6 +10,7 @@ $(PKG)_SUBDIR   := freetds-$($(PKG)_VERSION)
 $(PKG)_FILE     := freetds-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.freetds.org/
 $(PKG)_URL      := http://ibiblio.org/pub/Linux/ALPHA/$(PKG)/stable/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://ftp.de.debian.org/debian/pool/main/f/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
 $(PKG)_DEPS     := gcc libiconv gnutls
 
 define $(PKG)_UPDATE
diff --git a/src/gcc-mpc.mk b/src/gcc-mpc.mk
index cbaf91b..ebe234e 100644
--- a/src/gcc-mpc.mk
+++ b/src/gcc-mpc.mk
@@ -10,6 +10,7 @@ $(PKG)_SUBDIR   := mpc-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpc-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.multiprecision.org/
 $(PKG)_URL      := $($(PKG)_WEBSITE)/mpc/download/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://ftp.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PKG)_VERSION).orig.tar.gz
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/lapack.mk b/src/lapack.mk
index df785b2..d89c3f8 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -10,6 +10,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_WEBSITE  := http://www.netlib.org/$(PKG)/
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/pixman.mk b/src/pixman.mk
index 340c1a7..7534db3 100644
--- a/src/pixman.mk
+++ b/src/pixman.mk
@@ -9,7 +9,8 @@ $(PKG)_CHECKSUM := b22aaafc3b637470c9f04fae565e2a22eaf5e00a
 $(PKG)_SUBDIR   := pixman-$($(PKG)_VERSION)
 $(PKG)_FILE     := pixman-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://cairographics.org/
-$(PKG)_URL      := http://cairographics.org/releases/$($(PKG)_FILE)
+$(PKG)_URL      := http://cairographics.org/snapshots/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE