Index: general.ent
===================================================================
--- general.ent	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general.ent	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -41,10 +41,14 @@
 <!ENTITY lfs-rootd            "../../../../lfs/view/&lfs-versiond;">
 <!ENTITY lfs-dev              "../../../../lfs/view/development">
-<!ENTITY kernel               "http://www.kernel.org/pub/">
+<!ENTITY gnu-http             "https://ftp.gnu.org/gnu">
+<!ENTITY gnu-ftp              "ftp://ftp.gnu.org/gnu">
+<!ENTITY gnupg-http           "https://www.gnupg.org/ftp/gcrypt">
+<!ENTITY gnupg-ftp            "ftp://ftp.gnupg.org/gcrypt">
 <!ENTITY gstreamer-dl         "https://gstreamer.freedesktop.org/src">
-<!ENTITY gnu-alpha-ftp        "ftp://alpha.gnu.org/gnu/">
-<!ENTITY gnu-alpha-http       "http://alpha.gnu.org/gnu/">
-<!ENTITY sourceforge-repo     "http://downloads.sourceforge.net">
-<!ENTITY sourceforge-repo2    "http://sourceforge.net">
+<!ENTITY kernel-dl            "https://www.kernel.org/pub">
+<!ENTITY mozilla-http         "https://archive.mozilla.org/pub">
+<!ENTITY pymodules-dl         "https://files.pythonhosted.org/packages/source">
+<!ENTITY sourceforge-dl       "https://downloads.sourceforge.net">
+
 <!ENTITY gentoo-ftp-repo      "ftp://mirror.ovh.net/gentoo-distfiles/distfiles">
 <!ENTITY fedora-http-repo     "http://pkgs.fedoraproject.org/repo/pkgs">
@@ -54,6 +58,4 @@
 <!ENTITY xorg-download-http   "https://www.x.org/pub/individual">
 <!ENTITY xorg-download-ftp    "ftp://ftp.x.org/pub/individual">
-<!ENTITY mozilla-http         "https://ftp.mozilla.org/pub/mozilla.org">
-<!ENTITY mozilla-ftp          "ftp://ftp.mozilla.org/pub">
 <!ENTITY pypi                 "https://pypi.python.org/pypi">
 
Index: general/genlib/appstream-glib.xml
===================================================================
--- general/genlib/appstream-glib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/appstream-glib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
   
   <!ENTITY appstream-glib-download-http 
-           "http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
+           "https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
   <!ENTITY appstream-glib-download-ftp  " ">
   <!ENTITY appstream-glib-md5sum        "2122471fff15bb9421313d2110ce538a">
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/apr-util.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY apr-util-download-http
-           "http://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
+           "https://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
   <!ENTITY apr-util-download-ftp  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-util-&apr-util-version;.tar.bz2">
   <!ENTITY apr-util-md5sum        "069a9a980776acab05212c5f37ef8368">
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/apr.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY apr-download-http
-    "http://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
+    "https://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
   <!ENTITY apr-download-ftp
     "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-&apr-version;.tar.bz2">
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/aspell.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,8 +5,6 @@
   %general-entities;
 
-  <!ENTITY aspell-download-http
-    "https://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
-  <!ENTITY aspell-download-ftp
-    "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
+  <!ENTITY aspell-download-http "&gnu-http;/aspell/aspell-&aspell-version;.tar.gz">
+  <!ENTITY aspell-download-ftp  "&gnu-ftp;/aspell/aspell-&aspell-version;.tar.gz">
   <!ENTITY aspell-md5sum        "e66a9c9af6a60dc46134fdacf6ce97d7">
   <!ENTITY aspell-size          "1.8 MB">
@@ -85,5 +83,5 @@
       <listitem>
         <para>
-          Aspell dictionaries: <ulink url="https://ftp.gnu.org/gnu/aspell/dict"/>
+          Aspell dictionaries: <ulink url="&gnu-http;/aspell/dict"/>
         </para>
       </listitem>
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/boost.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY boost-download-http "https://dl.bintray.com/boostorg/release/&boost-version;/source//boost_&boost-dl-version;.tar.bz2">
+  <!ENTITY boost-download-http "https://dl.bintray.com/boostorg/release/&boost-version;/source/boost_&boost-dl-version;.tar.bz2">
   <!ENTITY boost-download-ftp  " ">
   <!ENTITY boost-md5sum        "93eecce2abed9d2442c9676914709349">
Index: general/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/clucene.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY clucene-download-http "http://downloads.sourceforge.net/clucene/clucene-core-&clucene-version;.tar.gz">
+  <!ENTITY clucene-download-http "&sourceforge-dl;/clucene/clucene-core-&clucene-version;.tar.gz">
   <!ENTITY clucene-download-ftp  " ">
   <!ENTITY clucene-md5sum        "48d647fbd8ef8889e5a7f422c1bfda94">
Index: general/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/dbus-glib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY dbus-glib-download-http "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
+  <!ENTITY dbus-glib-download-http "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
   <!ENTITY dbus-glib-download-ftp  " ">
   <!ENTITY dbus-glib-md5sum        "a66a613705870752ca9786e0359aea97">
Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/exempi.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY exempi-download-http "http://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.bz2">
+  <!ENTITY exempi-download-http "https://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.bz2">
   <!ENTITY exempi-download-ftp  " ">
   <!ENTITY exempi-md5sum        "ad612752c8bf50d7c84a4689073246d2">
Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/gsl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,8 +5,6 @@
   %general-entities;
 
-  <!ENTITY gsl-download-http
-    "http://ftp.gnu.org/pub/gnu/gsl/gsl-&gsl-version;.tar.gz">
-  <!ENTITY gsl-download-ftp
-    "ftp://ftp.gnu.org/pub/gnu/gsl/gsl-&gsl-version;.tar.gz">
+  <!ENTITY gsl-download-http "&gnu-http;/gsl/gsl-&gsl-version;.tar.gz">
+  <!ENTITY gsl-download-ftp  "&gnu-ftp;/gsl/gsl-&gsl-version;.tar.gz">
   <!ENTITY gsl-md5sum        "dba736f15404807834dc1c7b93e83b92">
   <!ENTITY gsl-size          "5.6 MB">
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libassuan.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,6 @@
   %general-entities;
 
-  <!ENTITY libassuan-download-http " ">
-  <!ENTITY libassuan-download-ftp
-           "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-&libassuan-version;.tar.bz2">
+  <!ENTITY libassuan-download-http "&gnupg-http;/libassuan/libassuan-&libassuan-version;.tar.bz2">
+  <!ENTITY libassuan-download-ftp  "&gnupg-ftp;/libassuan/libassuan-&libassuan-version;.tar.bz2">
   <!ENTITY libassuan-md5sum        "8e01a7c72d3e5d154481230668e6eb5a">
   <!ENTITY libassuan-size          "547 KB">
Index: general/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libbytesize.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libbytesize-download-http "http://github.com/storaged-project/libbytesize/archive/libbytesize-&libbytesize-version;.tar.gz">
+  <!ENTITY libbytesize-download-http "https://github.com/storaged-project/libbytesize/archive/libbytesize-&libbytesize-version;.tar.gz">
   <!ENTITY libbytesize-download-ftp  " ">
   <!ENTITY libbytesize-md5sum        "c469110ae134ea3a58546ba13fdb5074">
Index: general/genlib/libffi.xml
===================================================================
--- general/genlib/libffi.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libffi.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libffi-download-http " ">
+  <!ENTITY libffi-download-http "https://sourceware.org/ftp/libffi/libffi-&libffi-version;.tar.gz">
   <!ENTITY libffi-download-ftp  "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz">
   <!ENTITY libffi-md5sum        "83b89587607e3eb65c70d361f13bab43">
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libgcrypt.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgcrypt-download-http " ">
-  <!ENTITY libgcrypt-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
+  <!ENTITY libgcrypt-download-http "&gnupg-http;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
+  <!ENTITY libgcrypt-download-ftp  "&gnupg-ftp;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
   <!ENTITY libgcrypt-md5sum        "530db74602b558209f9ad7356a680971">
   <!ENTITY libgcrypt-size          "2.8 MB">
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libgpg-error.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgpg-error-download-http " ">
-  <!ENTITY libgpg-error-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
+  <!ENTITY libgpg-error-download-http "&gnupg-http;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
+  <!ENTITY libgpg-error-download-ftp  "&gnupg-ftp;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
   <!ENTITY libgpg-error-md5sum        "5217ef3e76a7275a2a3b569a12ddc989">
   <!ENTITY libgpg-error-size          "796 KB">
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libgusb.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libgusb-download-http "http://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
+  <!ENTITY libgusb-download-http "https://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
   <!ENTITY libgusb-download-ftp  " ">
   <!ENTITY libgusb-md5sum        "fa2b41b828c749f9190edf888948a77b">
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libical.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,5 @@
   %general-entities;
 
-<!ENTITY libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz">
-  <!--
-  <!ENTITY libical-download-http "https://github.com/libical/libical/archive/v&libical-version;.tar.gz">-->
+  <!ENTITY libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz">
   <!ENTITY libical-download-ftp  " ">
   <!ENTITY libical-md5sum        "6bf8e5f5a3ba88baf390d0134e05d76e">
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libidn.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libidn-download-http "http://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-download-ftp  "ftp://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz">
+  <!ENTITY libidn-download-http "&gnu-http;/libidn/libidn-&libidn-version;.tar.gz">
+  <!ENTITY libidn-download-ftp  "&gnu-ftp;/libidn/libidn-&libidn-version;.tar.gz">
   <!ENTITY libidn-md5sum        "a9aa7e003665de9c82bd3f9fc6ccf308">
   <!ENTITY libidn-size          "3.3 MB">
Index: general/genlib/libiodbc.xml
===================================================================
--- general/genlib/libiodbc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libiodbc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libiodbc-download-http "&sourceforge-repo;/project/iodbc/iodbc/&libiodbc-version;/libiodbc-&libiodbc-version;.tar.gz">
+  <!ENTITY libiodbc-download-http "&sourceforge-dl;/iodbc/libiodbc-&libiodbc-version;.tar.gz">
   <!ENTITY libiodbc-download-ftp  " ">
   <!ENTITY libiodbc-md5sum        "c76cab12a642a024bd1a262615a1a4a8">
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libksba.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libksba-download-http " ">
-  <!ENTITY libksba-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2">
+  <!ENTITY libksba-download-http "&gnupg-http;/libksba/libksba-&libksba-version;.tar.bz2">
+  <!ENTITY libksba-download-ftp  "&gnupg-ftp;/libksba/libksba-&libksba-version;.tar.bz2">
   <!ENTITY libksba-md5sum        "8302a3e263a7c630aa7dea7d341f07a2">
   <!ENTITY libksba-size          "608 KB">
Index: general/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libmbim.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmbim-download-http "http://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
+  <!ENTITY libmbim-download-http "https://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
   <!ENTITY libmbim-download-ftp  " ">
   <!ENTITY libmbim-md5sum        "40b1543119b65f9a75f264a3a5abf33b">
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libpaper.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY libpaper-download-http "http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_&libpaper-version;.tar.gz">
-  <!ENTITY libpaper-download-ftp "ftp://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_&libpaper-version;.tar.gz">
+  <!ENTITY libpaper-download-ftp  "ftp://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_&libpaper-version;.tar.gz">
   <!ENTITY libpaper-md5sum        "38bc55688c0fc5544edaa5a951a45fbd">
   <!ENTITY libpaper-size          "48 KB">
Index: general/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libqmi.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libqmi-download-http "http://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
+  <!ENTITY libqmi-download-http "https://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
   <!ENTITY libqmi-download-ftp  " ">
   <!ENTITY libqmi-md5sum        "25bae4e383ad77f491ad49b49e04fdcf">
Index: general/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libsigsegv.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libsigsegv-download-http "http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
-  <!ENTITY libsigsegv-download-ftp "ftp://ftp.gnu.org/gnu/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
+  <!ENTITY libsigsegv-download-http "&gnu-http;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
+  <!ENTITY libsigsegv-download-ftp  "&gnu-ftp;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
   <!ENTITY libsigsegv-md5sum        "a812d9481f6097f705599b218eea349f">
   <!ENTITY libsigsegv-size          "440 KB">
Index: general/genlib/libstatgrab.xml
===================================================================
--- general/genlib/libstatgrab.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libstatgrab.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY libstatgrab-download-http "http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
-  <!ENTITY libstatgrab-download-ftp "ftp://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
+  <!ENTITY libstatgrab-download-ftp  "ftp://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
   <!ENTITY libstatgrab-md5sum        "b906d312076ca9be3d5188edfe07f496">
   <!ENTITY libstatgrab-size          "760 KB">
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libtasn1.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libtasn1-download-http "http://ftp.gnu.org/gnu/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-download-ftp  "ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
+  <!ENTITY libtasn1-download-http "&gnu-http;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
+  <!ENTITY libtasn1-download-ftp  "&gnu-ftp;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
   <!ENTITY libtasn1-md5sum        "5c724bd1f73aaf4a311833e1cd297b21">
   <!ENTITY libtasn1-size          "1.8 MB">
Index: general/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libunistring.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libunistring-download-http "http://ftp.gnu.org/gnu/libunistring/libunistring-&libunistring-version;.tar.xz">
-  <!ENTITY libunistring-download-ftp "ftp://ftp.gnu.org/gnu/libunistring/libunistring-&libunistring-version;.tar.xz">
+  <!ENTITY libunistring-download-http "&gnu-http;/libunistring/libunistring-&libunistring-version;.tar.xz">
+  <!ENTITY libunistring-download-ftp  "&gnu-ftp;/libunistring/libunistring-&libunistring-version;.tar.xz">
   <!ENTITY libunistring-md5sum        "82e0545363d111bfdfec2ddbfe62ffd3">
   <!ENTITY libunistring-size          "1.9 MB">
Index: general/genlib/libusb-compat.xml
===================================================================
--- general/genlib/libusb-compat.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libusb-compat.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libusb-compat-download-http "&sourceforge-repo;/libusb/libusb-compat-&libusb-compat-version;.tar.bz2">
+  <!ENTITY libusb-compat-download-http "&sourceforge-dl;/libusb/libusb-compat-&libusb-compat-version;.tar.bz2">
   <!ENTITY libusb-compat-download-ftp  " ">
   <!ENTITY libusb-compat-md5sum        "2780b6a758a1e2c2943bdbf7faf740e4">
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libwacom.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libwacom-download-http "&sourceforge-repo;/linuxwacom/libwacom/libwacom-&libwacom-version;.tar.bz2">
+  <!ENTITY libwacom-download-http "&sourceforge-dl;/linuxwacom/libwacom-&libwacom-version;.tar.bz2">
   <!ENTITY libwacom-download-ftp  " ">
   <!ENTITY libwacom-md5sum        "47ce63c65d74a5730fbf6ff3cea6d821">
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/libxkbcommon.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libxkbcommon-download-http "http://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
+  <!ENTITY libxkbcommon-download-http "https://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
   <!ENTITY libxkbcommon-download-ftp  " ">
   <!ENTITY libxkbcommon-md5sum        "f53fa65beb5ae4b6a6b7f08f9dedabc4">
Index: general/genlib/npth.xml
===================================================================
--- general/genlib/npth.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/npth.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY npth-download-http " ">
-  <!ENTITY npth-download-ftp  "ftp://ftp.gnupg.org/gcrypt/npth/npth-&npth-version;.tar.bz2">
+  <!ENTITY npth-download-http "&gnupg-http;/npth/npth-&npth-version;.tar.bz2">
+  <!ENTITY npth-download-ftp  "&gnupg-ftp;/npth/npth-&npth-version;.tar.bz2">
   <!ENTITY npth-md5sum        "9ba2dc4302d2f32c66737c43ed191b1b">
   <!ENTITY npth-size          "296 KB">
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/nspr.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY nspr-download-http "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-<!--  <!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">-->
+  <!ENTITY nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
   <!ENTITY nspr-download-ftp " ">
   <!ENTITY nspr-md5sum        "42fd8963a4b394f62d43ba604f03fab7">
Index: general/genlib/openobex.xml
===================================================================
--- general/genlib/openobex.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/openobex.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY openobex-download-http "&sourceforge-repo;/openobex/openobex-&openobex-version;-Source.tar.gz">
+  <!ENTITY openobex-download-http "&sourceforge-dl;/openobex/openobex-&openobex-version;-Source.tar.gz">
   <!ENTITY openobex-download-ftp  " ">
   <!ENTITY openobex-md5sum        "f6e0b6cb7dcfd731460a7e9a91429a3a">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/pcre.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY pcre-download-http " ">
-<!--  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">-->
+  <!ENTITY pcre-download-http "&sourceforge-dl;/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-md5sum        "c160d22723b1670447341b08c58981c1">
Index: general/genlib/pcre2.xml
===================================================================
--- general/genlib/pcre2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/pcre2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pcre2-download-http " ">
+  <!ENTITY pcre2-download-http "&sourceforge-dl;/pcre/pcre2-&pcre2-version;.tar.bz2">
   <!ENTITY pcre2-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-&pcre2-version;.tar.bz2">
   <!ENTITY pcre2-md5sum        "b2cd00ca7e24049040099b0a46bb3649">
Index: general/genlib/pth.xml
===================================================================
--- general/genlib/pth.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/pth.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,8 +5,6 @@
   %general-entities;
 
-  <!ENTITY pth-download-http
-  "http://ftp.gnu.org/gnu/pth/pth-&pth-version;.tar.gz">
-  <!ENTITY pth-download-ftp
-  "ftp://ftp.gnu.org/gnu/pth/pth-&pth-version;.tar.gz">
+  <!ENTITY pth-download-http "&gnu-http;/pth/pth-&pth-version;.tar.gz">
+  <!ENTITY pth-download-ftp  "&gnu-ftp;/pth/pth-&pth-version;.tar.gz">
   <!ENTITY pth-md5sum        "9cb4a25331a4c4db866a31cbe507c793">
   <!ENTITY pth-size          "652 KB">
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genlib/wayland.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY wayland-download-http "http://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
+  <!ENTITY wayland-download-http "https://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
   <!ENTITY wayland-download-ftp  " ">
   <!ENTITY wayland-md5sum        "0235f6075c32c3be61cff94fa0b9f108">
Index: general/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/asciidoc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "http://sourceforge.net/projects/asciidoc/files/asciidoc/&asciidoc-version;/asciidoc-&asciidoc-version;.tar.gz">
+  <!ENTITY asciidoc-download-http "&sourceforge-dl;/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
   <!ENTITY asciidoc-download-ftp  " ">
   <!ENTITY asciidoc-md5sum        "c59018f105be8d022714b826b0be130a">
Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/bogofilter.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY bogofilter-download-http "&sourceforge-repo;/bogofilter/bogofilter-&bogofilter-version;.tar.gz">
+  <!ENTITY bogofilter-download-http "&sourceforge-dl;/bogofilter/bogofilter-&bogofilter-version;.tar.gz">
   <!ENTITY bogofilter-download-ftp  " ">
   <!ENTITY bogofilter-md5sum        "6ce27a692d2d4881e9898f3798dcf91c">
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/compface.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,9 +6,9 @@
 
   <!ENTITY compface-download-http "&sources-anduin-http;/compface/compface-&compface-version;.tar.gz">
