Index: basicnet/mailnews/mailx.xml
===================================================================
--- basicnet/mailnews/mailx.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ basicnet/mailnews/mailx.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mailx-download-http "http://downloads.sourceforge.net/heirloom/mailx-&mailx-version;.tar.bz2">
+  <!ENTITY mailx-download-http "&sourceforge-repo;/heirloom/mailx-&mailx-version;.tar.bz2">
   <!ENTITY mailx-download-ftp  " ">
   <!ENTITY mailx-md5sum        "c13c24db8fb5f5d10b7ad148647f9909">
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ basicnet/mailnews/mutt.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mutt-download-http "http://downloads.sourceforge.net/mutt/mutt-&mutt-version;.tar.gz">
+  <!ENTITY mutt-download-http "&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">
   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/mutt/devel/mutt-&mutt-version;.tar.gz">
   <!ENTITY mutt-md5sum        "27c30037120189b9f9c0d3e76361b8f8">
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ basicnet/mailnews/slrn.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY slrn-download-http "http://downloads.sourceforge.net/slrn/slrn-&slrn-version;.tar.bz2">
+  <!ENTITY slrn-download-http "&sourceforge-repo;/slrn/slrn-&slrn-version;.tar.bz2">
   <!ENTITY slrn-download-ftp  "ftp://ftp.fh-heilbronn.de/pub/mirrors/slrn/slrn-&slrn-version;.tar.bz2">
   <!ENTITY slrn-md5sum        "9b613007df537444a5f8a4a2994fadb7">
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ basicnet/textweb/w3m.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY w3m-download-http "http://downloads.sourceforge.net/w3m/w3m-&w3m-version;.tar.gz">
+  <!ENTITY w3m-download-http "&sourceforge-repo;/w3m/w3m-&w3m-version;.tar.gz">
   <!ENTITY w3m-download-ftp  " ">
   <!ENTITY w3m-md5sum        "ba06992d3207666ed1bf2dcf7c72bf58">
Index: general.ent
===================================================================
--- general.ent	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general.ent	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -32,4 +32,5 @@
 <!-- <!ENTITY lfs-root             "http://www.&lfs-domainname;/lfs/view/&lfs-version;"> -->
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
+<!ENTITY sourceforge-repo     "http://downloads.sourceforge.net">
 <!ENTITY gentoo-ftp-repo      "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles">
 <!ENTITY publisher            "Unknown">
Index: general/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genlib/expat.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY expat-download-http "http://downloads.sourceforge.net/expat/expat-&expat-version;.tar.gz">
+  <!ENTITY expat-download-http "&sourceforge-repo;/expat/expat-&expat-version;.tar.gz">
   <!ENTITY expat-download-ftp  " ">
   <!ENTITY expat-md5sum        "ee8b492592568805593f81f8cdf2a04c">
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genlib/libusb.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libusb-download-http "http://downloads.sourceforge.net/libusb/libusb-&libusb-version;.tar.gz">
+  <!ENTITY libusb-download-http "&sourceforge-repo;/libusb/libusb-&libusb-version;.tar.gz">
   <!ENTITY libusb-download-ftp  " ">
   <!ENTITY libusb-md5sum        "caf182cbc7565dac0fd72155919672e6">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genlib/pcre.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pcre-download-http "http://downloads.sourceforge.net/pcre/pcre-&pcre-version;.tar.bz2">
