7 files changed, 27 insertions, 39 deletions
diff --git a/contrib/autoconf/module.defs b/contrib/autoconf/module.defs
index b50631ce1..77b94f9e3 100644
--- a/contrib/autoconf/module.defs
+++ b/contrib/autoconf/module.defs
@@ -1,9 +1,6 @@
 $(eval $(call import.MODULE.defs,AUTOCONF,autoconf,M4))
 $(eval $(call import.CONTRIB.defs,AUTOCONF))
 
-AUTOCONF.FETCH.url = http://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.bz2
-AUTOCONF.FETCH.md5 = 58e0cca25061e1b3e2bc30a5be13815b
-
-# TODO: Upstream no longer provides bzip2 archives
-#AUTOCONF.FETCH.url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
-#AUTOCONF.FETCH.md5 = 82d05e03b93e45f5a39b828dc9c6c29b
+AUTOCONF.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.gz
+AUTOCONF.FETCH.url += http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+AUTOCONF.FETCH.md5 =  82d05e03b93e45f5a39b828dc9c6c29b
diff --git a/contrib/automake/module.defs b/contrib/automake/module.defs
index 902b1a1c6..d91645084 100644
--- a/contrib/automake/module.defs
+++ b/contrib/automake/module.defs
@@ -1,12 +1,10 @@
 $(eval $(call import.MODULE.defs,AUTOMAKE,automake,AUTOCONF))
 $(eval $(call import.CONTRIB.defs,AUTOMAKE))
 
-AUTOMAKE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/automake-1.13.1.tar.bz2
-AUTOMAKE.FETCH.md5 = c66595aafe79e4e5455b4b3491fe6b05
+AUTOMAKE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/automake-1.13.1.tar.gz
+AUTOMAKE.FETCH.url += http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz
+AUTOMAKE.FETCH.md5 =  78a0ef8216b0556b44508e7b5b0c0847
 
-# TODO: Upstream no longer provides bzip2 archives, automake 1.15 is latest
-#AUTOMAKE.FETCH.url = http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz
-#AUTOMAKE.FETCH.md5 = 78a0ef8216b0556b44508e7b5b0c0847
-#
+# TODO: automake 1.15 is latest
 #AUTOMAKE.FETCH.url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
 #AUTOMAKE.FETCH.md5 = 716946a105ca228ab545fc37a70df3a3
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index a4e796090..426d69efe 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -6,13 +6,11 @@ endif
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v11.3-0-g00abc00.tar.gz
-FFMPEG.FETCH.md5 = 23648740623345f122cfd0e015063c7e
+FFMPEG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libav-11.3.tar.gz
+FFMPEG.FETCH.url += https://libav.org/releases/libav-11.3.tar.gz
+FFMPEG.FETCH.md5 =  1a2eb461b98e0f1d1d6c4d892d51ac9b
 