-  <!ENTITY compface-download-ftp "&sources-anduin-ftp;/compface/compface-&compface-version;.tar.gz">
-  <!ENTITY compface-md5sum "62f4f79c0861ad292ba3cf77b4c48319">
-  <!ENTITY compface-size "47 KB">
-  <!ENTITY compface-buildsize "520 KB">
-  <!ENTITY compface-time "less than 0.1 SBU">
+  <!ENTITY compface-download-ftp  "&sources-anduin-ftp;/compface/compface-&compface-version;.tar.gz">
+  <!ENTITY compface-md5sum        "62f4f79c0861ad292ba3cf77b4c48319">
+  <!ENTITY compface-size          "47 KB">
+  <!ENTITY compface-buildsize     "520 KB">
+  <!ENTITY compface-time          "less than 0.1 SBU">
 ]>
 
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/desktop-file-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY desktop-file-utils-download-http
-           "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
+           "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
   <!ENTITY desktop-file-utils-download-ftp  " ">
   <!ENTITY desktop-file-utils-md5sum        "599133d51cc9a41bfec186414906b6f1">
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/graphviz.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!--<!ENTITY graphviz-download-http "http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-&graphviz-version;.tar.gz">-->
-  <!ENTITY graphviz-download-http "http://pkgs.fedoraproject.org/repo/pkgs/graphviz/graphviz-&graphviz-version;.tar.gz/&graphviz-md5sum;/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-http "http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-&graphviz-version;.tar.gz">
   <!ENTITY graphviz-download-ftp  " ">
   <!ENTITY graphviz-md5sum        "5b6a829b2ac94efcd5fa3c223ed6d3ae">
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/pinentry.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY pinentry-download-http " ">
-  <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2">
+  <!ENTITY pinentry-download-http "&gnupg-http;/pinentry/pinentry-&pinentry-version;.tar.bz2">
+  <!ENTITY pinentry-download-ftp  "&gnupg-ftp;/pinentry/pinentry-&pinentry-version;.tar.bz2">
   <!ENTITY pinentry-md5sum        "4a3fad8b31f9b4c5526c8837495015dc">
   <!ENTITY pinentry-size          "428 KB">
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/screen.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY screen-download-http "https://ftp.gnu.org/gnu/screen/screen-&screen-version;.tar.gz">
-  <!ENTITY screen-download-ftp "ftp://ftp.gnu.org/gnu/screen/screen-&screen-version;.tar.gz">
-  <!ENTITY screen-md5sum "a8c5da2f42f8a18fa4dada2419d1549b">
-  <!ENTITY screen-size "944 KB">
-  <!ENTITY screen-buildsize "9.2 MB">
-  <!ENTITY screen-time "0.1 SBU">
+  <!ENTITY screen-download-http "&gnu-http;/screen/screen-&screen-version;.tar.gz">
+  <!ENTITY screen-download-ftp  "&gnu-ftp;/screen/screen-&screen-version;.tar.gz">
+  <!ENTITY screen-md5sum        "a8c5da2f42f8a18fa4dada2419d1549b">
+  <!ENTITY screen-size          "944 KB">
+  <!ENTITY screen-buildsize     "9.2 MB">
+  <!ENTITY screen-time          "0.1 SBU">
 ]>
 
Index: general/genutils/shared-mime-info.xml
===================================================================
--- general/genutils/shared-mime-info.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/shared-mime-info.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY shared-mime-info-download-http
-           "http://freedesktop.org/~hadess/shared-mime-info-&shared-mime-info-version;.tar.xz">
+           "https://people.freedesktop.org/~hadess/shared-mime-info-&shared-mime-info-version;.tar.xz">
   <!ENTITY shared-mime-info-download-ftp  " ">
   <!ENTITY shared-mime-info-md5sum        "f6dcadce764605552fc956563efa058c">
Index: general/genutils/sharutils.xml
===================================================================
--- general/genutils/sharutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/sharutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY sharutils-download-http "http://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
-  <!ENTITY sharutils-download-ftp  "ftp://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
+  <!ENTITY sharutils-download-http "&gnu-http;/sharutils/sharutils-&sharutils-version;.tar.xz">
+  <!ENTITY sharutils-download-ftp  "&gnu-ftp;/sharutils/sharutils-&sharutils-version;.tar.xz">
   <!ENTITY sharutils-md5sum        "5975ce21da36491d7aa6dc2b0d9788e0">
   <!ENTITY sharutils-size          "1.1 MB">
Index: general/genutils/time.xml
===================================================================
--- general/genutils/time.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/time.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY time-download-http "http://ftp.gnu.org/gnu/time/time-1.7.tar.gz">
-  <!ENTITY time-download-ftp  "ftp://ftp.gnu.org/gnu/time/time-1.7.tar.gz">
+  <!ENTITY time-download-http "&gnu-http;/time/time-1.7.tar.gz">
+  <!ENTITY time-download-ftp  "&gnu-ftp;/time/time-1.7.tar.gz">
   <!ENTITY time-md5sum        "e38d2b8b34b1ca259cf7b053caac32b3">
   <!ENTITY time-size          "101 KB">
Index: general/genutils/xdg-user-dirs.xml
===================================================================
--- general/genutils/xdg-user-dirs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/genutils/xdg-user-dirs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xdg-user-dirs-download-http "http://user-dirs.freedesktop.org/releases/xdg-user-dirs-&xdg-user-dirs-version;.tar.gz">
+  <!ENTITY xdg-user-dirs-download-http "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-&xdg-user-dirs-version;.tar.gz">
   <!ENTITY xdg-user-dirs-download-ftp  " ">
   <!ENTITY xdg-user-dirs-md5sum        "f5aaf5686ad7d8809a664bfb4566a54d">
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/aalib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY aalib-download-http "&sourceforge-repo;/aa-project/aalib-&aalib-version;.tar.gz">
-  <!ENTITY aalib-download-ftp " ">
-  <!ENTITY aalib-md5sum "9801095c42bba12edebd1902bcf0a990">
-  <!ENTITY aalib-size "388 KB">
-  <!ENTITY aalib-buildsize "6.5 MB">
-  <!ENTITY aalib-time "0.1 SBU">
+  <!ENTITY aalib-download-http "&sourceforge-dl;/aa-project/aalib-&aalib-version;.tar.gz">
+  <!ENTITY aalib-download-ftp  " ">
+  <!ENTITY aalib-md5sum        "9801095c42bba12edebd1902bcf0a990">
+  <!ENTITY aalib-size          "388 KB">
+  <!ENTITY aalib-buildsize     "6.5 MB">
+  <!ENTITY aalib-time          "0.1 SBU">
 ]>
 
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/babl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,9 +5,6 @@
   %general-entities;
 
-  <!ENTITY babl-download-http
-  "http://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">
-  <!ENTITY babl-download-ftp " ">
-<!--  <!ENTITY babl-download-ftp
-  "ftp://ftp.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">-->
+  <!ENTITY babl-download-http "https://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">
+  <!ENTITY babl-download-ftp  " ">
   <!ENTITY babl-md5sum        "cc53d8474a43aafb7cdaccea56cfde44">
   <!ENTITY babl-size          "604 KB">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/fontconfig.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY fontconfig-download-http
-           "http://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.bz2">
+           "https://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.bz2">
   <!ENTITY fontconfig-download-ftp  " ">
   <!ENTITY fontconfig-md5sum        "29105662c7d319720e0088a0ac53f494">
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/freetype2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-download-http "&sourceforge-dl;/freetype/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-md5sum        "2413ac3eaf508ada019c63959ea81a92">
@@ -13,5 +13,5 @@
 
   <!ENTITY freetype2-doc-version   "&freetype2-version;">
-  <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-doc-version;.tar.bz2">
+  <!ENTITY freetype2-doc-download-http "&sourceforge-dl;/freetype/freetype-doc-&freetype2-doc-version;.tar.bz2">
   <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.bz2">
   <!ENTITY freetype2-doc-md5sum        "961d5802bb6085ad91e0ab9fa99fbf39">
Index: general/graphlib/fribidi.xml
===================================================================
--- general/graphlib/fribidi.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/fribidi.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fribidi-download-http "http://fribidi.org/download/fribidi-&fribidi-version;.tar.bz2">
+  <!ENTITY fribidi-download-http "https://www.fribidi.org/download/fribidi-&fribidi-version;.tar.bz2">
   <!ENTITY fribidi-download-ftp  " ">
   <!ENTITY fribidi-md5sum        "6c7e7cfdd39c908f7ac619351c1c5c23">
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/gegl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,6 @@
   %general-entities;
 
-  <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.3/gegl-&gegl-version;.tar.bz2">
-  <!ENTITY gegl-download-ftp " ">
-<!--  <!ENTITY gegl-download-ftp "ftp://ftp.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">-->
+  <!ENTITY gegl-download-http "https://download.gimp.org/pub/gegl/0.3/gegl-&gegl-version;.tar.bz2">
+  <!ENTITY gegl-download-ftp  " ">
   <!ENTITY gegl-md5sum        "6e5c6f229261478dc436a38c84405b2a">
   <!ENTITY gegl-size          "5.8 MB">
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/giflib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY giflib-download-http "&sourceforge-repo;/giflib/giflib-&giflib-version;.tar.bz2">
+  <!ENTITY giflib-download-http "&sourceforge-dl;/giflib/giflib-&giflib-version;.tar.bz2">
   <!ENTITY giflib-download-ftp  " ">
   <!ENTITY giflib-http-md5sum   "2c171ced93c0e83bb09e6ccad8e3ba2b">
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/harfbuzz.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY harfbuzz-download-http
-           "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
+           "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
   <!ENTITY harfbuzz-md5sum        "d1aa446e1e65717311c15d9ac0cf31ee">
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/lcms.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lcms-download-http "&sourceforge-repo;/lcms/lcms-&lcms-version;.tar.gz">
+  <!ENTITY lcms-download-http "&sourceforge-dl;/lcms/lcms-&lcms-version;.tar.gz">
   <!ENTITY lcms-download-ftp  " ">
   <!ENTITY lcms-md5sum        "8af94611baf20d9646c7c2c285859818">
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/lcms2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lcms2-download-http "&sourceforge-repo;/lcms/lcms2-&lcms2-version;.tar.gz">
+  <!ENTITY lcms2-download-http "&sourceforge-dl;/lcms/lcms2-&lcms2-version;.tar.gz">
   <!ENTITY lcms2-download-ftp  " ">
   <!ENTITY lcms2-md5sum        "87a5913f1a52464190bb655ad230539c">
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/libexif.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libexif-download-http "&sourceforge-repo;/libexif/libexif-&libexif-version;.tar.bz2">
+  <!ENTITY libexif-download-http "&sourceforge-dl;/libexif/libexif-&libexif-version;.tar.bz2">
   <!ENTITY libexif-download-ftp  " ">
   <!ENTITY libexif-md5sum        "27339b89850f28c8f1c237f233e05b27">
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/libjpeg-turbo.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libjpeg-download-http "&sourceforge-repo;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
+  <!ENTITY libjpeg-download-http "&sourceforge-dl;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
   <!ENTITY libjpeg-download-ftp  " ">
   <!ENTITY libjpeg-md5sum        "6b4923e297a7eaa255f08511017a8818">
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/libmng.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmng-download-http "&sourceforge-repo;/libmng/libmng-&libmng-version;.tar.xz">
+  <!ENTITY libmng-download-http "&sourceforge-dl;/libmng/libmng-&libmng-version;.tar.xz">
   <!ENTITY libmng-download-ftp  " ">
   <!ENTITY libmng-md5sum        "e9e899adb1b681b17f14d91e261878c5">
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/libpng.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
+  <!ENTITY libpng-download-http "&sourceforge-dl;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
   <!ENTITY libpng-md5sum        "1b34eab440263e32cfa39d19413fad54">
@@ -15,5 +15,5 @@
 
   <!ENTITY apng-patch
-           "&sourceforge-repo;/project/apng/libpng/libpng16/libpng-&apng-version;-apng.patch.gz">
+           "&sourceforge-dl;/apng/libpng-&apng-version;-apng.patch.gz">
 ]>
 
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/opencv.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,5 @@
   %general-entities;
 
-  <!ENTITY cvdir "/projects/opencvlibrary/files">
-
-  <!ENTITY opencv-download-http     "&sourceforge-repo2;&cvdir;/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
+  <!ENTITY opencv-download-http     "&sourceforge-dl;/opencvlibrary/opencv-&opencv-version;.zip">
   <!ENTITY opencv-download-ftp      " ">
   <!ENTITY opencv-md5sum            "cc586ebe960a7cdd87100e89088abc06">
@@ -18,5 +16,5 @@
   <!ENTITY ippicv_binaries_commit  "a62e20676a60ee0ad6581e217fe7e4bada3b95db">
 
-  <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;.tar.gz">
+  <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-version;.tar.gz">
 ]>
 
@@ -95,10 +93,4 @@
       </listitem>
     </itemizedlist>
-
-    <note>
-      <para>Download the additional modules via wget as:</para>
-<screen><userinput>wget &opencv-contrib-download; \
-     -O opencv_contrib-&opencv-version;.tar.gz</userinput></screen>
-    </note>
 
     <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
Index: general/graphlib/openjpeg.xml
===================================================================
--- general/graphlib/openjpeg.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/openjpeg.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY openjpeg-download-http "&sourceforge-repo;/openjpeg.mirror/openjpeg-&openjpeg-version;.tar.gz">
+  <!ENTITY openjpeg-download-http "&sourceforge-dl;/openjpeg.mirror/openjpeg-&openjpeg-version;.tar.gz">
   <!ENTITY openjpeg-download-ftp  " ">
   <!ENTITY openjpeg-md5sum        "c41772c30fb1c272358b3707233134a1">
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/pixman.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pixman-download-http "http://cairographics.org/releases/pixman-&pixman-version;.tar.gz">
+  <!ENTITY pixman-download-http "https://www.cairographics.org/releases/pixman-&pixman-version;.tar.gz">
   <!ENTITY pixman-download-ftp  " ">
   <!ENTITY pixman-md5sum        "e80ebae4da01e77f68744319f01d52a3">
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/poppler.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,15 +5,15 @@
   %general-entities;
 
-  <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
-  <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "bc5a191741604552c90d484103229374">
-  <!ENTITY poppler-size               "1.6 MB">
-  <!ENTITY poppler-buildsize          "50 MB (with Qt5 library)">
-  <!ENTITY poppler-time               "1.3 SBU (with Qt5 library)">
+  <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
+  <!ENTITY poppler-download-ftp  " ">
+  <!ENTITY poppler-md5sum        "bc5a191741604552c90d484103229374">
+  <!ENTITY poppler-size          "1.6 MB">
+  <!ENTITY poppler-buildsize     "50 MB (with Qt5 library)">
+  <!ENTITY poppler-time          "1.3 SBU (with Qt5 library)">
 
 
   <!ENTITY poppler-data-version       "0.4.8">
 
-  <!ENTITY poppler-data-download-http "http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
+  <!ENTITY poppler-data-download-http "https://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
   <!ENTITY poppler-data-md5sum        "00f8989c804de84af0ba2ea629949980">
   <!ENTITY poppler-data-size          "4.1 MB">
Index: general/graphlib/potrace.xml
===================================================================
--- general/graphlib/potrace.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/potrace.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY potrace-download-http "https://sourceforge.net/projects/potrace/files/&potrace-version;/potrace-&potrace-version;.tar.gz">
-  <!ENTITY potrace-download-ftp       " ">
-  <!ENTITY potrace-md5sum             "60cecdaa9d14e0008f96b68dce77d246">
-  <!ENTITY potrace-size               "636 KB">
-  <!ENTITY potrace-buildsize          "7.5 MB (including tests)">
-  <!ENTITY potrace-time               "less than 0.1 SBU (including tests)">
+  <!ENTITY potrace-download-http "&sourceforge-dl;/potrace/potrace-&potrace-version;.tar.gz">
+  <!ENTITY potrace-download-ftp  " ">
+  <!ENTITY potrace-md5sum        "60cecdaa9d14e0008f96b68dce77d246">
+  <!ENTITY potrace-size          "636 KB">
+  <!ENTITY potrace-buildsize     "7.5 MB (including tests)">
+  <!ENTITY potrace-time          "less than 0.1 SBU (including tests)">
 ]>
 
Index: general/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/graphlib/qpdf.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY qpdf-download-http "&sourceforge-repo;/qpdf/qpdf-&qpdf-version;.tar.gz">
+  <!ENTITY qpdf-download-http "&sourceforge-dl;/qpdf/qpdf-&qpdf-version;.tar.gz">
   <!ENTITY qpdf-download-ftp  " ">
   <!ENTITY qpdf-md5sum        "e014bd3ecf1c4d1a520bbc14d84ac20e">
Index: general/prog/autoconf213.xml
===================================================================
--- general/prog/autoconf213.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/autoconf213.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY autoconf213-download-http "http://ftp.gnu.org/gnu/autoconf/autoconf-&autoconf213-version;.tar.gz">
-  <!ENTITY autoconf213-download-ftp "ftp://ftp.gnu.org/gnu/autoconf/autoconf-&autoconf213-version;.tar.gz">
+  <!ENTITY autoconf213-download-http "&gnu-http;/autoconf/autoconf-&autoconf213-version;.tar.gz">
+  <!ENTITY autoconf213-download-ftp  "&gnu-ftp;/autoconf/autoconf-&autoconf213-version;.tar.gz">
   <!ENTITY autoconf213-md5sum        "9de56d4a161a723228220b0f425dc711">
   <!ENTITY autoconf213-size          "434 KB">
Index: general/prog/beaker.xml
===================================================================
--- general/prog/beaker.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/beaker.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY Beaker-download-http
-           "https://pypi.python.org/packages/93/b2/12de6937b06e9615dbb3cb3a1c9af17f133f435bdef59f4ad42032b6eb49/Beaker-&Beaker-version;.tar.gz">
+  <!ENTITY Beaker-download-http "&pymodules-dl;/B/Beaker/Beaker-&Beaker-version;.tar.gz">
   <!ENTITY Beaker-download-ftp  " ">
   <!ENTITY Beaker-md5sum        "38b3fcdfa24faf97c6cf66991eb54e9c">
Index: general/prog/cargo.xml
===================================================================
--- general/prog/cargo.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/cargo.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cargo-download-http "https://github.com/rust-lang/cargo/archive/&cargo-version;.tar.gz">
+  <!ENTITY cargo-download-http "https://github.com/rust-lang/cargo/archive/&cargo-version;/cargo-&cargo-version;.tar.gz">
   <!ENTITY cargo-download-ftp  " ">
   <!ENTITY cargo-md5sum        "c0bdbfdeead6a7cdfd7fbfe2183bfc61">
@@ -59,11 +59,4 @@
 
     &lfs80_checked;
-
-    <note><para><application>Firefox</application> will download a correctly
-    named tarball, or you can download it via wget as:</para>
-
-<screen><userinput>wget https://github.com/rust-lang/cargo/archive/&cargo-version;.tar.gz \
-     -O cargo-&cargo-version;.tar.gz</userinput></screen>
-    </note>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/clisp.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY clisp-download-http "http://ftp.gnu.org/pub/gnu/clisp/latest/clisp-&clisp-version;.tar.bz2">
-  <!ENTITY clisp-download-ftp "ftp://ftp.gnu.org/pub/gnu/clisp/latest/clisp-&clisp-version;.tar.bz2">
+  <!ENTITY clisp-download-http "&gnu-http;/clisp/latest/clisp-&clisp-version;.tar.bz2">
+  <!ENTITY clisp-download-ftp  "&gnu-ftp;/clisp/latest/clisp-&clisp-version;.tar.bz2">
   <!ENTITY clisp-md5sum        "1962b99d5e530390ec3829236d168649">
   <!ENTITY clisp-size          "7.8 MB">
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/cmake.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
+  <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
   <!ENTITY cmake-md5sum        "00f43c6a56d4903436317c14f9ca7f37">
@@ -89,5 +89,5 @@
       <xref linkend="subversion"/> (for testing),
       <ulink url="https://github.com/libuv/libuv/releases">libuv</ulink>, and 
-      <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
       (for building documents)
     </para>
Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/dbus-python.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY dbus-python-download-http "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
+  <!ENTITY dbus-python-download-http "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
   <!ENTITY dbus-python-download-ftp  " ">
   <!ENTITY dbus-python-md5sum        "7372a588c83a7232b4e08159bfd48fe5">
Index: general/prog/dejagnu.xml
===================================================================
--- general/prog/dejagnu.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/dejagnu.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY dejagnu-download-http "https://ftp.gnu.org/pub/gnu/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-download-ftp  "ftp://ftp.gnu.org/pub/gnu/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
+  <!ENTITY dejagnu-download-http "&gnu-http;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
+  <!ENTITY dejagnu-download-ftp  "&gnu-ftp;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
   <!ENTITY dejagnu-md5sum        "1fdc2eb0d592c4f89d82d24dfdf02f0b">
   <!ENTITY dejagnu-size          "512 KB">