+  <!ENTITY pcre-download-http "&sourceforge-repo;/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        "2af38e083fb90ef60fa9eda7cc290e86">
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genutils/imagemagick.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -11,5 +11,5 @@
        the path in these URL's. Otherwise these links are broken within days
        after updates :-(  -->
-  <!ENTITY imagemagick-download-http "http://downloads.sourceforge.net/imagemagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
+  <!ENTITY imagemagick-download-http "&sourceforge-repo;/imagemagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.net/pub/ImageMagick/legacy/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
   <!-- Commenting these out to use the legacy version for the BLFS-6.3 release
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genutils/rep-gtk.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rep-gtk-download-http "http://downloads.sourceforge.net/rep-gtk/rep-gtk-&rep-gtk-version;.tar.gz">
+  <!ENTITY rep-gtk-download-http "&sourceforge-repo;/rep-gtk/rep-gtk-&rep-gtk-version;.tar.gz">
   <!ENTITY rep-gtk-download-ftp  " ">
   <!ENTITY rep-gtk-md5sum        "220b0d728656472c068e40823f0a3b22">
Index: general/genutils/rman.xml
===================================================================
--- general/genutils/rman.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/genutils/rman.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY rman-download-http "http://downloads.sourceforge.net/polyglotman/rman-3.2.tar.gz?download">
+  <!ENTITY rman-download-http "&sourceforge-repo;/polyglotman/rman-3.2.tar.gz?download">
   <!ENTITY rman-download-ftp  " ">
   <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/aalib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY aalib-download-http "http://downloads.sourceforge.net/aa-project/aalib-&aalib-version;.tar.gz">
+  <!ENTITY aalib-download-http "&sourceforge-repo;/aa-project/aalib-&aalib-version;.tar.gz">
   <!ENTITY aalib-download-ftp "ftp://ftp.ratmir.tver.ru/pub/FreeBsd/ports/distfiles/aalib-&aalib-version;.tar.gz">
   <!ENTITY aalib-md5sum "9801095c42bba12edebd1902bcf0a990">
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/freetype2.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY freetype2-download-http "http://downloads.sourceforge.net/freetype/freetype-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-md5sum        "83306194817ebdea554133b4232a34aa">
@@ -12,5 +12,5 @@
   <!ENTITY freetype2-time          "0.4 SBU">
 
-  <!ENTITY freetype2-doc-download-http "http://downloads.sourceforge.net/freetype/freetype-doc-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-doc-md5sum        "2ba135e6a126ed86e9b462167511ced8">
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/giflib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY giflib-download-http "http://downloads.sourceforge.net/giflib/giflib-&giflib-version;.tar.bz2">
+  <!ENTITY giflib-download-http "&sourceforge-repo;/giflib/giflib-&giflib-version;.tar.bz2">
   <!ENTITY giflib-download-ftp  "&gentoo-ftp-repo;/giflib-&giflib-version;.tar.gz">
   <!ENTITY giflib-http-md5sum   "827d338961482a986f39c7f114531636">
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/imlib2.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY imlib2-download-http "http://downloads.sourceforge.net/enlightenment/imlib2-&imlib2-version;.tar.gz">
+  <!ENTITY imlib2-download-http "&sourceforge-repo;/enlightenment/imlib2-&imlib2-version;.tar.gz">
   <!ENTITY imlib2-download-ftp  " ">
   <!ENTITY imlib2-md5sum        "69f7ee996c943142332b4c98597b095c">
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/libexif.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libexif-download-http "http://downloads.sourceforge.net/libexif/libexif-&libexif-version;.tar.bz2">
+  <!ENTITY libexif-download-http "&sourceforge-repo;/libexif/libexif-&libexif-version;.tar.bz2">
   <!ENTITY libexif-download-ftp  " ">
   <!ENTITY libexif-md5sum        "deee153b1ded5a944ea05d041d959eca">
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/libmng.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmng-download-http "http://downloads.sourceforge.net/libmng/libmng-&libmng-version;.tar.gz">
+  <!ENTITY libmng-download-http "&sourceforge-repo;/libmng/libmng-&libmng-version;.tar.gz">
   <!ENTITY libmng-download-ftp  " ">
   <!ENTITY libmng-md5sum        "ff1205ef70855a75c098ea09690413c6">
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/libpng.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libpng-download-http "http://downloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2">
+  <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.bz2">
   <!ENTITY libpng-download-ftp  " ">
   <!ENTITY libpng-md5sum        "f588cb4ee39e3a333604096f937ea157">
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/graphlib/libungif.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libungif-download-http "http://downloads.sourceforge.net/libungif/libungif-&libungif-version;.tar.bz2">
+  <!ENTITY libungif-download-http "&sourceforge-repo;/libungif/libungif-&libungif-version;.tar.bz2">
   <!ENTITY libungif-download-ftp " ">
   <!ENTITY libungif-md5sum "8c198831cc0495596c78134b8849e9ad">
Index: general/prog/junit.xml
===================================================================
--- general/prog/junit.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/junit.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY junit-download-http "http://downloads.sourceforge.net/junit/junit&junit-version;.zip">
+  <!ENTITY junit-download-http "&sourceforge-repo;/junit/junit&junit-version;.zip">
   <!ENTITY junit-download-ftp  " ">
   <!ENTITY junit-md5sum        "6c22e6733f4ba9d755a437375e3d476e">
Index: general/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/librep.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY librep-download-http "http://downloads.sourceforge.net/librep/librep-&librep-version;.tar.gz">
+  <!ENTITY librep-download-http "&sourceforge-repo;/librep/librep-&librep-version;.tar.gz">
   <!ENTITY librep-download-ftp " ">
   <!ENTITY librep-md5sum "ad4ad851ff9f82a5d61024cd96bc2998">
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/nasm.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY NASM-download-http "http://downloads.sourceforge.net/nasm/nasm-&NASM-version;.tar.bz2">
+  <!ENTITY NASM-download-http "&sourceforge-repo;/nasm/nasm-&NASM-version;.tar.bz2">
   <!ENTITY NASM-download-ftp " ">
   <!ENTITY NASM-md5sum "2032ad44c7359f7a9a166a40a633e772">
Index: general/prog/other-tools.xml
===================================================================
--- general/prog/other-tools.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/other-tools.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -1265,5 +1265,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/ooc/"/></para>
+          url="&sourceforge-repo;/ooc/"/></para>
         </listitem>
       </itemizedlist>
@@ -1285,5 +1285,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/ogdl/"/></para>
+          url="&sourceforge-repo;/ogdl/"/></para>
         </listitem>
       </itemizedlist>
@@ -1372,5 +1372,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/q-lang/"/></para>
+          url="&sourceforge-repo;/q-lang/"/></para>
         </listitem>
       </itemizedlist>
@@ -1429,5 +1429,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/regina-rexx"/></para>
+          url="&sourceforge-repo;/regina-rexx"/></para>
         </listitem>
       </itemizedlist>
@@ -1626,5 +1626,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/sbcl/"/></para>
+          url="&sourceforge-repo;/sbcl/"/></para>
         </listitem>
       </itemizedlist>
@@ -1684,5 +1684,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/tiny-cobol/"/></para>
+          url="&sourceforge-repo;/tiny-cobol/"/></para>
         </listitem>
       </itemizedlist>
@@ -1768,5 +1768,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/boost/"/></para>
+          url="&sourceforge-repo;/boost/"/></para>
         </listitem>
       </itemizedlist>
@@ -1952,5 +1952,5 @@
           <listitem>
             <para>Download Location: <ulink
-            url="http://downloads.sourceforge.net/gtk2-perl"/></para>
+            url="&sourceforge-repo;/gtk2-perl"/></para>
           </listitem>
         </itemizedlist>
@@ -2017,5 +2017,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/numpy/"/></para>
+          url="&sourceforge-repo;/numpy/"/></para>
         </listitem>
       </itemizedlist>
@@ -2069,5 +2069,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/swig/"/></para>
+          url="&sourceforge-repo;/swig/"/></para>
         </listitem>
       </itemizedlist>
@@ -2201,5 +2201,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/cachecc1"/></para>
+          url="&sourceforge-repo;/cachecc1"/></para>
         </listitem>
       </itemizedlist>
@@ -2303,5 +2303,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/ctags/"/></para>
+          url="&sourceforge-repo;/ctags/"/></para>
         </listitem>
       </itemizedlist>
@@ -2348,5 +2348,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/gocache/"/></para>
+          url="&sourceforge-repo;/gocache/"/></para>
         </listitem>
       </itemizedlist>
@@ -2403,5 +2403,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/scons/"/></para>
+          url="&sourceforge-repo;/scons/"/></para>
         </listitem>
       </itemizedlist>
@@ -2423,5 +2423,5 @@
         <listitem>
           <para>Download Location: <ulink
-          url="http://downloads.sourceforge.net/strace/"/></para>
+          url="&sourceforge-repo;/strace/"/></para>
         </listitem>
       </itemizedlist>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/pdl.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY pdl-download-http "http://downloads.sourceforge.net/pdl/PDL-&pdl-version;.tar.gz">
+  <!ENTITY pdl-download-http "&sourceforge-repo;/pdl/PDL-&pdl-version;.tar.gz">
   <!ENTITY pdl-download-ftp  "&gentoo-ftp-repo;/PDL-&pdl-version;.tar.gz">
   <!ENTITY pdl-md5sum        "edd056a006eae8b46e8ef804b9774a93">
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/python-modules.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pyxml-download-http "http://downloads.sourceforge.net/pyxml/PyXML-&pyxml-version;.tar.gz">
+  <!ENTITY pyxml-download-http "&sourceforge-repo;/pyxml/PyXML-&pyxml-version;.tar.gz">
   <!ENTITY pyxml-download-ftp  "&gentoo-ftp-repo;/PyXML-&pyxml-version;.tar.gz">
   <!ENTITY pyxml-md5sum        "1f7655050cebbb664db976405fdba209">
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/tcl.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tcl-download-http "http://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
+  <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  "&gentoo-ftp-repo;/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-md5sum        "7d8bc95036f797b1a2b62a5a382d2cc1">
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/prog/tk.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tk-download-http "http://downloads.sourceforge.net/tcl/tk&tk-version;-src.tar.gz">
+  <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  "&gentoo-ftp-repo;/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-md5sum        "bf52be013df31198b144d1ca72b094fb">
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/sysutils/hdparm.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY hdparm-download-http "http://downloads.sourceforge.net/hdparm/hdparm-&hdparm-version;.tar.gz">
+  <!ENTITY hdparm-download-http "&sourceforge-repo;/hdparm/hdparm-&hdparm-version;.tar.gz">
   <!ENTITY hdparm-download-ftp  " ">
   <!ENTITY hdparm-md5sum        "0d96f03155fe5c119ca338a51ad1eaa7">
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/sysutils/unzip.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY unzip-download-http "http://downloads.sourceforge.net/infozip/unzip552.tar.gz">
+  <!ENTITY unzip-download-http "&sourceforge-repo;/infozip/unzip552.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"> -->
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ general/sysutils/usbutils.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY usbutils-download-http "http://downloads.sourceforge.net/linux-usb/usbutils-&usbutils-version;.tar.gz">
+  <!ENTITY usbutils-download-http "&sourceforge-repo;/linux-usb/usbutils-&usbutils-version;.tar.gz">
   <!ENTITY usbutils-download-ftp  " ">
   <!ENTITY usbutils-md5sum        "ee345fe605ffcfce843dae4aed81122b">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ introduction/welcome/changelog.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -45,4 +45,8 @@
       <para>October 13th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Modified all the Sourceforge download URLs to use
+          a newly created entity instead of a hard-coded URL.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to GPM-1.20.5.</para>
Index: multimedia/audioutils/freetts.xml
===================================================================
--- multimedia/audioutils/freetts.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/audioutils/freetts.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY freetts-download-http "http://downloads.sourceforge.net/freetts/freetts-&freetts-version;-src.zip">
+  <!ENTITY freetts-download-http "&sourceforge-repo;/freetts/freetts-&freetts-version;-src.zip">
   <!ENTITY freetts-download-ftp  " ">
   <!ENTITY freetts-md5sum        "f3e3ceae5b8cb5e175b50931f2e350e8">
@@ -12,5 +12,5 @@
   <!ENTITY freetts-time          "0.4 SBU">
 
-  <!ENTITY freetts-testsuite-download  "http://downloads.sourceforge.net/freetts/freetts-&freetts-version;-tst.zip">
+  <!ENTITY freetts-testsuite-download  "&sourceforge-repo;/freetts/freetts-&freetts-version;-tst.zip">
   <!ENTITY freetts-testsuite-md5sum    "8e461701ee94b3942cc37783f6de4128">
   <!ENTITY freetts-testsuite-size      "3.9 MB">
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/audioutils/lame.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lame-download-http "http://downloads.sourceforge.net/lame/lame-&lame-version;.tar.gz">
+  <!ENTITY lame-download-http "&sourceforge-repo;/lame/lame-&lame-version;.tar.gz">
   <!ENTITY lame-download-ftp  " ">
   <!ENTITY lame-md5sum        "90a4acbb730d150dfe80de145126eef7">
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/audioutils/mpg123.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mpg123-download-http "http://downloads.sourceforge.net/mpg123/mpg123-&mpg123-version;.tar.bz2">
+  <!ENTITY mpg123-download-http "&sourceforge-repo;/mpg123/mpg123-&mpg123-version;.tar.bz2">
   <!ENTITY mpg123-download-ftp  " ">
   <!ENTITY mpg123-md5sum        "c571594e81e15c9d5cafe1bb3fdc3386">
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cdrdao-download-http "http://downloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
+  <!ENTITY cdrdao-download-http "&sourceforge-repo;/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
   <!ENTITY cdrdao-download-ftp  " ">
   <!ENTITY cdrdao-md5sum        "f0cbf36907406cb4f4c568f9e6669a34">
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/cdwriteutils/k3b.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY k3b-download-http "http://downloads.sourceforge.net/k3b/k3b-&k3b-version;.tar.bz2">
+  <!ENTITY k3b-download-http "&sourceforge-repo;/k3b/k3b-&k3b-version;.tar.bz2">
   <!ENTITY k3b-download-ftp  " ">
   <!ENTITY k3b-md5sum        "42538ddae0809707d3bcdbe0a6ed6a43">
Index: multimedia/cdwriteutils/udftools.xml
===================================================================
--- multimedia/cdwriteutils/udftools.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/cdwriteutils/udftools.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY udftools-download-http "http://downloads.sourceforge.net/linux-udf/udftools-&udftools-version;.tar.gz">
+  <!ENTITY udftools-download-http "&sourceforge-repo;/linux-udf/udftools-&udftools-version;.tar.gz">
   <!ENTITY udftools-download-ftp  " ">
   <!ENTITY udftools-md5sum        "2f491ddd63f31040797236fe18db9e60">
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/faac.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY faac-download-http "http://downloads.sourceforge.net/faac/faac-&faac-version;.tar.gz">
+  <!ENTITY faac-download-http "&sourceforge-repo;/faac/faac-&faac-version;.tar.gz">
   <!ENTITY faac-download-ftp  " ">
   <!ENTITY faac-md5sum        "1d7c019bd2dbb4f3101b8937ebc59cf6">
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/faad2.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY faad2-download-http "http://downloads.sourceforge.net/faac/faad2-&faad2-version;.tar.gz">
+  <!ENTITY faad2-download-http "&sourceforge-repo;/faac/faad2-&faad2-version;.tar.gz">
   <!ENTITY faad2-download-ftp  " ">
   <!ENTITY faad2-md5sum        "74e92df40c270f216a8305fc87603c8a">
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/flac.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY flac-download-http "http://downloads.sourceforge.net/flac/flac-&flac-version;.tar.gz">
+  <!ENTITY flac-download-http "&sourceforge-repo;/flac/flac-&flac-version;.tar.gz">
   <!ENTITY flac-download-ftp  " ">
   <!ENTITY flac-md5sum        "153c8b15a54da428d1f0fadc756c22c7">
Index: multimedia/libdriv/id3lib.xml
===================================================================
--- multimedia/libdriv/id3lib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/id3lib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY id3lib-download-http "http://downloads.sourceforge.net/id3lib/id3lib-&id3lib-version;.tar.gz">
+  <!ENTITY id3lib-download-http "&sourceforge-repo;/id3lib/id3lib-&id3lib-version;.tar.gz">
   <!ENTITY id3lib-download-ftp  " ">
   <!ENTITY id3lib-md5sum        "19f27ddd2dda4b2d26a559a4f0f402a7">
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/libdv.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdv-download-http "http://downloads.sourceforge.net/libdv/libdv-&libdv-version;.tar.gz">
+  <!ENTITY libdv-download-http "&sourceforge-repo;/libdv/libdv-&libdv-version;.tar.gz">
   <!ENTITY libdv-download-ftp  " ">
   <!ENTITY libdv-md5sum        "f895162161cfa4bb4a94c070a7caa6c7">
Index: multimedia/libdriv/libfame.xml
===================================================================
--- multimedia/libdriv/libfame.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/libfame.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libfame-download-http "http://downloads.sourceforge.net/fame/libfame-&libfame-version;.tar.gz">
+  <!ENTITY libfame-download-http "&sourceforge-repo;/fame/libfame-&libfame-version;.tar.gz">
   <!ENTITY libfame-download-ftp  "&gentoo-ftp-repo;/libfame-&libfame-version;.tar.gz">
   <!ENTITY libfame-md5sum        "880085761e17a3b4fc41f4f6f198fd3b">
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/libmad.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmad-download-http "http://downloads.sourceforge.net/mad/libmad-&libmad-version;.tar.gz">
+  <!ENTITY libmad-download-http "&sourceforge-repo;/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/libmpeg3.xml
===================================================================
--- multimedia/libdriv/libmpeg3.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/libmpeg3.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libmpeg3-download-http "http://downloads.sourceforge.net/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
+  <!ENTITY libmpeg3-download-http "&sourceforge-repo;/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
   <!ENTITY libmpeg3-download-ftp  " ">
   <!ENTITY libmpeg3-md5sum        "4a3e8896164d59d7d0dff69b50b75352">
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/libquicktime.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libquicktime-download-http "http://downloads.sourceforge.net/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
+  <!ENTITY libquicktime-download-http "&sourceforge-repo;/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
   <!ENTITY libquicktime-download-ftp  "&gentoo-ftp-repo;/libquicktime-&libquicktime-version;.tar.gz">
   <!ENTITY libquicktime-md5sum        "2f609e3ef5e760f44022f6c4b66d6a01">
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/nas.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -7,5 +7,5 @@
   <!-- <!ENTITY nas-download-http "http://nas.codebrilliance.com/nas/nas-&nas-version;.src.tar.gz">
   <!ENTITY nas-download-ftp  "&gentoo-ftp-repo;/nas-&nas-version;.src.tar.gz"> -->
-  <!ENTITY nas-download-http "http://downloads.sourceforge.net/nas/nas-&nas-version;.src.tar.gz">
+  <!ENTITY nas-download-http "&sourceforge-repo;/nas/nas-&nas-version;.src.tar.gz">
   <!ENTITY nas-download-ftp  "&sources-anduin-ftp;/n/nas-&nas-version;.src.tar.gz">
   <!ENTITY nas-md5sum        "aac031fae04f53bcd1e033b380b1b29d">
Index: multimedia/libdriv/openquicktime.xml
===================================================================
--- multimedia/libdriv/openquicktime.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/openquicktime.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY openquicktime-download-http "http://downloads.sourceforge.net/openquicktime/openquicktime-&openquicktime-version;-src.tgz">
+  <!ENTITY openquicktime-download-http "&sourceforge-repo;/openquicktime/openquicktime-&openquicktime-version;-src.tgz">
   <!ENTITY openquicktime-download-ftp  " ">
   <!ENTITY openquicktime-md5sum        "f90bc78b8632c6c254cddf70b4726644">
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/libdriv/xine-lib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xine-lib-download-http "http://downloads.sourceforge.net/xine/xine-lib-&xine-lib-version;.tar.bz2">
+  <!ENTITY xine-lib-download-http "&sourceforge-repo;/xine/xine-lib-&xine-lib-version;.tar.bz2">
   <!ENTITY xine-lib-download-ftp  "&gentoo-ftp-repo;/xine-lib-&xine-lib-version;.tar.bz2">
   <!ENTITY xine-lib-md5sum        "b7254614c78c8b0f1652b8dc06f80b3a">
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/videoutils/avifile.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -6,5 +6,5 @@
 
   <!ENTITY avifile-main-version  "0.7">
-  <!ENTITY avifile-download-http "http://downloads.sourceforge.net/avifile/avifile-&avifile-main-version;-&avifile-version;.tar.bz2">
+  <!ENTITY avifile-download-http "&sourceforge-repo;/avifile/avifile-&avifile-main-version;-&avifile-version;.tar.bz2">
   <!ENTITY avifile-download-ftp  " ">
   <!ENTITY avifile-md5sum        "7da94802f120d1b69e04a13170dcd21d">
@@ -13,5 +13,5 @@
   <!ENTITY avifile-time          "2.5 SBU">
 
-  <!ENTITY codec-download        "http://downloads.sourceforge.net/avifile/binaries-011002.tgz">
+  <!ENTITY codec-download        "&sourceforge-repo;/avifile/binaries-011002.tgz">
   <!ENTITY codec-md5sum          "4db4edeeceefb9353b15b047207fa6d3">
   <!ENTITY codec-size            "4.3 MB">
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ multimedia/videoutils/xine-ui.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xine-ui-download-http "http://downloads.sourceforge.net/xine/xine-ui-&xine-ui-version;.tar.gz">
+  <!ENTITY xine-ui-download-http "&sourceforge-repo;/xine/xine-ui-&xine-ui-version;.tar.gz">
   <!ENTITY xine-ui-download-ftp  "&gentoo-ftp-repo;/xine-ui-&xine-ui-version;.tar.gz">
   <!ENTITY xine-ui-md5sum        "e643cd1fcad4d98a5ae4eb877ce5087b">
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ postlfs/editors/joe.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY joe-download-http "http://downloads.sourceforge.net/joe-editor/joe-&joe-version;.tar.gz">
+  <!ENTITY joe-download-http "&sourceforge-repo;/joe-editor/joe-&joe-version;.tar.gz">
   <!ENTITY joe-download-ftp  " ">
   <!ENTITY joe-md5sum        "9bdffecce7ef910feaa06452d48843de">
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ postlfs/security/cracklib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY cracklib-download-http "http://downloads.sourceforge.net/cracklib/cracklib-&cracklib-version;.tar.gz">
+  <!ENTITY cracklib-download-http "&sourceforge-repo;/cracklib/cracklib-&cracklib-version;.tar.gz">
   <!ENTITY cracklib-download-ftp  "&gentoo-ftp-repo;/cracklib-&cracklib-version;.tar.gz">
   <!ENTITY cracklib-md5sum        "580346fa1012f9d9769192f49d3801fa">
@@ -12,5 +12,5 @@
   <!ENTITY cracklib-time          "0.3 SBU">
 
-  <!ENTITY crackdict-download     "http://downloads.sourceforge.net/cracklib/cracklib-words-20080203.gz">
+  <!ENTITY crackdict-download     "&sourceforge-repo;/cracklib/cracklib-words-20080203.gz">
   <!ENTITY crackdict-size         "4.4 MB">
   <!ENTITY crackdict-md5sum       "f8be7949b1bbc044e36039598a7819d9">
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ postlfs/security/tripwire.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tripwire-download-http "http://downloads.sourceforge.net/tripwire/tripwire-&tripwire-version;-src.tar.bz2">
+  <!ENTITY tripwire-download-http "&sourceforge-repo;/tripwire/tripwire-&tripwire-version;-src.tar.bz2">
   <!ENTITY tripwire-download-ftp  " ">
   <!ENTITY tripwire-md5sum        "1147c278b528ed593023912c4b649a">
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ postlfs/shells/zsh.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY zsh-download-http "http://downloads.sourceforge.net/zsh/zsh-&zsh-version;.tar.bz2">
+  <!ENTITY zsh-download-http "&sourceforge-repo;/zsh/zsh-&zsh-version;.tar.bz2">
   <!ENTITY zsh-download-ftp  " ">
   <!ENTITY zsh-md5sum        "16f399af1081ad3c303a794c9c7dc47e">
@@ -73,5 +73,5 @@
       <listitem>
         <para>Optional Documentation: <ulink
-        url="http://downloads.sourceforge.net/zsh/zsh-&zsh-version;-doc.tar.bz2"/></para>
+        url="&sourceforge-repo;/zsh/zsh-&zsh-version;-doc.tar.bz2"/></para>
       </listitem>
       <listitem>
Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/printing/gimp-print.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gimp-print-download-http "http://downloads.sourceforge.net/gimp-print/gimp-print-&gimp-print-version;.tar.gz">
+  <!ENTITY gimp-print-download-http "&sourceforge-repo;/gimp-print/gimp-print-&gimp-print-version;.tar.gz">
   <!ENTITY gimp-print-download-ftp  " ">
   <!ENTITY gimp-print-md5sum        "766be49f44a6a682d857e5aefec414d4">
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/printing/gs.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gs-download-http "http://downloads.sourceforge.net/ghostscript/ghostscript-&gs-version;.tar.bz2">
+  <!ENTITY gs-download-http "&sourceforge-repo;/ghostscript/ghostscript-&gs-version;.tar.bz2">
   <!-- <!ENTITY gs-download-ftp  "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs851/ghostscript-&gs-version;.tar.bz2"> -->
   <!ENTITY gs-download-ftp  " ">
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/printing/gutenprint.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY gutenprint-download-http "http://downloads.sourceforge.net/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
+  <!ENTITY gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
   <!ENTITY gutenprint-download-ftp  " ">
   <!ENTITY gutenprint-md5sum        "4ec66d57c1014b503d6bea16b1c31d81">
Index: pst/printing/lprng.xml
===================================================================
--- pst/printing/lprng.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/printing/lprng.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -7,5 +7,5 @@
   <!-- <!ENTITY LPRng-download-http "http://www.lprng.com/DISTRIB/LPRng/LPRng-&LPRng-version;.tgz">
   <!ENTITY LPRng-download-ftp  "ftp://ftp.lprng.com/pub/LPRng/LPRng/LPRng-&LPRng-version;.tgz"> -->
-  <!-- <!ENTITY LPRng-download-http "http://downloads.sourceforge.net/lprng/LPRng-&LPRng-version;.tgz"> -->
+  <!-- <!ENTITY LPRng-download-http "&sourceforge-repo;/lprng/LPRng-&LPRng-version;.tgz"> -->
   <!ENTITY LPRng-download-http "&sources-anduin-http;/l/LPRng-&LPRng-version;.tgz">
   <!ENTITY LPRng-download-ftp  "&sources-anduin-ftp;/l/LPRng-&LPRng-version;.tgz">
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/ps/fop.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
   <!ENTITY jai-size          "2.6 MB">
 
-  <!ENTITY offo-download     "http://downloads.sourceforge.net/offo/offo-hyphenation.zip">
+  <!ENTITY offo-download     "&sourceforge-repo;/offo/offo-hyphenation.zip">
   <!ENTITY offo-md5sum       "0b8c1657ef70285ad7fd514061b08c3e">
   <!ENTITY offo-size         "359 KB">
Index: pst/ps/paps.xml
===================================================================
--- pst/ps/paps.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/ps/paps.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY paps-download-http "http://downloads.sourceforge.net/paps/paps-&paps-version;.tar.gz">
+  <!ENTITY paps-download-http "&sourceforge-repo;/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 cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/sgml/docbook-dsssl.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY docbook-dsssl-download-http "http://downloads.sourceforge.net/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
+  <!ENTITY docbook-dsssl-download-http "&sourceforge-repo;/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 "http://downloads.sourceforge.net/docbook/docbook-dsssl-doc-&docbook-dsssl-version;.tar.bz2">
+  <!ENTITY docbook-dsssl-doc-download-http "&sourceforge-repo;/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/openjade.xml
===================================================================
--- pst/sgml/openjade.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/sgml/openjade.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY openjade-download-http "http://downloads.sourceforge.net/openjade/openjade-&openjade-version;.tar.gz">
+  <!ENTITY openjade-download-http "&sourceforge-repo;/openjade/openjade-&openjade-version;.tar.gz">
   <!ENTITY openjade-download-ftp  "ftp://ftp.freestandards.org/pub/lsb/app-battery/packages/openjade-&openjade-version;.tar.gz">
   <!ENTITY openjade-md5sum        "7df692e3186109cc00db6825b777201e">
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/sgml/opensp.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY opensp-download-http "http://downloads.sourceforge.net/openjade/OpenSP-&opensp-version;.tar.gz">
+  <!ENTITY opensp-download-http "&sourceforge-repo;/openjade/OpenSP-&opensp-version;.tar.gz">
   <!ENTITY opensp-download-ftp  " ">
 <!--
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/typesetting/jadetex.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY jadetex-download-http "http://downloads.sourceforge.net/jadetex/jadetex-&jadetex-version;.tar.gz">
+  <!ENTITY jadetex-download-http "&sourceforge-repo;/jadetex/jadetex-&jadetex-version;.tar.gz">
   <!ENTITY jadetex-download-ftp  "&gentoo-ftp-repo;/jadetex-&jadetex-version;.tar.gz">
   <!ENTITY jadetex-md5sum        "634dfc172fbf66a6976e2c2c60e2d198">
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ pst/xml/docbook-xsl.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY docbook-xsl-download-http "http://downloads.sourceforge.net/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-download-http "&sourceforge-repo;/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-download-ftp  " ">
   <!ENTITY docbook-xsl-md5sum        "6a269abc854ae949b2cfd6377bc17fde">
@@ -12,5 +12,5 @@
   <!ENTITY docbook-xsl-time          "less than 0.1 SBU">
 
-  <!ENTITY docbook-xsl-doc-download  "http://downloads.sourceforge.net/docbook/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
+  <!ENTITY docbook-xsl-doc-download  "&sourceforge-repo;/docbook/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-doc-md5sum    "f7844a751a4612c56acddc0790fbc501">
   <!ENTITY docbook-xsl-doc-size      "1.3 MB">
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ server/mail/courier.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY courier-download-http "http://downloads.sourceforge.net/courier/courier-&courier-version;.tar.bz2">
+  <!ENTITY courier-download-http "&sourceforge-repo;/courier/courier-&courier-version;.tar.bz2">
   <!ENTITY courier-download-ftp " ">
   <!ENTITY courier-md5sum "639bb3b236914e3b86f287ce3f55264e">
Index: server/major/nfs-utils.xml
===================================================================
--- server/major/nfs-utils.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ server/major/nfs-utils.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY nfs-utils-download-http "http://downloads.sourceforge.net/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+  <!ENTITY nfs-utils-download-http "&sourceforge-repo;/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
   <!ENTITY nfs-utils-download-ftp  " ">
   <!ENTITY nfs-utils-md5sum        "76ee9274c2b867839427eba91b327f03">
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ server/other/leafnode.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY leafnode-download-http "http://downloads.sourceforge.net/leafnode/leafnode-&leafnode-version;.tar.bz2">
+  <!ENTITY leafnode-download-http "&sourceforge-repo;/leafnode/leafnode-&leafnode-version;.tar.bz2">
   <!ENTITY leafnode-download-ftp "ftp://ftp.gwdg.de/pub/linux/mirrors/sunsite/system/news/transport/leafnode-&leafnode-version;.tar.bz2">
   <!ENTITY leafnode-md5sum "88552c5cc91cb27146c8906b2d33289d">
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/lib/freeglut.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY freeglut-download-http "http://downloads.sourceforge.net/freeglut/freeglut-&freeglut-version;.tar.gz">
+  <!ENTITY freeglut-download-http "&sourceforge-repo;/freeglut/freeglut-&freeglut-version;.tar.gz">
   <!ENTITY freeglut-download-ftp " ">
   <!ENTITY freeglut-md5sum        "6d16873bd876fbf4980a927cfbc496a1">
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/lib/lesstif.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY lesstif-download-http "http://downloads.sourceforge.net/lesstif/lesstif-&lesstif-version;.tar.bz2">
+  <!ENTITY lesstif-download-http "&sourceforge-repo;/lesstif/lesstif-&lesstif-version;.tar.bz2">
   <!ENTITY lesstif-download-ftp  " ">
   <!ENTITY lesstif-md5sum        "ab895165c149d7f95843c7584b1c7ad4">
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/lib/libxklavier.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libxklavier-download-http "http://downloads.sourceforge.net/gswitchit/libxklavier-&libxklavier-version;.tar.gz">
+  <!ENTITY libxklavier-download-http "&sourceforge-repo;/gswitchit/libxklavier-&libxklavier-version;.tar.gz">
   <!ENTITY libxklavier-download-ftp  " ">
   <!ENTITY libxklavier-md5sum        "8f89a65b2d0aa8f8f5979c7d9de3d051">
Index: x/lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/lib/mesalib.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY mesalib-download-http "http://downloads.sourceforge.net/mesa3d/MesaLib-&mesalib-version;.tar.bz2">
+  <!ENTITY mesalib-download-http "&sourceforge-repo;/mesa3d/MesaLib-&mesalib-version;.tar.bz2">
   <!ENTITY mesalib-download-ftp  " ">
   <!ENTITY mesalib-md5sum        "e4d894181f1859651658b3704633e10d">
@@ -12,9 +12,9 @@
   <!ENTITY mesalib-time          "1.6 SBU">
 
-  <!ENTITY mesademos-download-http "http://downloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">
+  <!ENTITY mesademos-download-http "&sourceforge-repo;/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">
   <!ENTITY mesademos-md5sum        "e870efe98d3a50be01ab211b9b2e25d9">
   <!ENTITY mesademos-size          "1.3 MB">
 
-  <!ENTITY mesaglut-download-http  "http://downloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">
+  <!ENTITY mesaglut-download-http  "&sourceforge-repo;/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">
   <!ENTITY mesaglut-md5sum         "e84edbb11c69c8e408dfadd2ed08e95b">
   <!ENTITY mesaglut-size           "306 KB">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/wm/fluxbox.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fluxbox-download-http "http://downloads.sourceforge.net/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
+  <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
   <!ENTITY fluxbox-download-ftp  " ">
   <!ENTITY fluxbox-md5sum        "098eb36a09338aabb63b938a5eab9ef6">
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/wm/sawfish.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -17,5 +17,5 @@
     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 
-  <!ENTITY sawfish-download-http "http://downloads.sourceforge.net/sawmill/sawfish-&sawfish-version;.tar.gz">
+  <!ENTITY sawfish-download-http "&sourceforge-repo;/sawmill/sawfish-&sawfish-version;.tar.gz">
   <!ENTITY sawfish-download-ftp  " ">
   <!ENTITY sawfish-md5sum        "9e5ce5e76c60acecdb1889c1f173295a">
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ x/wm/xfce.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY xfce-download-http "http://downloads.sourceforge.net/xfce/xfce-&xfce-version;-src.tar.bz2">
+  <!ENTITY xfce-download-http "&sourceforge-repo;/xfce/xfce-&xfce-version;-src.tar.bz2">
   <!ENTITY xfce-download-ftp  " ">
   <!ENTITY xfce-md5sum        "5dd0ee362dd5782324b88da3cd5b9f1b">
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ xsoft/graphweb/galeon.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY galeon-download-http "http://downloads.sourceforge.net/galeon/galeon-&galeon-version;.tar.bz2">
+  <!ENTITY galeon-download-http "&sourceforge-repo;/galeon/galeon-&galeon-version;.tar.bz2">
   <!ENTITY galeon-download-ftp  "&gentoo-ftp-repo;/galeon-&galeon-version;.tar.bz2">
   <!ENTITY galeon-md5sum        "34d6e3a6ee78f9e4d12736e5d81b462b">
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision cb098fac09911eb0d91ddfaf9efa76b4543b3b77)
+++ xsoft/other/pidgin.xml	(revision fce275e955d8684053aa1d494861761e579d043a)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY pidgin-download-http "http://downloads.sourceforge.net/pidgin/pidgin-&pidgin-version;.tar.bz2">
+  <!ENTITY pidgin-download-http "&sourceforge-repo;/pidgin/pidgin-&pidgin-version;.tar.bz2">
   <!ENTITY pidgin-download-ftp  " ">
   <!ENTITY pidgin-md5sum        "83f44bf9c076595967f7374c50250176">