-# TODO: Upstream archive differs, libav 11.4 is latest
-#FFMPEG.FETCH.url = https://libav.org/releases/libav-11.3.tar.gz
-#FFMPEG.FETCH.md5 = 1a2eb461b98e0f1d1d6c4d892d51ac9b
-#
+# TODO: libav 11.4 is latest
 #FFMPEG.FETCH.url = https://libav.org/releases/libav-11.4.tar.gz
 #FFMPEG.FETCH.md5 = 133fab51636f47d01c25b80f33f6ae3f
 
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 3905c8af2..1273fb284 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,12 +1,11 @@
 $(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
-LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
-LIBDVDNAV.FETCH.md5 = 1fb10188c7a33f480011d3ddf32553c7
+LIBDVDNAV.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1.tar.bz2
+LIBDVDNAV.FETCH.url += http://download.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
+LIBDVDNAV.FETCH.md5 =  81e30fb57eaf9f61aa6513a7bd85bd74
 
-# TODO: Upstream archive differs, libdvdnav 5.0.3 is latest
-#LIBDVDNAV.FETCH.url = http://download.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
-#LIBDVDNAV.FETCH.md5 = 81e30fb57eaf9f61aa6513a7bd85bd74
+# TODO: libdvdnav 5.0.3 is latest
 #LIBDVDNAV.FETCH.url = http://download.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2
 #LIBDVDNAV.FETCH.md5 = e9ea4de3bd8f204e61301d407d09f033
 
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 67f9ef250..54e060a01 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -1,12 +1,11 @@
 $(eval $(call import.MODULE.defs,LIBICONV,libiconv))
 $(eval $(call import.CONTRIB.defs,LIBICONV))
 
-LIBICONV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libiconv-1.13.tar.bz2
-LIBICONV.FETCH.md5 = 9c8b41b77f508edf72e26b406e873a2f
+LIBICONV.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libiconv-1.13.tar.gz
+LIBICONV.FETCH.url += http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.tar.gz
+LIBICONV.FETCH.md5 =  048032a3032ebd182150bdee30a5d533
 
-# TODO: Upstream no longer provides bzip2 archives, libiconv 1.14 is latest
-#LIBICONV.FETCH.url = http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.tar.gz
-#LIBICONV.FETCH.md5 = 048032a3032ebd182150bdee30a5d533
+# TODO: libiconv 1.14 is latest
 #LIBICONV.FETCH.url = http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz
 #LIBICONV.FETCH.md5 = e34509b1623cec449dfeb73d7ce9c6c6
 
diff --git a/contrib/libtool/module.defs b/contrib/libtool/module.defs
index fb3bfc4a2..d97e6b67f 100644
--- a/contrib/libtool/module.defs
+++ b/contrib/libtool/module.defs
@@ -1,11 +1,10 @@
 $(eval $(call import.MODULE.defs,LIBTOOL,libtool,AUTOCONF AUTOMAKE PKGCONFIG))
 $(eval $(call import.CONTRIB.defs,LIBTOOL))
 
-LIBTOOL.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.bz2
-LIBTOOL.FETCH.md5 = f1a2109b9cd9c03a8df1f47e672c3aeb
+LIBTOOL.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.gz
+LIBTOOL.FETCH.url += http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
+LIBTOOL.FETCH.md5 =  d2f3b7d4627e69e13514a40e72a24d50
 
-# TODO: Upstream no longer provides bzip2 archives, libtool 2.4.6 is latest
-#LIBTOOL.FETCH.url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
-#LIBTOOL.FETCH.md5 = d2f3b7d4627e69e13514a40e72a24d50
+# TODO: libtool 2.4.6 is latest
 #LIBTOOL.FETCH.url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
 #LIBTOOL.FETCH.md5 = addf44b646ddb4e3919805aa88fa7c5e
diff --git a/contrib/pkgconfig/module.defs b/contrib/pkgconfig/module.defs
index 1ad7cee40..3ac7cf78c 100644
--- a/contrib/pkgconfig/module.defs
+++ b/contrib/pkgconfig/module.defs
@@ -1,13 +1,11 @@
 $(eval $(call import.MODULE.defs,PKGCONFIG,pkgconfig))
 $(eval $(call import.CONTRIB.defs,PKGCONFIG))
 
-PKGCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.bz2
-PKGCONFIG.FETCH.md5 = 60c2d5353d501c5619d535c6d4d80f1c
+PKGCONFIG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.gz
+PKGCONFIG.FETCH.url += http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+PKGCONFIG.FETCH.md5 =  aa3c86e67551adc3ac865160e34a2a0d
 
-# TODO: Upstream no longer provides bzip2 archives, pkg-config 0.29 is latest
-#PKGCONFIG.FETCH.url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-#PKGCONFIG.FETCH.md5 = aa3c86e67551adc3ac865160e34a2a0d
-#
+# TODO: pkg-config 0.29 is latest
 #PKGCONFIG.FETCH.url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
 #PKGCONFIG.FETCH.md5 = 77f27dce7ef88d0634d0d6f90e03a77f