Index: general/prog/elfutils.xml
===================================================================
--- general/prog/elfutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/elfutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY elfutils-download-http
-    "https://sourceware.org/elfutils/ftp/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
+    "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
   <!ENTITY elfutils-download-ftp  
      "ftp://sourceware.org/pub/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
Index: general/prog/expect.xml
===================================================================
--- general/prog/expect.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/expect.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY expect-download-http "http://prdownloads.sourceforge.net/expect/expect&expect-version;.tar.gz">
+  <!ENTITY expect-download-http "&sourceforge-dl;/expect/expect&expect-version;.tar.gz">
   <!ENTITY expect-download-ftp  " ">
   <!ENTITY expect-md5sum        "44e1a4f4c877e9ddc5a542dfa7ecc92b">
Index: general/prog/funcsigs.xml
===================================================================
--- general/prog/funcsigs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/funcsigs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY funcsigs-download-http
-           "https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-&funcsigs-version;.tar.gz">
+  <!ENTITY funcsigs-download-http "&pymodules-dl;/f/funcsigs/funcsigs-&funcsigs-version;.tar.gz">
   <!ENTITY funcsigs-download-ftp  " ">
   <!ENTITY funcsigs-md5sum        "7e583285b1fb8a76305d6d68f4ccc14e">
Index: general/prog/gcc-ada.xml
===================================================================
--- general/prog/gcc-ada.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/gcc-ada.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gcc-download-http     "http://ftpmirror.gnu.org/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
-  <!ENTITY gcc-download-ftp      "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
+  <!ENTITY gcc-download-http     "&gnu-http;/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
+  <!ENTITY gcc-download-ftp      "&gnu-ftp;/gcc/gcc-&gcc-ada-version;/gcc-&gcc-ada-version;.tar.xz">
   <!ENTITY gcc-md5sum            "ff370482573133a7fcdd96cd2f552292">
   <!ENTITY gcc-size              "59 MB">
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/gcc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gcc-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-  <!ENTITY gcc-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
+  <!ENTITY gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
+  <!ENTITY gcc-download-ftp   "&gnu-ftp;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
   <!ENTITY gcc-md5sum         "ff370482573133a7fcdd96cd2f552292">
   <!ENTITY gcc-size           "59 MB">
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/gdb.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gdb-download-http "https://ftp.gnu.org/gnu/gdb/gdb-&gdb-version;.tar.xz">
-  <!ENTITY gdb-download-ftp  "ftp://ftp.gnu.org/gnu/gdb/gdb-&gdb-version;.tar.xz">
+  <!ENTITY gdb-download-http "&gnu-http;/gdb/gdb-&gdb-version;.tar.xz">
+  <!ENTITY gdb-download-ftp  "&gnu-ftp;/gdb/gdb-&gdb-version;.tar.xz">
   <!ENTITY gdb-md5sum        "c3d35cd949084be53b92cc1e03485f88">
   <!ENTITY gdb-size          "19 MB">
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/git.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY git-root "https://www.kernel.org/pub/software/scm/git" >
+  <!ENTITY git-root "&kernel-dl;/software/scm/git" >
 
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/guile.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.xz">
-  <!ENTITY guile-download-ftp  "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.xz">
+  <!ENTITY guile-download-http "&gnu-http;/guile/guile-&guile-version;.tar.xz">
+  <!ENTITY guile-download-ftp  "&gnu-ftp;/guile/guile-&guile-version;.tar.xz">
   <!ENTITY guile-md5sum        "d3c002bcf92dbf68f6de45803874db0f">
   <!ENTITY guile-size          "10.3 MB">
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/jinja2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,5 @@
   %general-entities;
 
-<!-- Don't like this URL either. -renodr -->
-  <!ENTITY Jinja2-download-http
-           "https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/Jinja2-&Jinja2-version;.tar.gz">
+  <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
   <!ENTITY Jinja2-download-ftp  " ">
   <!ENTITY Jinja2-md5sum        "6411537324b4dba0956aaa8109f3c77b">
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/llvm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -167,5 +167,5 @@
       <xref linkend="zip"/>,
       <ulink url="http://www.ocaml.org/">OCaml</ulink>, and
-      <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
     </para>
 
Index: general/prog/llvm3.xml
===================================================================
--- general/prog/llvm3.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/llvm3.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -116,5 +116,5 @@
       <xref linkend="zip"/>,
       <ulink url="http://www.ocaml.org/">OCaml</ulink>, and
-      <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
     </para>
 
Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/lxml.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxml-download-http
-           "https://pypi.io/packages/source/l/lxml/lxml-&lxml-version;.tar.gz">
+  <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
   <!ENTITY lxml-download-ftp  " ">
   <!ENTITY lxml-md5sum        "e54e2fae44d684d6b9c636fe189e93ff">
Index: general/prog/mako.xml
===================================================================
--- general/prog/mako.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/mako.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY Mako-download-http
-           "https://pypi.python.org/packages/source/M/Mako/Mako-&mako-version;.tar.gz">
+  <!ENTITY Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
   <!ENTITY Mako-download-ftp  " ">
   <!ENTITY Mako-md5sum        "c5fc31a323dd4990683d2f2da02d4e20">
Index: general/prog/markupsafe.xml
===================================================================
--- general/prog/markupsafe.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/markupsafe.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY MarkupSafe-download-http
-           "https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-&MarkupSafe-version;.tar.gz">
+  <!ENTITY MarkupSafe-download-http "&pymodules-dl;/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
   <!ENTITY MarkupSafe-download-ftp  " ">
   <!ENTITY MarkupSafe-md5sum        "2fcedc9284d50e577b5192e8e3578355">
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/mercurial.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -77,5 +77,5 @@
     <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
     <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
-    <ulink url="http://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
+    <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
     <ulink url="http://pygments.org/">pygments</ulink>, and
     <ulink url="https://github.com/pyca/pyopenssl">pyOpenSSL</ulink>
Index: general/prog/ninja.xml
===================================================================
--- general/prog/ninja.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/ninja.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY ninja-download-http "https://github.com/ninja-build/ninja/archive/v&ninja-version;.tar.gz">
+  <!ENTITY ninja-download-http "https://github.com/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
   <!ENTITY ninja-download-ftp  " ">
   <!ENTITY ninja-md5sum        "7b482218757acbaeac4d4d54a3cd94e1">
@@ -36,9 +36,4 @@
 
     &lfs80_checked;
-
-    <note><para>Download this file via wget as:</para>
-<screen><userinput>wget https://github.com/ninja-build/ninja/archive/v&ninja-version;.tar.gz \
-     -O ninja-&ninja-version;.tar.gz</userinput></screen>
-    </note>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/other-tools.xml
===================================================================
--- general/prog/other-tools.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/other-tools.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -744,5 +744,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://ftp.gnu.org/gnu/smalltalk/"/></para>
+          url="&gnu-http;/smalltalk/"/></para>
         </listitem>
       </itemizedlist>
@@ -1163,5 +1163,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/ooc/"/></para>
+          url="&sourceforge-dl;/ooc/"/></para>
         </listitem>
       </itemizedlist>
@@ -1183,5 +1183,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/ogdl/"/></para>
+          url="&sourceforge-dl;/ogdl/"/></para>
         </listitem>
       </itemizedlist>
@@ -1270,5 +1270,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/q-lang/"/></para>
+          url="&sourceforge-dl;/q-lang/"/></para>
         </listitem>
       </itemizedlist>
@@ -1327,5 +1327,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/regina-rexx"/></para>
+          url="&sourceforge-dl;/regina-rexx"/></para>
         </listitem>
       </itemizedlist>
@@ -1492,5 +1492,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/sbcl/"/></para>
+          url="&sourceforge-dl;/sbcl/"/></para>
         </listitem>
       </itemizedlist>
@@ -1550,5 +1550,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/tiny-cobol/"/></para>
+          url="&sourceforge-dl;/tiny-cobol/"/></para>
         </listitem>
       </itemizedlist>
@@ -1751,5 +1751,5 @@
           <listitem>
             <para>Download Location: <ulink
-            url="&sourceforge-repo;/gtk2-perl"/></para>
+            url="&sourceforge-dl;/gtk2-perl"/></para>
           </listitem>
         </itemizedlist>
@@ -1792,5 +1792,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/numpy/"/></para>
+          url="&sourceforge-dl;/numpy/"/></para>
         </listitem>
       </itemizedlist>
@@ -1845,5 +1845,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/swig/"/></para>
+          url="&sourceforge-dl;/swig/"/></para>
         </listitem>
       </itemizedlist>
@@ -1977,5 +1977,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/cachecc1"/></para>
+          url="&sourceforge-dl;/cachecc1"/></para>
         </listitem>
       </itemizedlist>
@@ -2026,5 +2026,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://ftp.gnu.org/gnu/ddd/"/></para>
+          url="&gnu-http;/ddd/"/></para>
         </listitem>
       </itemizedlist>
@@ -2079,5 +2079,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/ctags/"/></para>
+          url="&sourceforge-dl;/ctags/"/></para>
         </listitem>
       </itemizedlist>
@@ -2100,5 +2100,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/gocache/"/></para>
+          url="&sourceforge-dl;/gocache/"/></para>
         </listitem>
       </itemizedlist>
@@ -2151,5 +2151,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="&sourceforge-repo;/strace/"/></para>
+          url="&sourceforge-dl;/strace/"/></para>
         </listitem>
       </itemizedlist>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/perl-modules.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,55 +7,55 @@
   %general-entities;
 
-  <!ENTITY perl_authors  "http://cpan.metacpan.org/authors">
-
-  <!ENTITY Archive-Zip-download-http "http://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
+  <!ENTITY perl_authors "https://www.cpan.org/authors">
+
+  <!ENTITY Archive-Zip-download-http "&perl_authors;/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
   <!ENTITY Archive-Zip-md5sum "b649a593391573f9382cef8c08d1d5ba">
 
-  <!ENTITY autovivification-download-http "http://www.cpan.org/authors/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
+  <!ENTITY autovivification-download-http "&perl_authors;/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
   <!ENTITY autovivification-md5sum "925c7d4c64c623db02845b355e3c6a19">
 
-  <!ENTITY Business-ISBN-download-http "http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
+  <!ENTITY Business-ISBN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
   <!ENTITY Business-ISBN-md5sum "60b36c0a92cf51e9027ec3d9f38e7224">
 
-  <!ENTITY Business-ISMN-download-http "http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
+  <!ENTITY Business-ISMN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
   <!ENTITY Business-ISMN-md5sum "87e36c8ccc9a9434494a849b7cf2fcc5">
 
-  <!ENTITY Business-ISSN-download-http "http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">
+  <!ENTITY Business-ISSN-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">
   <!ENTITY Business-ISSN-md5sum "c226db6cdb9dfe77d17ad1d540b49f47">
 
-  <!ENTITY Class-Accessor-download-http "http://www.cpan.org/authors/id/K/KA/KASEI/Class-Accessor-&Class-Accessor-version;.tar.gz">
+  <!ENTITY Class-Accessor-download-http "&perl_authors;/id/K/KA/KASEI/Class-Accessor-&Class-Accessor-version;.tar.gz">
   <!ENTITY Class-Accessor-md5sum "0d9640d237a13276145f7e44b4855b89">
 
-  <!ENTITY Data-Compare-download-http "http://www.cpan.org/authors/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">
+  <!ENTITY Data-Compare-download-http "&perl_authors;/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">
   <!ENTITY Data-Compare-md5sum "6a397ab5833237f3ca05ed7277b19a7a">
 
-  <!ENTITY Data-Dump-download-http "http://www.cpan.org/authors/id/G/GA/GAAS/Data-Dump-&Data-Dump-version;.tar.gz">
+  <!ENTITY Data-Dump-download-http "&perl_authors;/id/G/GA/GAAS/Data-Dump-&Data-Dump-version;.tar.gz">
   <!ENTITY Data-Dump-md5sum "762c111e525c82ff23d62c90821b26e9">
 
-  <!ENTITY Data-Uniqid-download-http "http://www.cpan.org/authors/id/M/MW/MWX/Data-Uniqid-&Data-Uniqid-version;.tar.gz">
+  <!ENTITY Data-Uniqid-download-http "&perl_authors;/id/M/MW/MWX/Data-Uniqid-&Data-Uniqid-version;.tar.gz">
   <!ENTITY Data-Uniqid-md5sum "6bab3b5da09fedfdf60ce2629a7367db">
 
-  <!ENTITY DateTime-Calendar-Julian-download-http "http://www.cpan.org/authors/id/P/PI/PIJLL/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
+  <!ENTITY DateTime-Calendar-Julian-download-http "&perl_authors;/id/P/PI/PIJLL/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
   <!ENTITY DateTime-Calendar-Julian-md5sum "de688324eb33a27449ac2a5bfe1453a0">
 
-  <!ENTITY DateTime-Format-Builder-download-http "http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-&DateTime-Format-Builder-version;.tar.gz">
+  <!ENTITY DateTime-Format-Builder-download-http "&perl_authors;/id/D/DR/DROLSKY/DateTime-Format-Builder-&DateTime-Format-Builder-version;.tar.gz">
   <!ENTITY DateTime-Format-Builder-md5sum "21d950a9425c0173d6191697bf9dc4dc">
 
-  <!ENTITY Encode-EUCJPASCII-download-http "http://www.cpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">
+  <!ENTITY Encode-EUCJPASCII-download-http "&perl_authors;/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">
   <!ENTITY Encode-EUCJPASCII-md5sum "5daa65f55b7c2050bb0713d9e95f239d">
 
-  <!ENTITY Encode-HanExtra-download-http "http://www.cpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
+  <!ENTITY Encode-HanExtra-download-http "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
   <!ENTITY Encode-HanExtra-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
 
-  <!ENTITY Encode-JIS2K-download-http "http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">
+  <!ENTITY Encode-JIS2K-download-http "&perl_authors;/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">
   <!ENTITY Encode-JIS2K-md5sum "60539471aa408a2b793cd45a6ce651db">
 
-  <!ENTITY Error-download-http "http://www.cpan.org/authors/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
+  <!ENTITY Error-download-http "&perl_authors;/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
   <!ENTITY Error-md5sum "1a2ee7f0dc44f9ee76661a16bbbc0c48">
 
-  <!ENTITY File-BaseDir-download-http "http://www.cpan.org/authors/id/K/KI/KIMRYAN/File-BaseDir-&File-BaseDir-version;.tar.gz">
+  <!ENTITY File-BaseDir-download-http "&perl_authors;/id/K/KI/KIMRYAN/File-BaseDir-&File-BaseDir-version;.tar.gz">
   <!ENTITY File-BaseDir-md5sum "5d10401970d209049c8491d2906c3e13">
 
-  <!ENTITY File-Slurp-download-http "http://www.cpan.org/authors/id/U/UR/URI/File-Slurp-&File-Slurp-version;.tar.gz">
+  <!ENTITY File-Slurp-download-http "&perl_authors;/id/U/UR/URI/File-Slurp-&File-Slurp-version;.tar.gz">
   <!ENTITY File-Slurp-md5sum "7d584cd15c4f8b9547765eff8c4ef078">
 
@@ -63,59 +63,59 @@
   <!ENTITY File-Which-md5sum "115a6efe5d7e9621237fcb655c7a0980">
 
-  <!ENTITY HTML-Parser-download-http "http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
+  <!ENTITY HTML-Parser-download-http "&perl_authors;/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
   <!ENTITY HTML-Parser-md5sum "eb7505e5f626913350df9dd4a03d54a8">
 
-  <!ENTITY IPC-Run3-download-http "http://www.cpan.org/authors/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">
+  <!ENTITY IPC-Run3-download-http "&perl_authors;/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">
   <!ENTITY IPC-Run3-md5sum "5a8cec571c51a118b265cf6e24e55761">
 
-  <!ENTITY libwww-perl-download-http "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-&LWP-version;.tar.gz">
+  <!ENTITY libwww-perl-download-http "&perl_authors;/id/O/OA/OALDERS/libwww-perl-&LWP-version;.tar.gz">
   <!ENTITY libwww-perl-md5sum "457bf4a4f40af3e2f43653329a9c6ab7">
 
-  <!ENTITY Lingua-Translit-download-http "http://www.cpan.org/authors/id/A/AL/ALINKE/Lingua-Translit-&Lingua-Translit-version;.tar.gz">
+  <!ENTITY Lingua-Translit-download-http "&perl_authors;/id/A/AL/ALINKE/Lingua-Translit-&Lingua-Translit-version;.tar.gz">
   <!ENTITY Lingua-Translit-md5sum "e95386614b65b32a8ed9c1a24ae110f8">
 
-  <!ENTITY List-AllUtils-download-http "http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
+  <!ENTITY List-AllUtils-download-http "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
   <!ENTITY List-AllUtils-md5sum "5d7f33d6b21aa461c12b002e20a2cbb6">
 
-  <!ENTITY List-MoreUtils-download-http "http://www.cpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
+  <!ENTITY List-MoreUtils-download-http "&perl_authors;/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
   <!ENTITY List-MoreUtils-md5sum "0a5462045de148c807d3f18e5074064f">
 
-  <!ENTITY Log-Log4perl-download-http "http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
+  <!ENTITY Log-Log4perl-download-http "&perl_authors;/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
   <!ENTITY Log-Log4perl-md5sum "8e96fb5e236c92445947eceb903326ba">
 
-  <!ENTITY LWP-Protocol-https-download-http "http://www.cpan.org/authors/id/M/MS/MSCHILLI/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
+  <!ENTITY LWP-Protocol-https-download-http "&perl_authors;/id/M/MS/MSCHILLI/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
   <!ENTITY LWP-Protocol-https-md5sum "404c7984521699ab4a6973f155f1726f">
 
-  <!ENTITY Module-Build-download-http "http://www.cpan.org/authors/id/L/LE/LEONT/Module-Build-&Module-Build-version;.tar.gz">
+  <!ENTITY Module-Build-download-http "&perl_authors;/id/L/LE/LEONT/Module-Build-&Module-Build-version;.tar.gz">
   <!ENTITY Module-Build-md5sum "b74c2f6e84b60aad3a3defd30b6f0f4d">
 
-  <!ENTITY Net-DNS-download-http "http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
+  <!ENTITY Net-DNS-download-http "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
   <!ENTITY Net-DNS-md5sum "332549b39026d649f29ab130de3174dc">
 
-  <!ENTITY Parse-Yapp-download-http "http://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
+  <!ENTITY Parse-Yapp-download-http "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
   <!ENTITY Parse-Yapp-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
 
-  <!ENTITY Regexp-Common-download-http "http://www.cpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">
+  <!ENTITY Regexp-Common-download-http "&perl_authors;/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">
   <!ENTITY Regexp-Common-md5sum "b1bb40759b84154990f36a160160fb94">
 
-  <!ENTITY SGMLSpm-download-http "&sources-anduin-http;/perl-modules/SGMLSpm-&SGMLSpm-version;.tar.gz">
+  <!ENTITY SGMLSpm-download-http "&perl_authors;/id/R/RA/RAAB/SGMLSpm-&SGMLSpm-version;.tar.gz">
   <!ENTITY SGMLSpm-md5sum "746c74ae969992cedb1a2879b4168090">
 
-  <!ENTITY Sort-Key-download-http "http://www.cpan.org/authors/id/S/SA/SALVA/Sort-Key-&Sort-Key-version;.tar.gz">
+  <!ENTITY Sort-Key-download-http "&perl_authors;/id/S/SA/SALVA/Sort-Key-&Sort-Key-version;.tar.gz">
   <!ENTITY Sort-Key-md5sum "a37ab0da0cfdc26e57b4c79e39f6d98f">
 
-  <!ENTITY Test-Command-download-http "http://www.cpan.org/authors/id/D/DA/DANBOO/Test-Command-&Test-Command-version;.tar.gz">
+  <!ENTITY Test-Command-download-http "&perl_authors;/id/D/DA/DANBOO/Test-Command-&Test-Command-version;.tar.gz">
   <!ENTITY Test-Command-md5sum "9ab83c4695961dbe92cd86efe08f0634">
 
-  <!ENTITY Test-Differences-download-http "http://www.cpan.org/authors/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
+  <!ENTITY Test-Differences-download-http "&perl_authors;/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
   <!ENTITY Test-Differences-md5sum "ecfda620fe133e36a6e392d94ab8424d">
 
-  <!ENTITY Text-BibTeX-download-http "http://www.cpan.org/authors/id/A/AM/AMBS/Text-BibTeX-&Text-BibTeX-version;.tar.gz">
+  <!ENTITY Text-BibTeX-download-http "&perl_authors;/id/A/AM/AMBS/Text-BibTeX-&Text-BibTeX-version;.tar.gz">
   <!ENTITY Text-BibTeX-md5sum "a754759c80ab484c9f2b02b2fd4467c9">
 
-  <!ENTITY Text-CSV-download-http "http://www.cpan.org/authors/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
+  <!ENTITY Text-CSV-download-http "&perl_authors;/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
   <!ENTITY Text-CSV-md5sum "1e076b4b1f8ba6a5003bf93f3c437a9e">
 
-  <!ENTITY Text-Roman-download-http "http://www.cpan.org/authors/id/S/SY/SYP/Text-Roman-&Text-Roman-version;.tar.gz">
+  <!ENTITY Text-Roman-download-http "&perl_authors;/id/S/SY/SYP/Text-Roman-&Text-Roman-version;.tar.gz">
   <!ENTITY Text-Roman-md5sum "1f6b09c0cc1f4425b565ff787a39fd83">
 
@@ -123,23 +123,23 @@
    whereas stable perl releases lag behind.  So, next time the shipped version is
    adequate, just comment it, it will soon get reinstated as a dependency -->
-  <!ENTITY Unicode-Collate-download-http "http://www.cpan.org/authors/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
+  <!ENTITY Unicode-Collate-download-http "&perl_authors;/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
   <!ENTITY Unicode-Collate-md5sum "6f9dcc7801fa2516993dcb59f8b61f6d">
 
-  <!ENTITY Unicode-LineBreak-download-http "http://www.cpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">
+  <!ENTITY Unicode-LineBreak-download-http "&perl_authors;/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">
   <!ENTITY Unicode-LineBreak-md5sum "de7672227922260ac92d20bbad29660b">
 
-  <!ENTITY URI-download-http "http://www.cpan.org/authors/id/E/ET/ETHER/URI-&URI-version;.tar.gz">
+  <!ENTITY URI-download-http "&perl_authors;/id/E/ET/ETHER/URI-&URI-version;.tar.gz">
   <!ENTITY URI-md5sum "cd56d81ed429efaa97e7f3ff08851b48">
 
-  <!ENTITY XML-LibXML-Simple-download-http "http://cpan.org/authors/id/G/GR/GRANTM/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
+  <!ENTITY XML-LibXML-Simple-download-http "&perl_authors;/id/G/GR/GRANTM/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
   <!ENTITY XML-LibXML-Simple-md5sum "1cd2e8e3421160c42277523d5b2f4dd2">
 
-  <!ENTITY XML-LibXSLT-download-http "http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
+  <!ENTITY XML-LibXSLT-download-http "&perl_authors;/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
   <!ENTITY XML-LibXSLT-md5sum "adf26f5195e18087c89ef3e7f7d97c43">
 
-  <!ENTITY XML-Simple-download-http "http://cpan.org/authors/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">
+  <!ENTITY XML-Simple-download-http "&perl_authors;/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">
   <!ENTITY XML-Simple-md5sum "1cd2e8e3421160c42277523d5b2f4dd2">
 
-  <!ENTITY XML-Writer-download-http "http://www.cpan.org/authors/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
+  <!ENTITY XML-Writer-download-http "&perl_authors;/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
   <!ENTITY XML-Writer-md5sum "b9c2420c243c6a36ce45a008740fcede">
 
Index: general/prog/pycrypto.xml
===================================================================
--- general/prog/pycrypto.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/pycrypto.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pycrypto-download-http "https://pypi.python.org/packages/60/db/645aa9af249f059cc3a368b118de33889219e0362141e75d4eaf6f80f163/pycrypto-&pycrypto-version;.tar.gz">
+  <!ENTITY pycrypto-download-http "&pymodules-dl;/p/pycrypto/pycrypto-&pycrypto-version;.tar.gz">
   <!ENTITY pycrypto-download-ftp  " ">
   <!ENTITY pycrypto-md5sum        "55a61a054aa66812daf5161a0d5d7eda">
Index: general/prog/pyxdg.xml
===================================================================
--- general/prog/pyxdg.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/pyxdg.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY pyxdg-download-http
-           "http://people.freedesktop.org/~takluyver/pyxdg-&pyxdg-version;.tar.gz">
+           "https://people.freedesktop.org/~takluyver/pyxdg-&pyxdg-version;.tar.gz">
   <!ENTITY pyxdg-download-ftp  " ">
   <!ENTITY pyxdg-md5sum        "bedcdb3a0ed85986d40044c87f23477c">
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/ruby.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,7 +7,4 @@
   <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
   <!ENTITY ruby-download-ftp  " ">
-<!--
-  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
--->
   <!ENTITY ruby-md5sum        "894467211c4ae1dbf8a41bb0d58bbc89">
   <!ENTITY ruby-size          "9.5 MB">
Index: general/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/scons.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY scons-download-http "&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
+  <!ENTITY scons-download-http "&sourceforge-dl;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
   <!ENTITY scons-md5sum        "aaaf09e1351a598f98d17b0cf1103e7a">
Index: general/prog/scour.xml
===================================================================
--- general/prog/scour.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/scour.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY scour-download-http "https://github.com/scour-project/scour/archive/v&scour-version;.tar.gz">
+  <!ENTITY scour-download-http "https://github.com/scour-project/scour/archive/v&scour-version;/scour-&scour-version;.tar.gz">
   <!ENTITY scour-download-ftp  " ">
   <!ENTITY scour-md5sum        "f7d03395a9ce51f822e5741034783e04">
@@ -66,16 +66,4 @@
         </listitem>
       </itemizedlist>
-
-    <note>
-      <para>
-        The <application>Scour</application> source tarball shown above
-        downloads with the correct name, scour-&scour-version;.tar.gz, if
-        using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain v&scour-version;.tar.gz.
-        To obtain this package with the proper filename, run:
-
-<screen><userinput>wget https://github.com/scour-project/scour/archive/v&scour-version;.tar.gz -O scour-&scour-version;.tar.gz</userinput></screen>
-        </para>
-      </note>
 
       <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
Index: general/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/slang.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY slang-download-http  "http://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
-  <!ENTITY slang-download-ftp " ">
+  <!ENTITY slang-download-http "http://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
+  <!ENTITY slang-download-ftp  " ">
   <!ENTITY slang-md5sum        "bd46d1dc17a50c72004ad842829d7b1f">
   <!ENTITY slang-size          "1.5 MB">
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/subversion.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY subversion-download-http
-  "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
+  <!ENTITY subversion-download-http "https://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
   <!ENTITY subversion-md5sum        "05b0c677681073920f938c1f322e0be2">
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/swig.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY swig-download-http "&sourceforge-repo;/swig/swig-&swig-version;.tar.gz">
+  <!ENTITY swig-download-http "&sourceforge-dl;/swig/swig-&swig-version;.tar.gz">
   <!ENTITY swig-download-ftp  " ">
   <!ENTITY swig-md5sum        "82133dfa7bba75ff9ad98a7046be687c">
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/tcl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
+  <!ENTITY tcl-download-http "&sourceforge-dl;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  " ">
   <!ENTITY tcl-md5sum        "5673aaf45b5de5d8dd80bb3daaeb8838">
@@ -12,5 +12,5 @@
   <!ENTITY tcl-time          "0.9 SBU (additional 2.9 SBU for the tests)">
 
-  <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
+  <!ENTITY tcl-doc-download  "&sourceforge-dl;/tcl/tcl&tcl-version;-html.tar.gz">
   <!ENTITY tcl-doc-md5sum    "0da678eaf3041346030898c23c14e97e">
   <!ENTITY tcl-doc-size      "1.2 MB">
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/tk.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
+  <!ENTITY tk-download-http "&sourceforge-dl;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  " ">
   <!ENTITY tk-md5sum        "46ea9c0165c515d87393700f4891ab6f">
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/prog/valgrind.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY valgrind-download-http " ">
+  <!ENTITY valgrind-download-http "https://sourceware.org/ftp/valgrind/valgrind-&valgrind-version;.tar.bz2">
   <!ENTITY valgrind-download-ftp  "ftp://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
   <!ENTITY valgrind-md5sum        "817dd08f1e8a66336b9ff206400a5369">
Index: general/sysutils/acpid.xml
===================================================================
--- general/sysutils/acpid.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/acpid.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY acpid-download-http "&sourceforge-repo;/acpid2/acpid-&acpid-version;.tar.xz">
+  <!ENTITY acpid-download-http "&sourceforge-dl;/acpid2/acpid-&acpid-version;.tar.xz">
   <!ENTITY acpid-download-ftp  " ">
   <!ENTITY acpid-md5sum        "0432407b5ff75ae8e08afb43052fde2b">
Index: general/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/autofs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY autofs-download-http "http://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
+  <!ENTITY autofs-download-http "&kernel-dl;/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
   <!ENTITY autofs-download-ftp  " ">
   <!ENTITY autofs-md5sum        "57a6791e596b8b8ee2c4c50420881180">
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/bluez.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY bluez-download-http "http://www.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
+  <!ENTITY bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  " ">
   <!ENTITY bluez-md5sum        "913f35d6fa4ca5772c53adb936bf1947">
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/colord.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY colord-download-http
-           "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
+           "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
   <!ENTITY colord-md5sum        "80b106ba18a43c7eeaf2d9a2b8c5725b">
Index: general/sysutils/colord1.xml
===================================================================
--- general/sysutils/colord1.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/colord1.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY colord1-download-http "http://www.freedesktop.org/software/colord/releases/colord-&colord1-version;.tar.xz">
+  <!ENTITY colord1-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord1-version;.tar.xz">
   <!ENTITY colord1-download-ftp  " ">
   <!ENTITY colord1-md5sum        "a8e7fcf0a45383ca7a65cef91ca5e019">
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/cpio.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.bz2">
-  <!ENTITY cpio-download-ftp  "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.bz2">
+  <!ENTITY cpio-download-http "&gnu-http;/cpio/cpio-&cpio-version;.tar.bz2">
+  <!ENTITY cpio-download-ftp  "&gnu-ftp;/cpio/cpio-&cpio-version;.tar.bz2">
   <!ENTITY cpio-md5sum        "93eea9f07c0058c097891c73e4955456">
   <!ENTITY cpio-size          "1.2 MB">
Index: general/sysutils/cups-pk-helper.xml
===================================================================
--- general/sysutils/cups-pk-helper.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/cups-pk-helper.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY cups-pk-helper-download-http
-           "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-&cups-pk-helper-version;.tar.xz">
+           "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-&cups-pk-helper-version;.tar.xz">
   <!ENTITY cups-pk-helper-download-ftp  " ">
   <!ENTITY cups-pk-helper-md5sum        "a9045c7db6e502d6496da8fc71d8820e">
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/dbus.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
+  <!ENTITY dbus-download-http "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
   <!ENTITY dbus-download-ftp  " ">
   <!ENTITY dbus-md5sum        "94c991e763d4f9f13690416b2dcd9411">
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/hdparm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY hdparm-download-http "&sourceforge-repo;/hdparm/hdparm-&hdparm-version;.tar.gz">
+  <!ENTITY hdparm-download-http "&sourceforge-dl;/hdparm/hdparm-&hdparm-version;.tar.gz">
   <!ENTITY hdparm-download-ftp  " ">
   <!ENTITY hdparm-md5sum        "410539d0bf3cc247181594581edbfb53">
Index: general/sysutils/initdtools.xml
===================================================================
--- general/sysutils/initdtools.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/initdtools.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -4,5 +4,5 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY initd-tools-download-http "http://people.freedesktop.org/~dbn/initd-tools/releases/initd-tools-&initd-tools-version;.tar.gz">
+  <!ENTITY initd-tools-download-http "https://people.freedesktop.org/~dbn/initd-tools/releases/initd-tools-&initd-tools-version;.tar.gz">
   <!ENTITY initd-tools-download-ftp  " ">
   <!ENTITY initd-tools-md5sum        "ab6377700ace81ec5a556ebdbae1d8d9">
Index: general/sysutils/lm_sensors.xml
===================================================================
--- general/sysutils/lm_sensors.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/lm_sensors.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,10 +5,6 @@
   %general-entities;
 
-<!--  <!ENTITY lm_sensors-download-http "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-&lm_sensors-version;.tar.bz2">-->
-
-  <!ENTITY lm_sensors-download-http "&fedora-http-repo;/lm_sensors/lm_sensors-&lm_sensors-version;.tar.bz2/&lm_sensors-md5sum;/lm_sensors-&lm_sensors-version;.tar.bz2">
-  <!ENTITY lm_sensors-download-ftp " ">
-<!--  <!ENTITY lm_sensors-download-ftp
-           "ftp://ftp.netroedge.com/pub/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">-->
+  <!ENTITY lm_sensors-download-http "https://ftp.gwdg.de/pub/linux/misc/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
+  <!ENTITY lm_sensors-download-ftp  "ftp://ftp.gwdg.de/pub/linux/misc/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
   <!ENTITY lm_sensors-md5sum        "c03675ae9d43d60322110c679416901a">
   <!ENTITY lm_sensors-size          "172 KB">
Index: general/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/modemmanager.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY ModemManager-download-http "http://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
+  <!ENTITY ModemManager-download-http "https://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
   <!ENTITY ModemManager-download-ftp  " ">
   <!ENTITY ModemManager-md5sum        "ac08d539ec3dc35db8d6b7c8d6c660ff">
Index: general/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/p7zip.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY p7zip-download-http "&sourceforge-repo;/p7zip/p7zip_&p7zip-version;_src_all.tar.bz2">
+  <!ENTITY p7zip-download-http "&sourceforge-dl;/p7zip/p7zip_&p7zip-version;_src_all.tar.bz2">
   <!ENTITY p7zip-download-ftp  " ">
   <!ENTITY p7zip-md5sum        "a0128d661cfe7cc8c121e73519c54fbf">
Index: general/sysutils/pax.xml
===================================================================
--- general/sysutils/pax.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/pax.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pax-download-http "&sourceforge-repo;/heirloom/heirloom-&pax-version;.tar.bz2">
+  <!ENTITY pax-download-http "&sourceforge-dl;/heirloom/heirloom-&pax-version;.tar.bz2">
   <!ENTITY pax-download-ftp  " ">
   <!ENTITY pax-md5sum        "d846be4b268b1d55b6ffcef847f09979">
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/pciutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pciutils-download-http "https://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.xz">
+  <!ENTITY pciutils-download-http "&kernel-dl;/software/utils/pciutils/pciutils-&pciutils-version;.tar.xz">
   <!ENTITY pciutils-download-ftp  " ">
   <!ENTITY pciutils-md5sum        "238d9969cc0de8b9105d972007d9d546">
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/pm-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pm-utils-download-http "http://pm-utils.freedesktop.org/releases/pm-utils-&pm-utils-version;.tar.gz">
+  <!ENTITY pm-utils-download-http "https://pm-utils.freedesktop.org/releases/pm-utils-&pm-utils-version;.tar.gz">
   <!ENTITY pm-utils-download-ftp  " ">
   <!ENTITY pm-utils-md5sum        "1742a556089c36c3a89eb1b957da5a60">
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/redland.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -71,5 +71,5 @@
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
-      <ulink url="&sourceforge-repo;/virtuoso/">virtuoso</ulink>, and
+      <ulink url="&sourceforge-dl;/virtuoso/">virtuoso</ulink>, and
       <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>
     </para>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/udisks.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY udisks-download-http "http://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
+  <!ENTITY udisks-download-http "https://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
   <!ENTITY udisks-download-ftp  " ">
   <!ENTITY udisks-md5sum        "70d48dcfe523a74cd7c7fbbc2847fcdd">
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/unzip.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,9 +5,6 @@
   %general-entities;
 
-  <!ENTITY unzip-download-http "&sourceforge-repo;/infozip/unzip60.tar.gz">
-  <!-- <!ENTITY unzip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz">
-  <!ENTITY unzip-download-ftp  "ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz">
-  <!ENTITY unzip-download-ftp  "ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/unzip552.tar.gz"> -->
-  <!ENTITY unzip-download-ftp  " ">
+  <!ENTITY unzip-download-http "&sourceforge-dl;/infozip/unzip60.tar.gz">
+  <!ENTITY unzip-download-ftp  "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz">
   <!ENTITY unzip-md5sum        "62b490407489521db863b523a7f86375">
   <!ENTITY unzip-size          "1.3 MB">
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/upower.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY upower-download-http "http://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz">
+  <!ENTITY upower-download-http "https://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz">
   <!ENTITY upower-download-ftp  " ">
   <!ENTITY upower-md5sum        "ec57b4b7bf0af568f9a7a5603c921d97">
@@ -94,5 +94,5 @@
       <xref linkend="pygobject3"/>,
       <ulink url="https://launchpad.net/umockdev/">umockdev</ulink>, and
-      <ulink url="http://pypi.python.org/pypi/python-dbusmock">python-dbusmock</ulink>
+      <ulink url="https://pypi.python.org/pypi/python-dbusmock">python-dbusmock</ulink>
       (for part of the testsuite).
     </para>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/usbutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY usbutils-download-http "https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-&usbutils-version;.tar.xz">
+  <!ENTITY usbutils-download-http "&kernel-dl;/linux/utils/usb/usbutils/usbutils-&usbutils-version;.tar.xz">
   <!ENTITY usbutils-download-ftp  " ">
   <!ENTITY usbutils-md5sum        "2780b6ae21264c888f8f30fb2aab1259">
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/which.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,6 +7,6 @@
 <!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
 
-  <!ENTITY which-download-http "http://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
-  <!ENTITY which-download-ftp  "ftp://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
+  <!ENTITY which-download-http "&gnu-http;/which/which-&which-version;.tar.gz">
+  <!ENTITY which-download-ftp  "&gnu-ftp;/which/which-&which-version;.tar.gz">
   <!ENTITY which-md5sum        "097ff1a324ae02e0a3b0369f07a7544a">
   <!ENTITY which-size          "148 KB">
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ general/sysutils/zip.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,11 +5,10 @@
   %general-entities;
 
-  <!-- <!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip232.tar.gz"> -->
-  <!ENTITY zip-download-http "&sourceforge-repo;/infozip/zip30.tar.gz">
-  <!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz">
-  <!ENTITY zip-md5sum "7b74551e63f8ee6aab6fbc86676c0d37">
-  <!ENTITY zip-size "1.1 MB">
-  <!ENTITY zip-buildsize "6.4 MB">
-  <!ENTITY zip-time "0.1 SBU">
+  <!ENTITY zip-download-http "&sourceforge-dl;/infozip/zip30.tar.gz">
+  <!ENTITY zip-download-ftp  "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz">
+  <!ENTITY zip-md5sum        "7b74551e63f8ee6aab6fbc86676c0d37">
+  <!ENTITY zip-size          "1.1 MB">
+  <!ENTITY zip-buildsize     "6.4 MB">
+  <!ENTITY zip-time          "0.1 SBU">
 ]>
 
Index: gnome/platform/accountsservice.xml
===================================================================
--- gnome/platform/accountsservice.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ gnome/platform/accountsservice.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY accountsservice-download-http
-           "http://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
+           "https://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
   <!ENTITY accountsservice-download-ftp  " ">
   <!ENTITY accountsservice-md5sum        "b4c0a74bb5f8680dda0b7be27b1c02d9">
Index: gnome/platform/telepathy-glib.xml
===================================================================
--- gnome/platform/telepathy-glib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ gnome/platform/telepathy-glib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY telepathy-glib-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
+           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
   <!ENTITY telepathy-glib-download-ftp  " ">
   <!ENTITY telepathy-glib-md5sum        "cbeb0a24acc26e7f095be281c324da69">
Index: gnome/platform/telepathy-logger.xml
===================================================================
--- gnome/platform/telepathy-logger.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ gnome/platform/telepathy-logger.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY telepathy-logger-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
+           "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
   <!ENTITY telepathy-logger-download-ftp  " ">
   <!ENTITY telepathy-logger-md5sum        "c2f6a31c76cbdf8790500cf4f872ba71">
Index: gnome/platform/telepathy-mission-control.xml
===================================================================
--- gnome/platform/telepathy-mission-control.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ gnome/platform/telepathy-mission-control.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY telepathy-mission-control-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
+           "https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
   <!ENTITY telepathy-mission-control-download-ftp  " ">
   <!ENTITY telepathy-mission-control-md5sum        "eab6c941038702edeece1168f395300c">
Index: lxde/apps/gpicview.xml
===================================================================
--- lxde/apps/gpicview.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/gpicview.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gpicview-download-http "&sourceforge-repo;/lxde/gpicview-&gpicview-version;.tar.xz">
+  <!ENTITY gpicview-download-http "&sourceforge-dl;/lxde/gpicview-&gpicview-version;.tar.xz">
   <!ENTITY gpicview-download-ftp  " ">
   <!ENTITY gpicview-md5sum        "26be9b0c5a234f1afe7d83d02a4a33f4">
Index: lxde/apps/lxappearance-obconf.xml
===================================================================
--- lxde/apps/lxappearance-obconf.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/lxappearance-obconf.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxappearance-obconf-download-http "&sourceforge-repo;/lxde/lxappearance-obconf-&lxappearance-obconf-version;.tar.xz">
+  <!ENTITY lxappearance-obconf-download-http "&sourceforge-dl;/lxde/lxappearance-obconf-&lxappearance-obconf-version;.tar.xz">
   <!ENTITY lxappearance-obconf-download-ftp  " ">
   <!ENTITY lxappearance-obconf-md5sum        "ae0076d489aa786f5d573f7ff592a4ab">
Index: lxde/apps/lxinput.xml
===================================================================
--- lxde/apps/lxinput.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/lxinput.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxinput-download-http "&sourceforge-repo;/lxde/lxinput-&lxinput-version;.tar.xz">
+  <!ENTITY lxinput-download-http "&sourceforge-dl;/lxde/lxinput-&lxinput-version;.tar.xz">
   <!ENTITY lxinput-download-ftp  " ">
   <!ENTITY lxinput-md5sum        "69680debaef053d540ae3a5f4b237150">
Index: lxde/apps/lxrandr.xml
===================================================================
--- lxde/apps/lxrandr.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/lxrandr.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxrandr-download-http "&sourceforge-repo;/lxde/lxrandr-&lxrandr-version;.tar.xz">
+  <!ENTITY lxrandr-download-http "&sourceforge-dl;/lxde/lxrandr-&lxrandr-version;.tar.xz">
   <!ENTITY lxrandr-download-ftp  " ">
   <!ENTITY lxrandr-md5sum        "b327938f18a4baac85c4707f927d606e">
Index: lxde/apps/lxtask.xml
===================================================================
--- lxde/apps/lxtask.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/lxtask.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxtask-download-http "&sourceforge-repo;/lxde/lxtask-&lxtask-version;.tar.xz">
+  <!ENTITY lxtask-download-http "&sourceforge-dl;/lxde/lxtask-&lxtask-version;.tar.xz">
   <!ENTITY lxtask-download-ftp  " ">
   <!ENTITY lxtask-md5sum        "dd4f423dda192cb50618c6b1e76ec6b7">
Index: lxde/apps/lxterminal.xml
===================================================================
--- lxde/apps/lxterminal.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/apps/lxterminal.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxterminal-download-http "&sourceforge-repo;/lxde/lxterminal-&lxterminal-version;.tar.xz">
+  <!ENTITY lxterminal-download-http "&sourceforge-dl;/lxde/lxterminal-&lxterminal-version;.tar.xz">
   <!ENTITY lxterminal-download-ftp  " ">
   <!ENTITY lxterminal-md5sum        "235cda66f5a35654cb162dcc518a5171">
Index: lxde/desktop/libfm-extra.xml
===================================================================
--- lxde/desktop/libfm-extra.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/libfm-extra.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libfm-download-http "&sourceforge-repo;/pcmanfm/libfm-&libfm-extra-version;.tar.xz">
+  <!ENTITY libfm-download-http "&sourceforge-dl;/pcmanfm/libfm-&libfm-extra-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
   <!ENTITY libfm-md5sum        "a1ba9ae5e920f38b647dd511edd6c807">
Index: lxde/desktop/libfm.xml
===================================================================
--- lxde/desktop/libfm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/libfm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libfm-download-http "&sourceforge-repo;/pcmanfm/libfm-&libfm-version;.tar.xz">
+  <!ENTITY libfm-download-http "&sourceforge-dl;/pcmanfm/libfm-&libfm-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
   <!ENTITY libfm-md5sum        "a1ba9ae5e920f38b647dd511edd6c807">
Index: lxde/desktop/lxappearance.xml
===================================================================
--- lxde/desktop/lxappearance.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/lxappearance.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxappearance-download-http "&sourceforge-repo;/lxde/lxappearance-&lxappearance-version;.tar.xz">
+  <!ENTITY lxappearance-download-http "&sourceforge-dl;/lxde/lxappearance-&lxappearance-version;.tar.xz">
   <!ENTITY lxappearance-download-ftp  " ">
   <!ENTITY lxappearance-md5sum        "f10345313e2c12bad51c1b58bd46b454">
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/lxde-common.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxde-common-download-http "&sourceforge-repo;/lxde/lxde-common-&lxde-common-version;.tar.xz">
+  <!ENTITY lxde-common-download-http "&sourceforge-dl;/lxde/lxde-common-&lxde-common-version;.tar.xz">
   <!ENTITY lxde-common-download-ftp  " ">
   <!ENTITY lxde-common-md5sum        "14a9d19c4576dc15d985453ccb8ca9f6">
Index: lxde/desktop/lxmenu-data.xml
===================================================================
--- lxde/desktop/lxmenu-data.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/lxmenu-data.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxmenu-data-download-http "&sourceforge-repo;/lxde/lxmenu-data-&lxmenu-data-version;.tar.xz">
+  <!ENTITY lxmenu-data-download-http "&sourceforge-dl;/lxde/lxmenu-data-&lxmenu-data-version;.tar.xz">
   <!ENTITY lxmenu-data-download-ftp  " ">
   <!ENTITY lxmenu-data-md5sum        "cc1989444284a65dbc7047348a68d6d4">
Index: lxde/desktop/lxpanel.xml
===================================================================
--- lxde/desktop/lxpanel.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/lxpanel.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxpanel-download-http "&sourceforge-repo;/lxde/lxpanel-&lxpanel-version;.tar.xz">
+  <!ENTITY lxpanel-download-http "&sourceforge-dl;/lxde/lxpanel-&lxpanel-version;.tar.xz">
   <!ENTITY lxpanel-download-ftp  " ">
   <!ENTITY lxpanel-md5sum        "57f0add873815dc608eb45241c9504a7">
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/lxsession.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxsession-download-http "&sourceforge-repo;/lxde/lxsession-&lxsession-version;.tar.xz">
+  <!ENTITY lxsession-download-http "&sourceforge-dl;/lxde/lxsession-&lxsession-version;.tar.xz">
   <!ENTITY lxsession-download-ftp  " ">
   <!ENTITY lxsession-md5sum        "823c50e6d0e4ce15a23a42e8f8bf4221">
Index: lxde/desktop/menu-cache.xml
===================================================================
--- lxde/desktop/menu-cache.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/menu-cache.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY menu-cache-download-http "&sourceforge-repo;/lxde/menu-cache-&menu-cache-version;.tar.xz">
+  <!ENTITY menu-cache-download-http "&sourceforge-dl;/lxde/menu-cache-&menu-cache-version;.tar.xz">
   <!ENTITY menu-cache-download-ftp  " ">
   <!ENTITY menu-cache-md5sum        "8dde7a3f5bd9798d0129d1979a5d7640">
Index: lxde/desktop/pcmanfm.xml
===================================================================
--- lxde/desktop/pcmanfm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ lxde/desktop/pcmanfm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pcmanfm-download-http "&sourceforge-repo;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.xz">
+  <!ENTITY pcmanfm-download-http "&sourceforge-dl;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.xz">
   <!ENTITY pcmanfm-download-ftp  " ">
   <!ENTITY pcmanfm-md5sum        "b4d1f8ce08d87e4f27805a246fc51ac2">
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/audioutils/cdparanoia.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY CDParanoia-download-http "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-&CDParanoia-version;.src.tgz">
+  <!ENTITY CDParanoia-download-http "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-&CDParanoia-version;.src.tgz">
   <!ENTITY CDParanoia-download-ftp  " ">
   <!ENTITY CDParanoia-md5sum        "b304bbe8ab63373924a744eac9ebc652">
Index: multimedia/audioutils/freetts.xml
===================================================================
--- multimedia/audioutils/freetts.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/audioutils/freetts.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY freetts-download-http "&sourceforge-repo;/freetts/freetts-&freetts-version;-src.zip">
+  <!ENTITY freetts-download-http "&sourceforge-dl;/freetts/freetts-&freetts-version;-src.zip">
   <!ENTITY freetts-download-ftp  " ">
   <!ENTITY freetts-md5sum        "692b5ece251fed88539736e55af5f391">
@@ -12,5 +12,5 @@
   <!ENTITY freetts-time          "0.3 SBU">
 
-  <!ENTITY freetts-testsuite-download  "&sourceforge-repo;/freetts/freetts-&freetts-version;-tst.zip">
+  <!ENTITY freetts-testsuite-download  "&sourceforge-dl;/freetts/freetts-&freetts-version;-tst.zip">
   <!ENTITY freetts-testsuite-md5sum    "4348c7db928612d4b6f6eb2fd621a949">
   <!ENTITY freetts-testsuite-size      "3.8 MB">
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/audioutils/lame.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lame-download-http "&sourceforge-repo;/lame/lame-&lame-version;.tar.gz">
+  <!ENTITY lame-download-http "&sourceforge-dl;/lame/lame-&lame-version;.tar.gz">
   <!ENTITY lame-download-ftp  " ">
   <!ENTITY lame-md5sum        "84835b313d4a8b68f5349816d33e07ce">
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/audioutils/mpg123.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mpg123-download-http "&sourceforge-repo;/mpg123/mpg123-&mpg123-version;.tar.bz2">
+  <!ENTITY mpg123-download-http "&sourceforge-dl;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
   <!ENTITY mpg123-md5sum        "43336bef78f67c2e66c4f6c288ca1eb3">
Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/audioutils/vorbistools.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY vorbistools-download-http "http://downloads.xiph.org/releases/vorbis/vorbis-tools-&vorbistools-version;.tar.gz">
+  <!ENTITY vorbistools-download-http "https://downloads.xiph.org/releases/vorbis/vorbis-tools-&vorbistools-version;.tar.gz">
   <!ENTITY vorbistools-download-ftp  " ">
   <!ENTITY vorbistools-md5sum        "567e0fb8d321b2cd7124f8208b8b90e6">
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cdrdao-download-http "&sourceforge-repo;/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
+  <!ENTITY cdrdao-download-http "&sourceforge-dl;/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
   <!ENTITY cdrdao-download-ftp  " ">
   <!ENTITY cdrdao-md5sum        "8d15ba6280bb7ba2f4d6be31d28b3c0c">
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cdrtools-download-http "http://downloads.sourceforge.net/cdrtools/cdrtools-&cdrtools-version;.tar.bz2">
+  <!ENTITY cdrtools-download-http "&sourceforge-dl;/cdrtools/cdrtools-&cdrtools-version;.tar.bz2">
   <!ENTITY cdrtools-download-ftp  " ">
   <!ENTITY cdrtools-md5sum        "ea362a6a42d8aa0d5fc154d195f47926">
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/faac.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY faac-download-http "&sourceforge-repo;/faac/faac-&faac-version;.tar.gz">
+  <!ENTITY faac-download-http "&sourceforge-dl;/faac/faac-&faac-version;.tar.gz">
   <!ENTITY faac-download-ftp  " ">
   <!ENTITY faac-md5sum        "20108ccff238813937ae1fec6eb80e7c">
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/faad2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY faad2-download-http "&sourceforge-repo;/faac/faad2-&faad2-version;.tar.gz">
+  <!ENTITY faad2-download-http "&sourceforge-dl;/faac/faad2-&faad2-version;.tar.gz">
   <!ENTITY faad2-download-ftp  " ">
   <!ENTITY faad2-md5sum        "45f0593e99e97785c5ba79875a4e30a7">
Index: multimedia/libdriv/fdk-aac.xml
===================================================================
--- multimedia/libdriv/fdk-aac.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/fdk-aac.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fdk-aac-download-http "&sourceforge-repo;/opencore-amr/fdk-aac-&fdk-aac-version;.tar.gz">
+  <!ENTITY fdk-aac-download-http "&sourceforge-dl;/opencore-amr/fdk-aac-&fdk-aac-version;.tar.gz">
   <!ENTITY fdk-aac-download-ftp  " ">
   <!ENTITY fdk-aac-md5sum        "f70d394960da66fbf40a2946625690eb">
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/flac.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY flac-download-http "http://downloads.xiph.org/releases/flac/flac-&flac-version;.tar.xz">
+  <!ENTITY flac-download-http "https://downloads.xiph.org/releases/flac/flac-&flac-version;.tar.xz">
   <!ENTITY flac-download-ftp  " ">
   <!ENTITY flac-md5sum        "454f1bfa3f93cc708098d7890d0499bd">
Index: multimedia/libdriv/gavl.xml
===================================================================
--- multimedia/libdriv/gavl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/gavl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gavl-download-http "&sourceforge-repo2;/projects/gmerlin/files/gavl/&gavl-version;/gavl-&gavl-version;.tar.gz">
+  <!ENTITY gavl-download-http "&sourceforge-dl;/gmerlin/gavl-&gavl-version;.tar.gz">
   <!ENTITY gavl-download-ftp  " ">
   <!ENTITY gavl-md5sum        "2752013a817fbc43ddf13552215ec2c0">
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libao.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,6 @@
   %general-entities;
 
-  <!ENTITY libao-download-http "http://downloads.xiph.org/releases/ao/libao-&libao-version;.tar.gz">
+  <!ENTITY libao-download-http "https://downloads.xiph.org/releases/ao/libao-&libao-version;.tar.gz">
   <!ENTITY libao-download-ftp  " ">
-<!--  <!ENTITY libao-download-ftp  "&gentoo-ftp-repo;/libao-&libao-version;.tar.gz">-->
   <!ENTITY libao-md5sum        "9f5dd20d7e95fd0dd72df5353829f097">
   <!ENTITY libao-size          "456 KB">
Index: multimedia/libdriv/libcddb.xml
===================================================================
--- multimedia/libdriv/libcddb.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libcddb.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libcddb-download-http "https://sourceforge.net/projects/libcddb/files/libcddb/1.3.2/libcddb-&libcddb-version;.tar.bz2">
+  <!ENTITY libcddb-download-http "&sourceforge-dl;/libcddb/libcddb-&libcddb-version;.tar.bz2">
   <!ENTITY libcddb-download-ftp  " ">
   <!ENTITY libcddb-md5sum        "8bb4a6f542197e8e9648ae597cd6bc8a">
Index: multimedia/libdriv/libcdio.xml
===================================================================
--- multimedia/libdriv/libcdio.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libcdio.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libcdio-download-http "http://ftp.gnu.org/gnu/libcdio/libcdio-&libcdio-version;.tar.gz">
-  <!ENTITY libcdio-download-ftp  " ">
+  <!ENTITY libcdio-download-http "&gnu-http;/libcdio/libcdio-&libcdio-version;.tar.gz">
+  <!ENTITY libcdio-download-ftp  "&gnu-ftp;/libcdio/libcdio-&libcdio-version;.tar.gz">
   <!ENTITY libcdio-md5sum        "d8734266a20fbc2605a97b701b838ab6">
   <!ENTITY libcdio-size          "2.3 MB">
@@ -68,5 +68,5 @@
           Required file:
           <ulink
-          url="http://ftp.gnu.org/gnu/libcdio/&libcdio-paranoia;.tar.bz2"/>
+          url="&gnu-http;/libcdio/&libcdio-paranoia;.tar.bz2"/>
         </para>
       </listitem>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libdv.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdv-download-http "&sourceforge-repo;/libdv/libdv-&libdv-version;.tar.gz">
+  <!ENTITY libdv-download-http "&sourceforge-dl;/libdv/libdv-&libdv-version;.tar.gz">
   <!ENTITY libdv-download-ftp  " ">
   <!ENTITY libdv-md5sum        "f895162161cfa4bb4a94c070a7caa6c7">
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libdvdcss.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdvdcss-download-http "http://download.videolan.org/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2">
+  <!ENTITY libdvdcss-download-http "https://get.videolan.org/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2">
   <!ENTITY libdvdcss-download-ftp  " ">
   <!ENTITY libdvdcss-md5sum        "2edba36e6af3f0223c4f0454cdf3d159">
Index: multimedia/libdriv/libdvdnav.xml
===================================================================
--- multimedia/libdriv/libdvdnav.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libdvdnav.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdvdnav-download-http "http://download.videolan.org/videolan/libdvdnav/&libdvdnav-version;/libdvdnav-&libdvdnav-version;.tar.bz2">
+  <!ENTITY libdvdnav-download-http "https://get.videolan.org/libdvdnav/&libdvdnav-version;/libdvdnav-&libdvdnav-version;.tar.bz2">
   <!ENTITY libdvdnav-download-ftp  " ">
   <!ENTITY libdvdnav-md5sum        "e9ea4de3bd8f204e61301d407d09f033">
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libdvdread.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdvdread-download-http "http://download.videolan.org/videolan/libdvdread/&libdvdread-version;/libdvdread-&libdvdread-version;.tar.bz2">
+  <!ENTITY libdvdread-download-http "https://get.videolan.org/libdvdread/&libdvdread-version;/libdvdread-&libdvdread-version;.tar.bz2">
   <!ENTITY libdvdread-download-ftp  " ">
   <!ENTITY libdvdread-md5sum        "b7b7d2a782087ed2a913263087083715">
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libmad.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmad-download-http "&sourceforge-repo;/mad/libmad-&libmad-version;.tar.gz">
+  <!ENTITY libmad-download-http "&sourceforge-dl;/mad/libmad-&libmad-version;.tar.gz">
   <!ENTITY libmad-download-ftp  "ftp://ftp.mars.org/pub/mpeg/libmad-&libmad-version;.tar.gz">
   <!ENTITY libmad-md5sum        "1be543bc30c56fb6bea1d7bf6a64e66c">
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libogg.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libogg-download-http "http://downloads.xiph.org/releases/ogg/libogg-&libogg-version;.tar.xz">
+  <!ENTITY libogg-download-http "https://downloads.xiph.org/releases/ogg/libogg-&libogg-version;.tar.xz">
   <!ENTITY libogg-download-ftp  " ">
   <!ENTITY libogg-md5sum        "5c3a34309d8b98640827e5d0991a4015">
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libquicktime.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libquicktime-download-http "&sourceforge-repo;/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
+  <!ENTITY libquicktime-download-http "&sourceforge-dl;/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
   <!ENTITY libquicktime-download-ftp  " ">
   <!ENTITY libquicktime-md5sum        "81cfcebad9b7ee7e7cfbefc861d6d61b">
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libtheora.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libtheora-download-http "http://downloads.xiph.org/releases/theora/libtheora-&libtheora-version;.tar.xz">
+  <!ENTITY libtheora-download-http "https://downloads.xiph.org/releases/theora/libtheora-&libtheora-version;.tar.xz">
   <!ENTITY libtheora-download-ftp  " ">
   <!ENTITY libtheora-md5sum        "9eeabf1ad65b7f41533854a59f7a716d">
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/libvorbis.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libvorbis-download-http "http://downloads.xiph.org/releases/vorbis/libvorbis-&libvorbis-version;.tar.xz">
+  <!ENTITY libvorbis-download-http "https://downloads.xiph.org/releases/vorbis/libvorbis-&libvorbis-version;.tar.xz">
   <!ENTITY libvorbis-download-ftp  " ">
   <!ENTITY libvorbis-md5sum        "28cb28097c07a735d6af56e598e1c90f">
Index: multimedia/libdriv/mlt.xml
===================================================================
--- multimedia/libdriv/mlt.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/mlt.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mlt-download-http "&sourceforge-repo2;/projects/mlt/files/mlt-&mlt-version;.tar.gz">
+  <!ENTITY mlt-download-http "&sourceforge-dl;/mlt/mlt-&mlt-version;.tar.gz">
   <!ENTITY mlt-download-ftp  " ">
   <!ENTITY mlt-md5sum        "bfa7b4009be616d6f858393a88fbbb32">
Index: multimedia/libdriv/opus.xml
===================================================================
--- multimedia/libdriv/opus.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/opus.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY opus-download-http 
-           "https://archive.mozilla.org/pub/opus/opus-&opus-version;.tar.gz">
+           "&mozilla-http;/opus/opus-&opus-version;.tar.gz">
   <!ENTITY opus-download-ftp  " ">
   <!ENTITY opus-md5sum        "54bc867f13066407bc7b95be1fede090">
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/pulseaudio.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY pulseaudio-download-http
-           "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
+           "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
   <!ENTITY pulseaudio-download-ftp  " ">
   <!ENTITY pulseaudio-md5sum        "4950d2799bf55ab91f6b7f990b7f0971">
Index: multimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/sbc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY sbc-download-http "http://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
+  <!ENTITY sbc-download-http "&kernel-dl;/linux/bluetooth/sbc-&sbc-version;.tar.xz">
   <!ENTITY sbc-download-ftp  " ">
   <!ENTITY sbc-md5sum        "2d8b7841f2c11ab287718d562f2b981c">
Index: multimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/sound-theme-freedesktop.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY sound-theme-freedesktop-download-http
-           "http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
+           "https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
   <!ENTITY sound-theme-freedesktop-download-ftp  " ">
   <!ENTITY sound-theme-freedesktop-md5sum        "7bcad4fa54570f80c612012bce66f60f">
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/speex.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY speex-download-http "http://downloads.xiph.org/releases/speex/speex-&speex-version;.tar.gz">
+  <!ENTITY speex-download-http "https://downloads.xiph.org/releases/speex/speex-&speex-version;.tar.gz">
   <!ENTITY speex-download-ftp  " ">
   <!ENTITY speex-md5sum        "6ae7db3bab01e1d4b86bacfa8ca33e81">
@@ -12,5 +12,5 @@
   <!ENTITY speex-time          "less than 0.1 SBU">
 
-  <!ENTITY speexdsp-download-http "http://downloads.xiph.org/releases/speex/speexdsp-&speexdsp-version;.tar.gz">
+  <!ENTITY speexdsp-download-http "https://downloads.xiph.org/releases/speex/speexdsp-&speexdsp-version;.tar.gz">
   <!ENTITY speexdsp-download-ftp  " ">
   <!ENTITY speexdsp-md5sum        "70d9d31184f7eb761192fd1ef0b73333">
Index: multimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/taglib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,4 @@
   %general-entities;
 
-  <!--<!ENTITY taglib-download-http "https://github.com/taglib/taglib/releases/download/v&taglib-version;/taglib-&taglib-version;.tar.gz">-->
   <!ENTITY taglib-download-http "https://taglib.github.io/releases/taglib-&taglib-version;.tar.gz">
   <!ENTITY taglib-download-ftp  " ">
Index: multimedia/libdriv/x264.xml
===================================================================
--- multimedia/libdriv/x264.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/x264.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY x264-download-http "http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-&x264-version;-stable.tar.bz2 ">
+  <!ENTITY x264-download-http "https://download.videolan.org/x264/snapshots/x264-snapshot-&x264-version;-stable.tar.bz2 ">
   <!ENTITY x264-download-ftp  " ">
   <!ENTITY x264-md5sum        "127ade6bafce9f6d522e1c214156f4ed">
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/libdriv/xine-lib.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY xine-lib-download-http
-    "&sourceforge-repo;/xine/xine-lib-&xine-lib-version;.tar.xz">
+    "&sourceforge-dl;/xine/xine-lib-&xine-lib-version;.tar.xz">
   <!ENTITY xine-lib-download-ftp
     "&gentoo-ftp-repo;/xine-lib-&xine-lib-version;.tar.xz">
@@ -108,5 +108,5 @@
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://www.musepack.net/">musepack</ulink>,
-      <ulink url="http://ftp.gnu.org/gnu/vcdimager/">VCDImager</ulink>, and
+      <ulink url="&gnu-http;/vcdimager/">VCDImager</ulink>, and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>,
     </para>
@@ -177,5 +177,5 @@
       <parameter>--disable-vcd</parameter>: This switch is required to compile
       <application>Xine Lib</application> without <ulink
-      url="http://ftp.gnu.org/gnu/vcdimager/">VCDImager</ulink> installed.
+      url="&gnu-http;/vcdimager/">VCDImager</ulink> installed.
       Remove this option if you have installed VCDImager.
     </para>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/videoutils/mplayer.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,7 +6,5 @@
 
   <!ENTITY mplayer-download-http "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
-  <!ENTITY mplayer-download-ftp "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
-  <!--<!ENTITY mplayer-download-http "&sources-anduin-http;/other/mplayer-&mplayer-version;.tar.xz">
-  <!ENTITY mplayer-download-ftp " ">-->
+  <!ENTITY mplayer-download-ftp  "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-md5sum        "e8a4d77ad4f509e81dd5e13b51636c1d">
   <!ENTITY mplayer-size          "12.6 MB">
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/videoutils/vlc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY vlc-download-http "http://get.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
+  <!ENTITY vlc-download-http "https://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
   <!ENTITY vlc-download-ftp  " ">
   <!ENTITY vlc-md5sum        "031d1bbef7737d44d18d78d6761ed26e">
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ multimedia/videoutils/xine-ui.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,9 +5,6 @@
   %general-entities;
 
-  <!ENTITY xine-ui-download-http
-    "&sourceforge-repo;/xine/xine-ui-&xine-ui-version;.tar.xz">
-  <!ENTITY xine-ui-download-ftp " ">
-<!--  <!ENTITY xine-ui-download-ftp
-    "&gentoo-ftp-repo;/xine-ui-&xine-ui-version;.tar.xz">-->
+  <!ENTITY xine-ui-download-http "&sourceforge-dl;/xine/xine-ui-&xine-ui-version;.tar.xz">
+  <!ENTITY xine-ui-download-ftp  " ">
   <!ENTITY xine-ui-md5sum        "a6d00381b5c8b7aec1a7a3fbf84f01ce">
   <!ENTITY xine-ui-size          "1.7 MB">
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/mailnews/fetchmail.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY fetchmail-download-http "&sourceforge-repo;/fetchmail/fetchmail-&fetchmail-version;.tar.xz">
-  <!--<!ENTITY fetchmail-download-ftp  "ftp://ftp.at.gnucash.org/pub/infosys/mail/fetchmail/fetchmail-&fetchmail-version;.tar.xz">-->
+  <!ENTITY fetchmail-download-http "&sourceforge-dl;/fetchmail/fetchmail-&fetchmail-version;.tar.xz">
   <!ENTITY fetchmail-download-ftp  " ">
   <!ENTITY fetchmail-md5sum        "61b66faad044afa26e142bb1791aa2b3">
Index: networking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/mailnews/mailx.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -9,5 +9,5 @@
   debian keep a tarball -->
   <!ENTITY mailx-download-http "http://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
-  <!ENTITY mailx-download-ftp "ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
+  <!ENTITY mailx-download-ftp  "ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_&mailx-version;.orig.tar.gz">
   <!ENTITY mailx-md5sum        "29a6033ef1412824d02eb9d9213cb1f2">
   <!ENTITY mailx-size          "317 KB">
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/mailnews/mutt.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY mutt-download-http "&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">-->
   <!ENTITY mutt-download-http " ">
   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
Index: networking/mailnews/procmail.xml
===================================================================
--- networking/mailnews/procmail.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/mailnews/procmail.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,4 @@
   %general-entities;
 
-  <!-- <!ENTITY procmail-download-http "http://www.procmail.org/procmail-&procmail-version;.tar.gz"> -->
   <!ENTITY procmail-download-http "http://www.ring.gr.jp/archives/net/mail/procmail/procmail-&procmail-version;.tar.gz">
   <!ENTITY procmail-download-ftp  "ftp://ftp.ucsb.edu/pub/mirrors/procmail/procmail-&procmail-version;.tar.gz">
Index: networking/netlibs/geoclue2.xml
===================================================================
--- networking/netlibs/geoclue2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netlibs/geoclue2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY geoclue2-download-http
-           "http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-&geoclue2-version;.tar.xz">
+           "https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-&geoclue2-version;.tar.xz">
   <!ENTITY geoclue2-download-ftp  " ">
   <!ENTITY geoclue2-md5sum        "e50086e742740413669ab72d8572db05">
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netlibs/libtirpc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libtirpc-download-http "&sourceforge-repo;/project/libtirpc/libtirpc/&libtirpc-version;/libtirpc-&libtirpc-version;.tar.bz2">
+  <!ENTITY libtirpc-download-http "&sourceforge-dl;/libtirpc/libtirpc-&libtirpc-version;.tar.bz2">
   <!ENTITY libtirpc-download-ftp  " ">
   <!ENTITY libtirpc-md5sum        "d5a37f1dccec484f9cabe2b97e54e9a6">
Index: networking/netlibs/serf.xml
===================================================================
--- networking/netlibs/serf.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netlibs/serf.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,4 @@
   %general-entities;
 
-<!-- This link does not work presently (as of February 16th, 2014), but the
-     next one may have to be updated soon.
-  <!ENTITY serf-download-http "https://serf.googlecode.com/files/serf-&serf-version;.tar.bz2">-->
   <!ENTITY serf-download-http "https://archive.apache.org/dist/serf/serf-&serf-version;.tar.bz2">
   <!ENTITY serf-download-ftp  " ">
Index: networking/netprogs/bridgeutils.xml
===================================================================
--- networking/netprogs/bridgeutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/bridgeutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY bridge-download-http "https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-&bridgeutils-version;.tar.xz">
+  <!ENTITY bridge-download-http "&kernel-dl;/linux/utils/net/bridge-utils/bridge-utils-&bridgeutils-version;.tar.xz">
   <!ENTITY bridge-download-ftp  " ">
   <!ENTITY bridge-md5sum        "541ae1c50cc268056693608920e6c908">
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/cifsutils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cifsutils-download-http "https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
+  <!ENTITY cifsutils-download-http "https://www.samba.org/ftp/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
   <!ENTITY cifsutils-download-ftp  " ">
   <!ENTITY cifsutils-md5sum        "af3ae1d27aca624c4daac5bf3eb0d4c1">
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/nfs-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY nfs-utils-download-http "&sourceforge-repo;/nfs/nfs-utils-&nfs-utils-version;.tar.bz2">
+  <!ENTITY nfs-utils-download-http "&sourceforge-dl;/nfs/nfs-utils-&nfs-utils-version;.tar.bz2">
   <!ENTITY nfs-utils-download-ftp  " ">
   <!ENTITY nfs-utils-md5sum        "1157abcfaa8670f990f408cf280426b4">
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/ntp.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,4 @@
 
   <!ENTITY ntp-download-http "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-&ntp-version;.tar.gz">
-<!--  <!ENTITY ntp-download-ftp  "&gentoo-ftp-repo;/ntp-&ntp-version;.tar.gz">-->
   <!ENTITY ntp-download-ftp  " ">
   <!ENTITY ntp-md5sum        "745384ed0dedb3f66b33fe84d66466f9">
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/rpcbind.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rpcbind-download-http "&sourceforge-repo;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
+  <!ENTITY rpcbind-download-http "&sourceforge-dl;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
   <!ENTITY rpcbind-download-ftp  " ">
   <!ENTITY rpcbind-md5sum        "cf10cd41ed8228fc54c316191c1f07fe">
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/samba.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
+  <!ENTITY samba-download-http "https://www.samba.org/ftp/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
   <!ENTITY samba-md5sum        "04493bbe8d71e52393dffdbba301697d">
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/wget.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,7 +6,7 @@
 
   <!ENTITY wget-download-http
-           "http://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.xz">
+           "&gnu-http;/wget/wget-&wget-version;.tar.xz">
   <!ENTITY wget-download-ftp
-           "ftp://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.xz">
+           "&gnu-ftp;/wget/wget-&wget-version;.tar.xz">
   <!ENTITY wget-md5sum        "d30d82186b93fcabb4116ff513bfa9bd">
   <!ENTITY wget-size          "2.0 MB">
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netprogs/wpa_supplicant.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY wpa_supplicant-download-http
-           "http://hostap.epitest.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
+           "https://w1.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
   <!ENTITY wpa_supplicant-download-ftp  " ">
   <!ENTITY wpa_supplicant-md5sum        "091569eb4440b7d7f2b4276dbfc03c3c">
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netutils/bind-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -4,6 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY bind-download-http " ">
-  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+
+  <!ENTITY bind-download-http   " ">
+  <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
   <!ENTITY bind-md5sum          "efca7e5a63a07efba264da9be2fbb57f">
   <!ENTITY bind-size            "9.3 MB">
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netutils/nmap.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,4 @@
 
   <!ENTITY nmap-download-http "http://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
-<!--  <!ENTITY nmap-download-ftp  "&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">-->
   <!ENTITY nmap-download-ftp  " ">
   <!ENTITY nmap-md5sum        "4e454266559ddf2c4e2109866c62560c">
Index: networking/netutils/traceroute.xml
===================================================================
--- networking/netutils/traceroute.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/netutils/traceroute.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY traceroute-download-http "&sourceforge-repo;/traceroute/traceroute-&traceroute-version;.tar.gz">
+  <!ENTITY traceroute-download-http "&sourceforge-dl;/traceroute/traceroute-&traceroute-version;.tar.gz">
   <!ENTITY traceroute-download-ftp  " ">
   <!ENTITY traceroute-md5sum        "84d329d67abc3fb83fc8cb12aeaddaba">
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/textweb/links.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,4 @@
 
   <!ENTITY links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
- <!-- <!ENTITY links-download-ftp  "&gentoo-ftp-repo;/links-&links-version;.tar.bz2">-->
   <!ENTITY links-download-ftp  " ">
   <!ENTITY links-md5sum        "0d11b388de22ba280008a36a409a34c6">
Index: networking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/textweb/lynx.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY lynx-download-http "http://lynx.isc.org/lynx&lynx-version;/lynx&lynx-version;.tar.bz2">
-  <!ENTITY lynx-download-ftp " ">-->
   <!ENTITY lynx-download-http "http://invisible-mirror.net/archives/lynx/tarballs/lynx&lynx-version;.tar.bz2">
   <!ENTITY lynx-download-ftp  " ">
Index: networking/textweb/w3m.xml
===================================================================
--- networking/textweb/w3m.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ networking/textweb/w3m.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY w3m-download-http "&sourceforge-repo;/w3m/w3m-&w3m-version;.tar.gz">
+  <!ENTITY w3m-download-http "&sourceforge-dl;/w3m/w3m-&w3m-version;.tar.gz">
   <!ENTITY w3m-download-ftp  " ">
   <!ENTITY w3m-md5sum        "1b845a983a50b8dec0169ac48479eacc">
Index: postlfs/config/lsb-release.xml
===================================================================
--- postlfs/config/lsb-release.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/config/lsb-release.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -3,5 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
-  <!ENTITY lsb-release-download-http "&sourceforge-repo2;/projects/lsb/files/lsb_release/&lsb-release-version;/lsb-release-&lsb-release-version;.tar.gz">
+
+  <!ENTITY lsb-release-download-http "&sourceforge-dl;/lsb/lsb-release-&lsb-release-version;.tar.gz">
   <!ENTITY lsb-release-download-ftp  " ">
   <!ENTITY lsb-release-md5sum        "30537ef5a01e0ca94b7b8eb6a36bb1e4">
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/editors/ed.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY ed-download-http "http://ftp.gnu.org/pub/gnu/ed/ed-&ed-version;.tar.lz">
-  <!ENTITY ed-download-ftp  "ftp://ftp.gnu.org/pub/gnu/ed/ed-&ed-version;.tar.lz">
+  <!ENTITY ed-download-http "&gnu-http;/ed/ed-&ed-version;.tar.lz">
+  <!ENTITY ed-download-ftp  "&gnu-ftp;/ed/ed-&ed-version;.tar.lz">
   <!ENTITY ed-md5sum        "273d04778b2a51f7c3cbfcd2001876bf">
   <!ENTITY ed-size          "66 KB">
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/editors/emacs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY emacs-download-http "https://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.xz">
-  <!ENTITY emacs-download-ftp  "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.xz"> 
+  <!ENTITY emacs-download-http "&gnu-http;/emacs/emacs-&emacs-version;.tar.xz">
+  <!ENTITY emacs-download-ftp  "&gnu-ftp;/emacs/emacs-&emacs-version;.tar.xz"> 
   <!ENTITY emacs-download-ftp  " "> 
   <!ENTITY emacs-md5sum        "06442d867158754bdde793eca420ca49">
@@ -84,5 +84,5 @@
       <xref linkend="mitkrb"/>,
       <xref linkend="valgrind"/>,
-      <ulink url="https://ftp.gnu.org/gnu/intlfonts/">intlfonts</ulink>,
+      <ulink url="&gnu-http;/intlfonts/">intlfonts</ulink>,
       <ulink url="http://directory.fsf.org/wiki/Libungif">libungif</ulink>,
       <ulink url="http://www.nongnu.org/m17n/">libotf</ulink> and
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/editors/joe.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY joe-download-http "&sourceforge-repo;/joe-editor/joe-&joe-version;.tar.gz">
+  <!ENTITY joe-download-http "&sourceforge-dl;/joe-editor/joe-&joe-version;.tar.gz">
   <!ENTITY joe-download-ftp  " ">
   <!ENTITY joe-md5sum        "59e63debe60b456a6ee5c0c27a756a47">
Index: postlfs/filesystems/btrfs-progs.xml
===================================================================
--- postlfs/filesystems/btrfs-progs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/btrfs-progs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY btrfs-progs-download-http  "https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
+  <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
   <!ENTITY btrfs-progs-md5sum        "4b1a143677597de413381118db8c10bb">
Index: postlfs/filesystems/gptfdisk.xml
===================================================================
--- postlfs/filesystems/gptfdisk.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/gptfdisk.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY gptfdisk-download-http
-    "&sourceforge-repo;/project/gptfdisk/gptfdisk/&gptfdisk-version;/gptfdisk-&gptfdisk-version;.tar.gz">
+  <!ENTITY gptfdisk-download-http "&sourceforge-dl;/gptfdisk/gptfdisk-&gptfdisk-version;.tar.gz">
   <!ENTITY gptfdisk-download-ftp  " ">
   <!ENTITY gptfdisk-md5sum        "07b625a583b66c8c5840be5923f3e3fe">
Index: postlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/lvm2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY lvm2-download-http " ">
-  <!ENTITY lvm2-download-ftp  "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.&lvm2-version;.tgz">
+  <!ENTITY lvm2-download-http "https://sourceware.org/ftp/lvm2/releases/LVM2.&lvm2-version;.tgz">
+  <!ENTITY lvm2-download-ftp  "ftp://sourceware.org/pub/lvm2/releases/LVM2.&lvm2-version;.tgz">
   <!ENTITY lvm2-md5sum        "153b7bb643eb26073274968e9026fa8f">
   <!ENTITY lvm2-size          "2.2 MB">
Index: postlfs/filesystems/mdadm.xml
===================================================================
--- postlfs/filesystems/mdadm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/mdadm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mdadm-download-http "&kernel;linux/utils/raid/mdadm/mdadm-&mdadm-version;.tar.xz">
+  <!ENTITY mdadm-download-http "&kernel-dl;/linux/utils/raid/mdadm/mdadm-&mdadm-version;.tar.xz">
   <!ENTITY mdadm-download-ftp " ">
   <!ENTITY mdadm-md5sum        "2cb4feffea9167ba71b5f346a0c0a40d">
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/parted.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,6 @@
   %general-entities;
 
-  <!ENTITY parted-download-http
-    "http://ftp.gnu.org/gnu/parted/parted-&parted-version;.tar.xz">
-  <!ENTITY parted-download-ftp  " ">
+  <!ENTITY parted-download-http "&gnu-http;/parted/parted-&parted-version;.tar.xz">
+  <!ENTITY parted-download-ftp  "&gnu-ftp;/parted/parted-&parted-version;.tar.xz">
   <!ENTITY parted-md5sum        "0247b6a7b314f8edeb618159fa95f9cb">
   <!ENTITY parted-size          "1.6 MB">
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/reiser.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY reiser-download-http "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v&reiser-version;/reiserfsprogs-&reiser-version;.tar.xz">
+  <!ENTITY reiser-download-http "&kernel-dl;/linux/kernel/people/jeffm/reiserfsprogs/v&reiser-version;/reiserfsprogs-&reiser-version;.tar.xz">
   <!ENTITY reiser-download-ftp  " ">
   <!ENTITY reiser-md5sum        "90c139542725efc6da3a6b1709695395">
Index: postlfs/filesystems/smartmontools.xml
===================================================================
--- postlfs/filesystems/smartmontools.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/smartmontools.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY smartmontools-download-http
-    "&sourceforge-repo2;/projects/smartmontools/files/smartmontools/&smartmontools-version;/smartmontools-&smartmontools-version;.tar.gz">
+  <!ENTITY smartmontools-download-http "&sourceforge-dl;/smartmontools/smartmontools-&smartmontools-version;.tar.gz">
   <!ENTITY smartmontools-download-ftp  " ">
   <!ENTITY smartmontools-md5sum        "093aeec3f8f39fa9a37593c4012d3156">
Index: postlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/filesystems/xfsprogs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xfsprogs-download-http "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-&xfsprogs-version;.tar.xz">
+  <!ENTITY xfsprogs-download-http "&kernel-dl;/linux/utils/fs/xfs/xfsprogs/xfsprogs-&xfsprogs-version;.tar.xz">
   <!ENTITY xfsprogs-download-ftp  " ">
   <!ENTITY xfsprogs-md5sum        "e348b0e1d7bd1cd82d64b91ff37e727e">
Index: postlfs/security/cryptsetup.xml
===================================================================
--- postlfs/security/cryptsetup.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/cryptsetup.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cryptsetup-download-http "https://www.kernel.org/pub/linux/utils/cryptsetup/v&cryptsetup-minor;/cryptsetup-&cryptsetup-version;.tar.xz">
+  <!ENTITY cryptsetup-download-http "&kernel-dl;/linux/utils/cryptsetup/v&cryptsetup-minor;/cryptsetup-&cryptsetup-version;.tar.xz">
   <!ENTITY cryptsetup-download-ftp  " ">
   <!ENTITY cryptsetup-md5sum        "d2d668223e795dcf750da44dc3e7076b">
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/gnupg2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnupg2-download-http "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
+  <!ENTITY gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
+  <!ENTITY gnupg2-download-ftp  "&gnupg-ftp;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-md5sum        "86c2304ead54b74a422e76c3f1bc7a91">
   <!ENTITY gnupg2-size          "6.2 MB">
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/gnutls.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnutls-download-http "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-download-http "&gnupg-http;/gnutls/v3.5/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-download-ftp  "&gnupg-ftp;/gnutls/v3.5/gnutls-&gnutls-version;.tar.xz">
   <!ENTITY gnutls-md5sum        "1e84b57a472b5f3b01f2c1b7a3a2bcbe">
   <!ENTITY gnutls-size          "6.9 MB">
@@ -117,8 +117,8 @@
       <xref linkend="unbound"/> (to build the DANE library),
       <xref linkend="valgrind"/> (used during the test suite),
-      <ulink url="http://ftp.gnu.org/gnu/autogen/">autogen</ulink>,
+      <ulink url="&gnu-http;/autogen/">autogen</ulink>,
       <ulink url="https://cmocka.org/">cmocka</ulink> and
       <ulink url="http://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite if the DANE library is built), and
-      <ulink url="http://sourceforge.net/projects/trousers/files/trousers/">Trousers</ulink> (Trusted Platform Module support)
+      <ulink url="&sourceforge-dl;/trousers/">Trousers</ulink> (Trusted Platform Module support)
     </para>
 
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/gpgme.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gpgme-download-http " ">
-  <!ENTITY gpgme-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-&gpgme-version;.tar.bz2">
+  <!ENTITY gpgme-download-http "&gnupg-http;/gpgme/gpgme-&gpgme-version;.tar.bz2">
+  <!ENTITY gpgme-download-ftp  "&gnupg-ftp;/gpgme/gpgme-&gpgme-version;.tar.bz2">
   <!ENTITY gpgme-md5sum        "1e00bb8ef04d1d05d5a0f19e143854c3">
   <!ENTITY gpgme-size          "1.3 MB">
Index: postlfs/security/haveged.xml
===================================================================
--- postlfs/security/haveged.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/haveged.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-<!--  <!ENTITY haveged-download-http "http://www.issihosts.com/haveged/haveged-&haveged-version;.tar.gz">-->
-  <!ENTITY haveged-download-http "http://downloads.sourceforge.net/project/haveged/haveged-&haveged-version;.tar.gz">
+  <!ENTITY haveged-download-http "&sourceforge-dl;/haveged/haveged-&haveged-version;.tar.gz">
   <!ENTITY haveged-download-ftp  " ">
   <!ENTITY haveged-md5sum        "015ff58cd10607db0e0de60aeca2f5f8">
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/libcap.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libcap-download-http "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
+  <!ENTITY libcap-download-http "&kernel-dl;/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
   <!ENTITY libcap-download-ftp  " ">
   <!ENTITY libcap-md5sum        "6666b839e5d46c2ad33fc8aa2ceb5f77">
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/liboauth.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY liboauth-download-http "http://sourceforge.net/projects/liboauth/files/liboauth-&liboauth-version;.tar.gz">
+  <!ENTITY liboauth-download-http "&sourceforge-dl;/liboauth/liboauth-&liboauth-version;.tar.gz">
   <!ENTITY liboauth-download-ftp  " ">
   <!ENTITY liboauth-md5sum        "689b46c2b3ab1a39735ac33f714c4f7f">
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/mitkrb.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-<!--  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/www/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;-signed.tar">-->
-  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;.tar.gz">
+  <!ENTITY mitkrb-download-http "https://web.mit.edu/kerberos/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;.tar.gz">
   <!ENTITY mitkrb-download-ftp  " ">
   <!ENTITY mitkrb-md5sum        "8022f3a1cde8463e44fd35ef42731f85">
Index: postlfs/security/nettle.xml
===================================================================
--- postlfs/security/nettle.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/nettle.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY nettle-download-http "https://ftp.gnu.org/gnu/nettle/nettle-&nettle-version;.tar.gz">
-  <!ENTITY nettle-download-ftp  "ftp://ftp.gnu.org/gnu/nettle/nettle-&nettle-version;.tar.gz">
+  <!ENTITY nettle-download-http "&gnu-http;/nettle/nettle-&nettle-version;.tar.gz">
+  <!ENTITY nettle-download-ftp  "&gnu-ftp;/nettle/nettle-&nettle-version;.tar.gz">
   <!ENTITY nettle-md5sum        "10f969f78a463704ae73529978148dbe">
   <!ENTITY nettle-size          "1.8 MB">
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/nss.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
 <!-- for when .0 is not part of the new tarball name, but always referenced -->
-  <!ENTITY nss-url "ftp.mozilla.org/pub/mozilla.org/security/nss/releases">
+  <!ENTITY nss-url "archive.mozilla.org/pub/security/nss/releases">
 
 <!-- micro versions -->
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ postlfs/security/sudo.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -86,5 +86,5 @@
       <ulink url="http://www.openafs.org/">AFS</ulink>,
       <ulink url="http://www.fwtk.org/">FWTK</ulink>, and
-      <ulink url="http://sourceforge.net/projects/opie/files/">Opie</ulink>
+      <ulink url="&sourceforge-dl;/opie/">Opie</ulink>
 <!--  <ulink url="http://www.rsa.com/node.aspx?id=1156">SecurID</ulink>-->
     </para>
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/printing/gs.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -14,10 +14,10 @@
 
   <!ENTITY gs-standard-fonts-download
-  "&sourceforge-repo;/gs-fonts/ghostscript-fonts-std-8.11.tar.gz">
+  "&sourceforge-dl;/gs-fonts/ghostscript-fonts-std-8.11.tar.gz">
   <!ENTITY gs-standard-fonts-md5sum   "6865682b095f8c4500c54b285ff05ef6">
   <!ENTITY gs-standard-fonts-size     "3.7 MB">
 
   <!ENTITY gs-other-fonts-download
-  "&sourceforge-repo;/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz">
+  "&sourceforge-dl;/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz">
   <!ENTITY gs-other-fonts-md5sum      "33457d3f37de7ef03d2eea05a9e6aa4f">
   <!ENTITY gs-other-fonts-size        "796 KB">
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/printing/gutenprint.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
+  <!ENTITY gutenprint-download-http "&sourceforge-dl;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
   <!ENTITY gutenprint-download-ftp  " ">
   <!ENTITY gutenprint-md5sum        "9789107b577d1338c1d189993ea99eef">
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/ps/a2ps.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY a2ps-download-http "http://ftp.gnu.org/gnu/a2ps/a2ps-&a2ps-version;.tar.gz">
-  <!ENTITY a2ps-download-ftp  "ftp://ftp.gnu.org/gnu/a2ps/a2ps-&a2ps-version;.tar.gz">
+  <!ENTITY a2ps-download-http "&gnu-http;/a2ps/a2ps-&a2ps-version;.tar.gz">
+  <!ENTITY a2ps-download-ftp  "&gnu-ftp;/a2ps/a2ps-&a2ps-version;.tar.gz">
   <!ENTITY a2ps-md5sum        "781ac3d9b213fa3e1ed0d79f986dc8c7">
   <!ENTITY a2ps-size          "2.6 MB">
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/ps/enscript.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -9,6 +9,6 @@
   -->
 
-  <!ENTITY enscript-download-http "http://ftp.gnu.org/gnu/enscript/enscript-&enscript-version;.tar.gz">
-  <!ENTITY enscript-download-ftp  "&gentoo-ftp-repo;/enscript-&enscript-version;.tar.gz">
+  <!ENTITY enscript-download-http "&gnu-http;/enscript/enscript-&enscript-version;.tar.gz">
+  <!ENTITY enscript-download-ftp  "&gnu-ftp;/enscript/enscript-&enscript-version;.tar.gz">
   <!ENTITY enscript-md5sum        "3acc242b829adacabcaf28533f049afd">
   <!ENTITY enscript-size          "1.3 MB">
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/ps/fop.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -20,5 +20,6 @@
   <!ENTITY jai64-md5sum      "4a906db35612f668aeef2c0606d7075b">
   <!ENTITY jai64-size        "3.4 MB">
-  <!ENTITY offo-download     "&sourceforge-repo;/projects/offo/files/offo-hyphenation/2.2/offo-hyphenation.zip">
+
+  <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
   <!ENTITY offo-md5sum       "bf9c09bf05108ef9661b8f08d91c2336">
   <!ENTITY offo-size         "862 KB">
Index: pst/ps/paps.xml
===================================================================
--- pst/ps/paps.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/ps/paps.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY paps-download-http "&sourceforge-repo;/paps/paps-&paps-version;.tar.gz">
+  <!ENTITY paps-download-http "&sourceforge-dl;/paps/paps-&paps-version;.tar.gz">
   <!ENTITY paps-download-ftp  " ">
   <!ENTITY paps-md5sum        "e9508132bf27609bf2fded2bfd9cb3f1">
Index: pst/sgml/docbook-dsssl.xml
===================================================================
--- pst/sgml/docbook-dsssl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/docbook-dsssl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY docbook-dsssl-download-http "&sourceforge-repo;/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
+  <!ENTITY docbook-dsssl-download-http "&sourceforge-dl;/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
   <!ENTITY docbook-dsssl-download-ftp  "&gentoo-ftp-repo;/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
   <!ENTITY docbook-dsssl-md5sum        "bc192d23266b9a664ca0aba4a7794c7c">
@@ -24,5 +24,5 @@
   <!ENTITY docbook-dsssl-time          "less than 0.1 SBU">
 
-  <!ENTITY docbook-dsssl-doc-download-http "&sourceforge-repo;/docbook/docbook-dsssl-doc-&docbook-dsssl-version;.tar.bz2">
+  <!ENTITY docbook-dsssl-doc-download-http "&sourceforge-dl;/docbook/docbook-dsssl-doc-&docbook-dsssl-version;.tar.bz2">
   <!ENTITY docbook-dsssl-doc-md5sum        "9a7b809a21ab7d2749bb328334c380f2">
   <!ENTITY docbook-dsssl-doc-size          "142 KB">
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/docbook-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY docbook-utils-download-http "&sources-anduin-http;/docbook-utils//docbook-utils-&docbook-utils-version;.tar.gz">
-  <!ENTITY docbook-utils-download-ftp  "&sources-anduin-ftp;/docbook-utils//docbook-utils-&docbook-utils-version;.tar.gz">
+  <!ENTITY docbook-utils-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/docbook-utils-&docbook-utils-version;.tar.gz">
+  <!ENTITY docbook-utils-download-ftp  "ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-&docbook-utils-version;.tar.gz">
   <!ENTITY docbook-utils-md5sum        "6b41b18c365c01f225bc417cf632d81c">
   <!ENTITY docbook-utils-size          "124 KB">
Index: pst/sgml/openjade.xml
===================================================================
--- pst/sgml/openjade.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/openjade.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY openjade-download-http "&sourceforge-repo;/openjade/openjade-&openjade-version;.tar.gz">
+  <!ENTITY openjade-download-http "&sourceforge-dl;/openjade/openjade-&openjade-version;.tar.gz">
   <!ENTITY openjade-download-ftp  " ">
   <!ENTITY openjade-md5sum        "7df692e3186109cc00db6825b777201e">
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/opensp.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,9 +5,6 @@
   %general-entities;
 
-  <!ENTITY opensp-download-http "&sourceforge-repo;/openjade/OpenSP-&opensp-version;.tar.gz">
+  <!ENTITY opensp-download-http "&sourceforge-dl;/openjade/OpenSP-&opensp-version;.tar.gz">
   <!ENTITY opensp-download-ftp  " ">
-<!--
-  <!ENTITY opensp-download-ftp  "&gentoo-ftp-repo;/OpenSP-&opensp-version;.tar.gz">
--->
   <!ENTITY opensp-md5sum        "670b223c5d12cee40c9137be86b6c39b">
   <!ENTITY opensp-size          "1.5 MB">
Index: pst/sgml/sgml-common.xml
===================================================================
--- pst/sgml/sgml-common.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/sgml-common.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY sgml-common-download-http "&sources-anduin-http;/sgml-common/sgml-common-&sgml-common-version;.tgz">
-  <!ENTITY sgml-common-download-ftp  "&sources-anduin-ftp;/sgml-common/sgml-common-&sgml-common-version;.tgz">
+  <!ENTITY sgml-common-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-&sgml-common-version;.tgz">
+  <!ENTITY sgml-common-download-ftp  "ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/sgml-common-&sgml-common-version;.tgz">
   <!ENTITY sgml-common-md5sum        "103c9828f24820df86e55e7862e28974">
   <!ENTITY sgml-common-size          "75 KB">
Index: pst/sgml/sgml-dtd-3.xml
===================================================================
--- pst/sgml/sgml-dtd-3.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/sgml/sgml-dtd-3.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY sgml-dtd-3-download-http "http://www.docbook.org/sgml/&sgml-dtd-3-version;/docbk31.zip">
-  <!ENTITY sgml-dtd-3-download-ftp  "ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES/docbk31.zip">
+  <!ENTITY sgml-dtd-3-download-ftp  " ">
   <!ENTITY sgml-dtd-3-md5sum        "432749c0c806dbae81c8bcb70da3b5d3">
   <!ENTITY sgml-dtd-3-size          "55 KB">
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/typesetting/asymptote.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY asymptote-download-http "&sourceforge-repo;/sourceforge/asymptote/asymptote-&asymptote-version;.src.tgz">
+  <!ENTITY asymptote-download-http "&sourceforge-dl;/asymptote/asymptote-&asymptote-version;.src.tgz">
   <!ENTITY asymptote-download-ftp  " ">
   <!ENTITY asymptote-md5sum        "d16909a9189a3177ad2f8cb8161e32e1">
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/typesetting/tl-installer.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -115,5 +115,5 @@
       The binary versions of <application>asy</application> need
       <xref linkend="glu"/>, <xref linkend="freeglut"/>. and <ulink
-      url="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz">libreadline-6.3</ulink>
+      url="&gnu-ftp;/readline/readline-6.3.tar.gz">libreadline-6.3</ulink>
       with the LFS patch <ulink
       url="http://www.linuxfromscratch.org/patches/downloads/readline/readline-6.3-upstream_fixes-3.patch">readline-6.3-upstream_fixes-1.patch</ulink>
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/xml/docbook-xsl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY docbook-xsl-download-http "&sourceforge-repo;/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-download-http "&sourceforge-dl;/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-download-ftp  " ">
   <!ENTITY docbook-xsl-md5sum        "b48cbf929a2ad85e6672f710777ca7bc">
@@ -12,5 +12,5 @@
   <!ENTITY docbook-xsl-time          "less than 0.1 SBU">
 
-  <!ENTITY docbook-xsl-doc-download  "&sourceforge-repo;/docbook/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-doc-download  "&sourceforge-dl;/docbook/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-doc-md5sum    "7eb51958e1bf97f3c5b013c42eb61e31">
   <!ENTITY docbook-xsl-doc-size      "1.0 MB">
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/xml/docbook.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,4 @@
 
   <!ENTITY DocBook-download-http "http://www.docbook.org/xml/&DocBook-version;/docbook-xml-&DocBook-version;.zip">
-  <!--<!ENTITY DocBook-download-ftp  "&gentoo-ftp-repo;/docbook-xml-&DocBook-version;.zip">-->
   <!ENTITY DocBook-download-ftp  " ">
   <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
Index: pst/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ pst/xml/xmlto.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xmlto-download-http "&sources-anduin-http;/xmlto/xmlto-&xmlto-version;.tar.bz2">
+  <!ENTITY xmlto-download-http "https://releases.pagure.org/xmlto/xmlto-&xmlto-version;.tar.bz2">
   <!ENTITY xmlto-download-ftp  " ">
   <!ENTITY xmlto-md5sum        "93bab48d446c826399d130d959fe676f">
Index: server/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ server/databases/sqlite.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -8,5 +8,5 @@
   <!ENTITY sqlite-doc-version   "3200000">
 
-  <!ENTITY sqlite-download-http "http://sqlite.org/2017/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
+  <!ENTITY sqlite-download-http "https://sqlite.org/2017/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
   <!ENTITY sqlite-download-ftp  " ">
   <!ENTITY sqlite-md5sum        "e262a28b73cc330e7e83520c8ce14e4d">
@@ -15,5 +15,5 @@
   <!ENTITY sqlite-time          "0.4 SBU">
 
-  <!ENTITY sqlite-docs-download "http://sqlite.org/2017/sqlite-doc-&sqlite-doc-version;.zip">
+  <!ENTITY sqlite-docs-download "https://sqlite.org/2017/sqlite-doc-&sqlite-doc-version;.zip">
   <!ENTITY sqlite-docs-md5sum   "ed8f9d7dfb410853619e195af2e73250">
   <!ENTITY sqlite-docs-size     "5.5 MB">
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/dm/lxdm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,9 +5,5 @@
   %general-entities;
 
-  <!-- Place this in the general.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-
-  <!ENTITY lxdm-download-http "http://downloads.sourceforge.net/lxdm/lxdm-&lxdm-version;.tar.xz">
+  <!ENTITY lxdm-download-http "&sourceforge-dl;/lxdm/lxdm-&lxdm-version;.tar.xz">
   <!ENTITY lxdm-download-ftp  " ">
   <!ENTITY lxdm-md5sum        "061caae432634e6db38bbdc84bc6ffa0">
Index: x/dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/dm/sddm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -4,8 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-  <!-- Place this in the general.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
 
   <!ENTITY sddm-download-http "https://github.com/sddm/sddm/releases/download/v&sddm-version;/sddm-&sddm-version;.tar.xz">
Index: x/icons/adwaita-icon-theme.xml
===================================================================
--- x/icons/adwaita-icon-theme.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/adwaita-icon-theme.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -4,5 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
 
   <!ENTITY adwaita-icon-theme-download-http
Index: x/icons/breeze-icons.xml
===================================================================
--- x/icons/breeze-icons.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/breeze-icons.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -4,5 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
 
   <!ENTITY breeze-icons-download-http "&kf5-download-http;/breeze-icons-&kf5-version;.tar.xz">
Index: x/icons/gnome-icon-theme.xml
===================================================================
--- x/icons/gnome-icon-theme.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/gnome-icon-theme.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,8 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY gnome-icon-theme-download-http
-   "&gnome-download-http;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
-  <!ENTITY gnome-icon-theme-download-ftp
-   "&gnome-download-ftp;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">-->
   <!ENTITY gnome-icon-theme-download-http
    "&gnome-download-http;/gnome-icon-theme/3.12/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
Index: x/icons/hicolor-icon-theme.xml
===================================================================
--- x/icons/hicolor-icon-theme.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/hicolor-icon-theme.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,6 @@
   %general-entities;
 
-  <!ENTITY hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
+  <!ENTITY hicolor-icon-theme-download-http "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.xz">
   <!ENTITY hicolor-icon-theme-download-ftp  " ">
-  <!--<!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">-->
   <!ENTITY hicolor-icon-theme-md5sum        "6aa2b3993a883d85017c7cc0cfc0fb73">
   <!ENTITY hicolor-icon-theme-size          "52 KB">
Index: x/icons/icon-naming-utils.xml
===================================================================
--- x/icons/icon-naming-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/icon-naming-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY icon-naming-utils-download-http "http://tango.freedesktop.org/releases/icon-naming-utils-&icon-naming-utils-version;.tar.bz2">
+  <!ENTITY icon-naming-utils-download-http "https://tango.freedesktop.org/releases/icon-naming-utils-&icon-naming-utils-version;.tar.bz2">
   <!ENTITY icon-naming-utils-download-ftp  " ">
   <!ENTITY icon-naming-utils-md5sum        "dd8108b56130b9eedc4042df634efa66">
Index: x/icons/lxde-icon-theme.xml
===================================================================
--- x/icons/lxde-icon-theme.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/icons/lxde-icon-theme.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lxde-icon-theme-download-http "&sourceforge-repo;/lxde/lxde-icon-theme-&lxde-icon-theme-version;.tar.xz">
+  <!ENTITY lxde-icon-theme-download-http "&sourceforge-dl;/lxde/lxde-icon-theme-&lxde-icon-theme-version;.tar.xz">
   <!ENTITY lxde-icon-theme-download-ftp  " ">
   <!ENTITY lxde-icon-theme-md5sum        "7467133275edbbcc79349379235d4411">
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libevdev.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,5 +7,5 @@
   <!ENTITY libevdev-version "1.5.7">
 
-  <!ENTITY libevdev-download-http "http://www.freedesktop.org/software/libevdev/libevdev-&libevdev-version;.tar.xz">
+  <!ENTITY libevdev-download-http "https://www.freedesktop.org/software/libevdev/libevdev-&libevdev-version;.tar.xz">
   <!ENTITY libevdev-download-ftp  " ">
   <!ENTITY libevdev-md5sum        "4f1cfaee8d75ea3fbbfeb99a98730952">
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libinput.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,5 +7,5 @@
   <!ENTITY libinput-version "1.8.1">
 
-  <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
+  <!ENTITY libinput-download-http "https://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
   <!ENTITY libinput-md5sum        "8247f0bb67052ffb272c50c3cb9c5998">
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libva.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,7 +5,5 @@
   %general-entities;
 
-  <!ENTITY libva-http "http://www.freedesktop.org/software/vaapi/releases">
-
-  <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
+  <!ENTITY libva-download-http "https://github.com/01org/libva/releases/download/&libva-version;/libva-&libva-version;.tar.bz2">
   <!ENTITY libva-download-ftp  " ">
   <!ENTITY libva-md5sum        "2ce6901495b64f4cc26dd0fb53eb5b14">
@@ -14,5 +12,6 @@
   <!ENTITY libva-time          "0.2 SBU">
 
-  <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2">
+
+  <!ENTITY libva-intel-driver-download-http "https://github.com/01org/intel-vaapi-driver/releases/download/&libva-intel-driver-version;/intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2">
   <!ENTITY libva-intel-driver-download-ftp  " ">
   <!ENTITY libva-intel-driver-md5sum        "fd70a5f739b5d8a8dbf612843ebedf39">
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libvdpau-va-gl.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/archive/v&libvdpau-va-gl-version;.tar.gz">
+  <!ENTITY libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/archive/v&libvdpau-va-gl-version;/libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz">
   <!ENTITY libvdpau-va-gl-download-ftp  " ">
   <!ENTITY libvdpau-va-gl-md5sum        "638244652a702d0262039890904f37ce">
@@ -39,9 +39,4 @@
 
     &lfs80_checked;
-
-    <note><para>Download this file via wget as:</para>
-<screen><userinput>wget https://github.com/i-rinat/libvdpau-va-gl/archive/v&libvdpau-va-gl-version;.tar.gz \
-     -O libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</userinput></screen>
-    </note>
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/libvdpau.xml
===================================================================
--- x/installing/libvdpau.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libvdpau.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.bz2">
+  <!ENTITY libvdpau-download-http "https://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.bz2">
   <!ENTITY libvdpau-download-ftp  " ">
   <!ENTITY libvdpau-md5sum        "2fa0b05a4f4d06791eec83bc9c854d14">
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/libxcb.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
+  <!ENTITY libxcb-download-http "https://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
   <!ENTITY libxcb-download-ftp  " ">
   <!ENTITY libxcb-md5sum        "28e552bd78bc1050b6b26ca1db0e5bb6">
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/x7driver-wacom.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -7,5 +7,5 @@
   <!ENTITY xorg-wacom-driver-version "0.35.0">
 
-  <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
+  <!ENTITY xorg-wacom-driver-download-http "&sourceforge-dl;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
   <!ENTITY xorg-wacom-driver-md5sum        "cb137465f139bb014883b0d7b0c500b2">
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-proto.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xcb-proto-download-http "http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
+  <!ENTITY xcb-proto-download-http "https://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
   <!ENTITY xcb-proto-download-ftp  " ">
   <!ENTITY xcb-proto-md5sum        "14e60919f859560f28426a685a555962">
Index: x/installing/xcb-util-cursor.xml
===================================================================
--- x/installing/xcb-util-cursor.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util-cursor.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xcb-util-cursor-download-http "http://xcb.freedesktop.org/dist/xcb-util-cursor-&xcb-util-cursor-version;.tar.bz2">
+  <!ENTITY xcb-util-cursor-download-http "https://xcb.freedesktop.org/dist/xcb-util-cursor-&xcb-util-cursor-version;.tar.bz2">
   <!ENTITY xcb-util-cursor-download-ftp  " ">
   <!ENTITY xcb-util-cursor-md5sum        "6ac3b17cba51aaaa36ba035a53527214">
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util-image.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xcb-util-image-download-http "http://xcb.freedesktop.org/dist/xcb-util-image-&xcb-util-image-version;.tar.bz2">
+  <!ENTITY xcb-util-image-download-http "https://xcb.freedesktop.org/dist/xcb-util-image-&xcb-util-image-version;.tar.bz2">
   <!ENTITY xcb-util-image-download-ftp  " ">
   <!ENTITY xcb-util-image-md5sum        "08fe8ffecc8d4e37c0ade7906b3f4c87">
Index: x/installing/xcb-util-keysyms.xml
===================================================================
--- x/installing/xcb-util-keysyms.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util-keysyms.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY xcb-util-keysyms-download-http
-           "http://xcb.freedesktop.org/dist/xcb-util-keysyms-&xcb-util-keysyms-version;.tar.bz2">
+           "https://xcb.freedesktop.org/dist/xcb-util-keysyms-&xcb-util-keysyms-version;.tar.bz2">
   <!ENTITY xcb-util-keysyms-download-ftp  " ">
   <!ENTITY xcb-util-keysyms-md5sum        "1022293083eec9e62d5659261c29e367">
Index: x/installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util-renderutil.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xcb-util-renderutil-download-http "http://xcb.freedesktop.org/dist/xcb-util-renderutil-&xcb-util-renderutil-version;.tar.bz2">
+  <!ENTITY xcb-util-renderutil-download-http "https://xcb.freedesktop.org/dist/xcb-util-renderutil-&xcb-util-renderutil-version;.tar.bz2">
   <!ENTITY xcb-util-renderutil-download-ftp  " ">
   <!ENTITY xcb-util-renderutil-md5sum        "468b119c94da910e1291f3ffab91019a">
Index: x/installing/xcb-util-wm.xml
===================================================================
--- x/installing/xcb-util-wm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util-wm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY xcb-util-wm-download-http
-           "http://xcb.freedesktop.org/dist/xcb-util-wm-&xcb-util-wm-version;.tar.bz2">
+           "https://xcb.freedesktop.org/dist/xcb-util-wm-&xcb-util-wm-version;.tar.bz2">
   <!ENTITY xcb-util-wm-download-ftp  " ">
   <!ENTITY xcb-util-wm-md5sum        "87b19a1cd7bfcb65a24e36c300e03129">
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xcb-util.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
+  <!ENTITY xcb-util-download-http "https://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
   <!ENTITY xcb-util-download-ftp  " ">
   <!ENTITY xcb-util-md5sum        "2e97feed81919465a04ccc71e4073313">
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/installing/xkeyboard-config.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY xkeyboard-config-download-http
-  "http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-download-ftp
   "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/cairo.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
+  <!ENTITY cairo-download-http "https://www.cairographics.org/releases/cairo-&cairo-version;.tar.xz">
   <!ENTITY cairo-download-ftp  " ">
   <!ENTITY cairo-md5sum        "146f5f4d0b4439fc3792fd3452b7b12a">
Index: x/lib/cairomm.xml
===================================================================
--- x/lib/cairomm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/cairomm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cairomm-download-http "http://cairographics.org/releases/cairomm-&cairomm-version;.tar.gz">
+  <!ENTITY cairomm-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-version;.tar.gz">
   <!ENTITY cairomm-download-ftp  " ">
   <!ENTITY cairomm-md5sum        "9d2282ea34cf9aaa89208bb4bb911909">
Index: x/lib/colord-gtk.xml
===================================================================
--- x/lib/colord-gtk.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/colord-gtk.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY colord-gtk-download-http "http://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
+  <!ENTITY colord-gtk-download-http "https://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
   <!ENTITY colord-gtk-download-ftp  " ">
   <!ENTITY colord-gtk-md5sum        "bb9d6f3c037152ad791003375aa6c16c">
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/freeglut.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY freeglut-download-http
-           "&sourceforge-repo;/freeglut/freeglut-&freeglut-version;.tar.gz">
+           "&sourceforge-dl;/freeglut/freeglut-&freeglut-version;.tar.gz">
   <!ENTITY freeglut-download-ftp " ">
   <!ENTITY freeglut-md5sum        "90c3ca4dd9d51cf32276bc5344ec9754">
Index: x/lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/imlib2.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY imlib2-download-http "&sourceforge-repo2;/projects/enlightenment/files/imlib2-src/&imlib2-version;/imlib2-&imlib2-version;.tar.bz2">
+  <!ENTITY imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
   <!ENTITY imlib2-download-ftp  " ">
   <!ENTITY imlib2-md5sum        "a0de8524592bbd9f24fcc6cb8352137c">
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/libdrm.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
+  <!ENTITY libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
   <!ENTITY libdrm-md5sum        "29867814123c3d23056b1d05aada1b9d">
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/libxklavier.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,8 +5,6 @@
   %general-entities;
 
-<!--  <!ENTITY libxklavier-download-http "&gnome-download-http;/libxklavier/5.3/libxklavier-&libxklavier-version;.tar.xz">
-  <!ENTITY libxklavier-download-ftp "&gnome-download-ftp;/libxklavier/5.3/libxklavier-&libxklavier-version;.tar.xz">-->
-  <!ENTITY libxklavier-download-http "&fedora-http-repo;/libxklavier/libxklavier-&libxklavier-version;.tar.bz2/&libxklavier-md5sum;/libxklavier-&libxklavier-version;.tar.bz2">
-  <!ENTITY libxklavier-download-ftp " ">
+  <!ENTITY libxklavier-download-http "https://people.freedesktop.org/~svu/libxklavier-&libxklavier-version;.tar.bz2">
+  <!ENTITY libxklavier-download-ftp  " ">
   <!ENTITY libxklavier-md5sum        "13af74dcb6011ecedf1e3ed122bd31fa">
   <!ENTITY libxklavier-size          "384 KB">
Index: x/lib/qscintilla.xml
===================================================================
--- x/lib/qscintilla.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/qscintilla.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY qscintilla-download-http "&sourceforge-repo;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
+  <!ENTITY qscintilla-download-http "&sourceforge-dl;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
   <!ENTITY qscintilla-download-ftp  " ">
   <!ENTITY qscintilla-md5sum        "e6d74c445bae69ba335acef65d526260">
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/qt5.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY qt5-major "5.9">
-  <!ENTITY qt5-url   "http://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
+  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
 
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
Index: x/lib/qtwebkit5.xml
===================================================================
--- x/lib/qtwebkit5.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/qtwebkit5.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY qtwebkit-major "5.9">
-  <!ENTITY qtwebkit-url   "http://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
+  <!ENTITY qtwebkit-url   "https://download.qt.io/community_releases/&qtwebkit-major;/&qtwebkit-version;-final">
 
   <!ENTITY qtwebkit-download-http "&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
Index: x/lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/startup-notification.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY startup-notification-download-http "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-&startup-notification-version;.tar.gz">
+  <!ENTITY startup-notification-download-http "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-&startup-notification-version;.tar.gz">
   <!ENTITY startup-notification-download-ftp  " ">
   <!ENTITY startup-notification-md5sum        "2cd77326d4dcaed9a5a23a1232fb38e9">
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/lib/webkitgtk.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
+  <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
   <!ENTITY webkitgtk-md5sum        "0e2d142a586e4ff79cf0324f4fdbf20c">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ x/wm/fluxbox.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.xz">
+  <!ENTITY fluxbox-download-http "&sourceforge-dl;/fluxbox/fluxbox-&fluxbox-version;.tar.xz">
   <!ENTITY fluxbox-download-ftp
            "&jaist-ftp-repo;/f/fl/fluxbox/fluxbox/&fluxbox-version;/fluxbox-&fluxbox-version;.tar.xz">
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/graphweb/firefox.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.xz">
-  <!ENTITY firefox-download-ftp " ">
+  <!ENTITY firefox-download-ftp  " ">
   <!ENTITY firefox-md5sum        "53debc4c7edfaf84b42f040872771d9d">
   <!ENTITY firefox-size          "226 MB">
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/graphweb/seamonkey.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,4 @@
 
   <!ENTITY seamonkey-download-http "&mozilla-http;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.xz">
-<!--  <!ENTITY seamonkey-download-ftp "&mozilla-ftp;/seamonkey/releases/&seamonkey-version;/source/seamonkey-&seamonkey-version;.source.tar.bz2">-->
   <!ENTITY seamonkey-download-ftp " ">
   <!ENTITY seamonkey-md5sum        "cf9ccf46be9359bd82e1931e083e942f">
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/fontforge.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -8,5 +8,4 @@
      the version. -->
 
-<!--ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/20161005/fontforge-dist-&fontforge-version;.tar.gz"> -->
   <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-dist-&fontforge-version;.tar.xz">
   <!ENTITY fontforge-download-ftp  " ">
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/gimp.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
+  <!ENTITY gimp-download-http "https://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  " ">
   <!ENTITY gimp-md5sum        "7e4fd7a53b1d3c32dff642ab1a94b44d">
@@ -14,5 +14,5 @@
 
   <!ENTITY gimp-help-version    "2.8.2">
-  <!ENTITY gimp-help-download   "http://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
+  <!ENTITY gimp-help-download   "https://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
   <!ENTITY gimp-help-md5sum     "a591c8974b2f4f584d0a769d52ed6c5b">
   <!ENTITY gimp-help-size       "152 MB">
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/gparted.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY gparted-download-http
-           "&sourceforge-repo;/gparted/gparted-&gparted-version;.tar.gz">
+  <!ENTITY gparted-download-http "&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
   <!ENTITY gparted-download-ftp  " ">
   <!ENTITY gparted-md5sum        "e29cb2061da59c6a279d9d294cf2a343">
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/pidgin.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pidgin-download-http "&sourceforge-repo;/pidgin/pidgin-&pidgin-version;.tar.bz2">
+  <!ENTITY pidgin-download-http "&sourceforge-dl;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
   <!ENTITY pidgin-md5sum        "8287400c4e5663e0e7844e868d5152af">
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/rox-filer.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY rox-filer-download-http
-    "&sourceforge-repo;/rox/rox-filer-&rox-filer-version;.tar.bz2">
+  <!ENTITY rox-filer-download-http "&sourceforge-dl;/rox/rox-filer-&rox-filer-version;.tar.bz2">
   <!ENTITY rox-filer-download-ftp  " ">
   <!ENTITY rox-filer-md5sum        "0eebf05a67f7932367750ebf9faf215d">
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/thunderbird.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,10 +6,9 @@
 
   <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
-<!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">-->
-  <!ENTITY thunderbird-download-ftp " ">
-  <!ENTITY thunderbird-md5sum            "df6ddc52046acd66503756c094c30e21">
-  <!ENTITY thunderbird-size              "218 MB">
-  <!ENTITY thunderbird-buildsize         "4.5 GB (109 MB installed)">
-  <!ENTITY thunderbird-time              "15 SBU (with -j4, estimated 40 SBU with -j1)">
+  <!ENTITY thunderbird-download-ftp  " ">
+  <!ENTITY thunderbird-md5sum        "df6ddc52046acd66503756c094c30e21">
+  <!ENTITY thunderbird-size          "218 MB">
+  <!ENTITY thunderbird-buildsize     "4.5 GB (109 MB installed)">
+  <!ENTITY thunderbird-time          "15 SBU (with -j4, estimated 40 SBU with -j1)">
 ]>
 
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/tigervnc.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tigervnc-download-http "&sources-anduin-http;/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
+  <!ENTITY tigervnc-download-http "https://github.com/TigerVNC/tigervnc/archive/v&tigervnc-version;/tigervnc-&tigervnc-version;.tar.gz">
   <!ENTITY tigervnc-download-ftp  " ">
   <!ENTITY tigervnc-md5sum        "5c9a80dd4b99b4eb19f535db5ce5830f">
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/xarchiver.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xarchiver-download-http  "http://downloads.sourceforge.net/project/xarchiver/xarchiver-&xarchiver-version;.tar.bz2">
+  <!ENTITY xarchiver-download-http  "&sourceforge-dl;/xarchiver/xarchiver-&xarchiver-version;.tar.bz2">
   <!ENTITY xarchiver-download-ftp  " ">
   <!ENTITY xarchiver-md5sum        "1b4cd37a6af03afc957a8e307417e8d0">
Index: xsoft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision bd27eb1322a90814a28e987c2c3067531f70effd)
+++ xsoft/other/xdg-utils.xml	(revision 8dfc5c303b0b32fbae4e69e108ca70fc538c2eec)
@@ -6,5 +6,5 @@
 
 <!--  <!ENTITY xdg-utils-download-http "http://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-&xdg-utils-version;.tar.gz">-->
-  <!ENTITY xdg-utils-download-http "http://portland.freedesktop.org/download/xdg-utils-&xdg-utils-version;.tar.gz">
+  <!ENTITY xdg-utils-download-http "https://portland.freedesktop.org/download/xdg-utils-&xdg-utils-version;.tar.gz">
   <!ENTITY xdg-utils-download-ftp  " ">
   <!ENTITY xdg-utils-md5sum        "361e75eb76c94d19f6f4f330d8ee626b">
