summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/argtable2.make2
-rw-r--r--rules/at.make2
-rw-r--r--rules/bash.make2
-rw-r--r--rules/bc.make2
-rw-r--r--rules/binutils.make2
-rw-r--r--rules/blackbox.make2
-rw-r--r--rules/bluez.make2
-rw-r--r--rules/boa.make2
-rw-r--r--rules/boost.make2
-rw-r--r--rules/bridge-utils.make2
-rw-r--r--rules/classpath.make2
-rw-r--r--rules/connman.make2
-rw-r--r--rules/coreutils.make2
-rw-r--r--rules/cppunit.make2
-rw-r--r--rules/cpufrequtils.make2
-rw-r--r--rules/cross-nasm.make2
-rw-r--r--rules/diffutils.make2
-rw-r--r--rules/dri2proto.make2
-rw-r--r--rules/e2fsprogs.make2
-rw-r--r--rules/etherwake.make2
-rw-r--r--rules/ethtool.make2
-rw-r--r--rules/findutils.make2
-rw-r--r--rules/flac.make2
-rw-r--r--rules/flex.make2
-rw-r--r--rules/fluxbox.make2
-rw-r--r--rules/freeglut.make2
-rw-r--r--rules/fuse.make2
-rw-r--r--rules/gawk.make2
-rw-r--r--rules/gdb.make2
-rw-r--r--rules/gettext.make2
-rw-r--r--rules/glew.make2
-rw-r--r--rules/gmake.make2
-rw-r--r--rules/gnuplot.make2
-rw-r--r--rules/grep.make2
-rw-r--r--rules/haserl.make2
-rw-r--r--rules/hdparm.make2
-rw-r--r--rules/host-autotools-autoconf.make2
-rw-r--r--rules/host-autotools-automake.make2
-rw-r--r--rules/host-autotools-libtool.make2
-rw-r--r--rules/host-cramfs.make2
-rw-r--r--rules/host-fakeroot.make2
-rw-r--r--rules/host-genext2fs.make2
-rw-r--r--rules/host-gperf.make2
-rw-r--r--rules/host-libiconv.make2
-rw-r--r--rules/host-makedepend.make2
-rw-r--r--rules/host-mtools.make2
-rw-r--r--rules/host-qooxdoo.make2
-rw-r--r--rules/host-xorg-app-bdftopcf.make2
-rw-r--r--rules/host-xorg-util-macros.make2
-rw-r--r--rules/htop.make2
-rw-r--r--rules/inetutils.make2
-rw-r--r--rules/initng.make2
-rw-r--r--rules/inotify-tools.make2
-rw-r--r--rules/iperf.make2
-rw-r--r--rules/jamvm.make2
-rw-r--r--rules/joe.make2
-rw-r--r--rules/kbd.make2
-rw-r--r--rules/kexec-tools.make2
-rw-r--r--rules/klibc.make2
-rw-r--r--rules/lcms.make2
-rw-r--r--rules/less.make2
-rw-r--r--rules/libcap.make2
-rw-r--r--rules/libcgi.make2
-rw-r--r--rules/libcgicc.make2
-rw-r--r--rules/libdmtx.make2
-rw-r--r--rules/libgdbus.make2
-rw-r--r--rules/libgmp.make2
-rw-r--r--rules/libical.make2
-rw-r--r--rules/libiodbc.make2
-rw-r--r--rules/liblockfile.make2
-rw-r--r--rules/libltdl.make2
-rw-r--r--rules/libmicrohttpd.make2
-rw-r--r--rules/libmng.make2
-rw-r--r--rules/libnet.make2
-rw-r--r--rules/libnetpbm.make2
-rw-r--r--rules/libpciaccess.make2
-rw-r--r--rules/libpcre.make2
-rw-r--r--rules/libpng.make2
-rw-r--r--rules/libsysfs.make2
-rw-r--r--rules/libusb-compat.make2
-rw-r--r--rules/libusb.make2
-rw-r--r--rules/libv4l2-python.make2
-rw-r--r--rules/lmbench.make2
-rw-r--r--rules/lpc21isp.make2
-rw-r--r--rules/lsof.make2
-rw-r--r--rules/ltp-base.make2
-rw-r--r--rules/memstat.make2
-rw-r--r--rules/mesalib.make4
-rw-r--r--rules/mii-diag.make2
-rw-r--r--rules/module-init-tools.make2
-rw-r--r--rules/ncurses.make2
-rw-r--r--rules/net-snmp.make2
-rw-r--r--rules/netcat.make2
-rw-r--r--rules/nfsutils.make2
-rw-r--r--rules/oprofile.make2
-rw-r--r--rules/owfs.make2
-rw-r--r--rules/parted.make2
-rw-r--r--rules/pciutils.make2
-rw-r--r--rules/pcmciautils.make2
-rw-r--r--rules/pixman.make2
-rw-r--r--rules/poco.make2
-rw-r--r--rules/pop3spam.make2
-rw-r--r--rules/pre/kernel.make16
-rw-r--r--rules/prelink.make2
-rw-r--r--rules/ps3-utils.make2
-rw-r--r--rules/quota-tools.make2
-rw-r--r--rules/qwt.make2
-rw-r--r--rules/rawrec.make2
-rw-r--r--rules/readline.make2
-rw-r--r--rules/rt-tests.make2
-rw-r--r--rules/screen.make2
-rw-r--r--rules/scummvm.make2
-rw-r--r--rules/sed.make2
-rw-r--r--rules/serdisplib.make2
-rw-r--r--rules/setserial.make2
-rw-r--r--rules/smartmontools.make2
-rw-r--r--rules/squashfs-tools.make2
-rw-r--r--rules/ssmtp.make2
-rw-r--r--rules/strace.make2
-rw-r--r--rules/syslinux.make2
-rw-r--r--rules/tcl.make2
-rw-r--r--rules/termcap.make2
-rw-r--r--rules/tiobench.make2
-rw-r--r--rules/tk.make2
-rw-r--r--rules/trace-cmd.make2
-rw-r--r--rules/udev.make2
-rw-r--r--rules/usbutils.make2
-rw-r--r--rules/util-linux-ng.make2
-rw-r--r--rules/uttt.make2
-rw-r--r--rules/watchdog.make2
-rw-r--r--rules/wget.make2
-rw-r--r--rules/wine.make2
-rw-r--r--rules/wxwidgets.make2
-rw-r--r--rules/xmlbench.make2
-rw-r--r--rules/xmlrpc-c.make2
-rw-r--r--rules/xmlstarlet.make2
-rw-r--r--rules/xorg-app-iceauth.make2
-rw-r--r--rules/xorg-app-mkfontdir.make2
-rw-r--r--rules/xorg-app-mkfontscale.make2
-rw-r--r--rules/xorg-app-rgb.make2
-rw-r--r--rules/xorg-app-setxkbmap.make2
-rw-r--r--rules/xorg-app-xauth.make2
-rw-r--r--rules/xorg-app-xdm.make2
-rw-r--r--rules/xorg-app-xev.make2
-rw-r--r--rules/xorg-app-xeyes.make2
-rw-r--r--rules/xorg-app-xhost.make2
-rw-r--r--rules/xorg-app-xinit.make2
-rw-r--r--rules/xorg-app-xinput.make2
-rw-r--r--rules/xorg-app-xkbcomp.make2
-rw-r--r--rules/xorg-app-xprop.make2
-rw-r--r--rules/xorg-app-xrandr.make2
-rw-r--r--rules/xorg-app-xrdb.make2
-rw-r--r--rules/xorg-app-xset.make2
-rw-r--r--rules/xorg-app-xsetroot.make2
-rw-r--r--rules/xorg-app-xvinfo.make2
-rw-r--r--rules/xorg-data-xbitmaps.make2
-rw-r--r--rules/xorg-driver-input-evdev.make2
-rw-r--r--rules/xorg-driver-input-keyboard.make2
-rw-r--r--rules/xorg-driver-input-mouse.make2
-rw-r--r--rules/xorg-driver-input-void.make2
-rw-r--r--rules/xorg-driver-video-apm.make2
-rw-r--r--rules/xorg-driver-video-ati.make2
-rw-r--r--rules/xorg-driver-video-dummy.make2
-rw-r--r--rules/xorg-driver-video-fbdev.make2
-rw-r--r--rules/xorg-driver-video-intel.make2
-rw-r--r--rules/xorg-driver-video-v4l.make2
-rw-r--r--rules/xorg-driver-video-vesa.make2
-rw-r--r--rules/xorg-font-adobe-100dpi.make2
-rw-r--r--rules/xorg-font-adobe-75dpi.make2
-rw-r--r--rules/xorg-font-adobe-utopia-100dpi.make2
-rw-r--r--rules/xorg-font-adobe-utopia-75dpi.make2
-rw-r--r--rules/xorg-font-adobe-utopia-type1.make2
-rw-r--r--rules/xorg-font-alias.make2
-rw-r--r--rules/xorg-font-arabic-misc.make2
-rw-r--r--rules/xorg-font-bh-100dpi.make2
-rw-r--r--rules/xorg-font-bh-75dpi.make2
-rw-r--r--rules/xorg-font-bh-lucidatypewriter-100dpi.make2
-rw-r--r--rules/xorg-font-bh-lucidatypewriter-75dpi.make2
-rw-r--r--rules/xorg-font-bh-ttf.make2
-rw-r--r--rules/xorg-font-bitstream-100dpi.make2
-rw-r--r--rules/xorg-font-bitstream-75dpi.make2
-rw-r--r--rules/xorg-font-bitstream-speedo.make2
-rw-r--r--rules/xorg-font-bitstream-type1.make2
-rw-r--r--rules/xorg-font-cronyx-cyrillic.make2
-rw-r--r--rules/xorg-font-cursor-misc.make2
-rw-r--r--rules/xorg-font-daewoo-misc.make2
-rw-r--r--rules/xorg-font-dec-misc.make2
-rw-r--r--rules/xorg-font-encodings.make2
-rw-r--r--rules/xorg-font-ibm-type1.make2
-rw-r--r--rules/xorg-font-intl.make2
-rw-r--r--rules/xorg-font-isas-misc.make2
-rw-r--r--rules/xorg-font-jis-misc.make2
-rw-r--r--rules/xorg-font-micro-misc.make2
-rw-r--r--rules/xorg-font-misc-cyrillic.make2
-rw-r--r--rules/xorg-font-misc-ethiopic.make2
-rw-r--r--rules/xorg-font-misc-meltho.make2
-rw-r--r--rules/xorg-font-misc-misc.make2
-rw-r--r--rules/xorg-font-mutt-misc.make2
-rw-r--r--rules/xorg-font-schumacher-misc.make2
-rw-r--r--rules/xorg-font-screen-cyrillic.make2
-rw-r--r--rules/xorg-font-sony-misc.make2
-rw-r--r--rules/xorg-font-sun-misc.make2
-rw-r--r--rules/xorg-font-util.make2
-rw-r--r--rules/xorg-font-winitzki-cyrillic.make2
-rw-r--r--rules/xorg-font-xfree86-type1.make2
-rw-r--r--rules/xorg-lib-FS.make2
-rw-r--r--rules/xorg-lib-ICE.make2
-rw-r--r--rules/xorg-lib-SM.make2
-rw-r--r--rules/xorg-lib-WindowsWM.make2
-rw-r--r--rules/xorg-lib-X11.make2
-rw-r--r--rules/xorg-lib-XScrnSaver.make2
-rw-r--r--rules/xorg-lib-Xau.make2
-rw-r--r--rules/xorg-lib-Xaw.make2
-rw-r--r--rules/xorg-lib-Xcomposite.make2
-rw-r--r--rules/xorg-lib-Xcursor.make2
-rw-r--r--rules/xorg-lib-Xdamage.make2
-rw-r--r--rules/xorg-lib-Xdmcp.make2
-rw-r--r--rules/xorg-lib-Xevie.make2
-rw-r--r--rules/xorg-lib-Xext.make2
-rw-r--r--rules/xorg-lib-Xfixes.make2
-rw-r--r--rules/xorg-lib-Xfont.make2
-rw-r--r--rules/xorg-lib-Xft.make2
-rw-r--r--rules/xorg-lib-Xi.make2
-rw-r--r--rules/xorg-lib-Xinerama.make2
-rw-r--r--rules/xorg-lib-Xmu.make2
-rw-r--r--rules/xorg-lib-Xp.make2
-rw-r--r--rules/xorg-lib-Xpm.make2
-rw-r--r--rules/xorg-lib-XprintAppUtil.make2
-rw-r--r--rules/xorg-lib-XprintUtil.make2
-rw-r--r--rules/xorg-lib-Xrandr.make2
-rw-r--r--rules/xorg-lib-Xrender.make2
-rw-r--r--rules/xorg-lib-Xres.make2
-rw-r--r--rules/xorg-lib-Xt.make2
-rw-r--r--rules/xorg-lib-Xtst.make2
-rw-r--r--rules/xorg-lib-Xv.make2
-rw-r--r--rules/xorg-lib-XvMC.make2
-rw-r--r--rules/xorg-lib-Xxf86dga.make2
-rw-r--r--rules/xorg-lib-Xxf86misc.make2
-rw-r--r--rules/xorg-lib-Xxf86vm.make2
-rw-r--r--rules/xorg-lib-dmx.make2
-rw-r--r--rules/xorg-lib-fontenc.make2
-rw-r--r--rules/xorg-lib-oldX.make2
-rw-r--r--rules/xorg-lib-xkbfile.make2
-rw-r--r--rules/xorg-lib-xkbui.make2
-rw-r--r--rules/xorg-lib-xtrans.make2
-rw-r--r--rules/xorg-proto-bigreqs.make2
-rw-r--r--rules/xorg-proto-composite.make2
-rw-r--r--rules/xorg-proto-damage.make2
-rw-r--r--rules/xorg-proto-dmx.make2
-rw-r--r--rules/xorg-proto-evieext.make2
-rw-r--r--rules/xorg-proto-fixes.make2
-rw-r--r--rules/xorg-proto-fonts.make2
-rw-r--r--rules/xorg-proto-gl.make2
-rw-r--r--rules/xorg-proto-input.make2
-rw-r--r--rules/xorg-proto-kb.make2
-rw-r--r--rules/xorg-proto-print.make2
-rw-r--r--rules/xorg-proto-randr.make2
-rw-r--r--rules/xorg-proto-record.make2
-rw-r--r--rules/xorg-proto-render.make2
-rw-r--r--rules/xorg-proto-resource.make2
-rw-r--r--rules/xorg-proto-scrnsaver.make2
-rw-r--r--rules/xorg-proto-video.make2
-rw-r--r--rules/xorg-proto-windowswm.make2
-rw-r--r--rules/xorg-proto-x.make2
-rw-r--r--rules/xorg-proto-xcmisc.make2
-rw-r--r--rules/xorg-proto-xext.make2
-rw-r--r--rules/xorg-proto-xf86bigfont.make2
-rw-r--r--rules/xorg-proto-xf86dga.make2
-rw-r--r--rules/xorg-proto-xf86dri.make2
-rw-r--r--rules/xorg-proto-xf86misc.make2
-rw-r--r--rules/xorg-proto-xf86vidmode.make2
-rw-r--r--rules/xorg-proto-xinerama.make2
-rw-r--r--rules/xorg-server.make2
273 files changed, 281 insertions, 281 deletions
diff --git a/rules/argtable2.make b/rules/argtable2.make
index ebae2fb82..124d37b80 100644
--- a/rules/argtable2.make
+++ b/rules/argtable2.make
@@ -21,7 +21,7 @@ ARGTABLE2_VERSION := 12
ARGTABLE2_MD5 := 291e249ea60f4d0637e467356a8ae41a
ARGTABLE2 := argtable2-$(ARGTABLE2_VERSION)
ARGTABLE2_SUFFIX := tar.gz
-ARGTABLE2_URL := $(PTXCONF_SETUP_SFMIRROR)/argtable/$(ARGTABLE2).$(ARGTABLE2_SUFFIX)
+ARGTABLE2_URL := $(call ptx/mirror, SF, argtable/$(ARGTABLE2).$(ARGTABLE2_SUFFIX))
ARGTABLE2_SOURCE := $(SRCDIR)/$(ARGTABLE2).$(ARGTABLE2_SUFFIX)
ARGTABLE2_DIR := $(BUILDDIR)/$(ARGTABLE2)
diff --git a/rules/at.make b/rules/at.make
index 1944ab53b..aa97136fd 100644
--- a/rules/at.make
+++ b/rules/at.make
@@ -21,7 +21,7 @@ AT_MD5 := 1e67991776148fb319fd77a2e599a765
AT_SUFFIX := tar.gz
AT := at-$(AT_VERSION)
AT_TARBALL := at_$(AT_VERSION).orig.$(AT_SUFFIX)
-AT_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/a/at/$(AT_TARBALL)
+AT_URL := $(call ptx/mirror, DEB, pool/main/a/at/$(AT_TARBALL))
AT_SOURCE := $(SRCDIR)/$(AT_TARBALL)
AT_DIR := $(BUILDDIR)/$(AT)
AT_LICENSE := unknown
diff --git a/rules/bash.make b/rules/bash.make
index 9e8facc9b..11da726f0 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -19,7 +19,7 @@ BASH_VERSION := 3.2.48
BASH_MD5 := 338dcf975a93640bb3eaa843ca42e3f8
BASH := bash-$(BASH_VERSION)
BASH_SUFFIX := tar.gz
-BASH_URL := $(PTXCONF_SETUP_GNUMIRROR)/bash/$(BASH).$(BASH_SUFFIX)
+BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
BASH_SOURCE := $(SRCDIR)/$(BASH).$(BASH_SUFFIX)
BASH_DIR := $(BUILDDIR)/$(BASH)
BASH_MAKE_PAR := NO
diff --git a/rules/bc.make b/rules/bc.make
index eadbad4e0..32b9bc492 100644
--- a/rules/bc.make
+++ b/rules/bc.make
@@ -21,7 +21,7 @@ BC_VERSION := 1.06
BC_MD5 := d44b5dddebd8a7a7309aea6c36fda117
BC := bc-$(BC_VERSION)
BC_SUFFIX := tar.gz
-BC_URL := $(PTXCONF_SETUP_GNUMIRROR)/bc/$(BC).$(BC_SUFFIX)
+BC_URL := $(call ptx/mirror, GNU, bc/$(BC).$(BC_SUFFIX))
BC_SOURCE := $(SRCDIR)/$(BC).$(BC_SUFFIX)
BC_DIR := $(BUILDDIR)/$(BC)
diff --git a/rules/binutils.make b/rules/binutils.make
index 5778b5c38..ab536921b 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -25,7 +25,7 @@ BINUTILS_MD5 := none
endif
BINUTILS := binutils-$(BINUTILS_VERSION)
BINUTILS_SUFFIX := tar.bz2
-BINUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/binutils/$(BINUTILS).$(BINUTILS_SUFFIX)
+BINUTILS_URL := $(call ptx/mirror, GNU, binutils/$(BINUTILS).$(BINUTILS_SUFFIX))
BINUTILS_SOURCE := $(SRCDIR)/$(BINUTILS).$(BINUTILS_SUFFIX)
BINUTILS_DIR := $(BUILDDIR)/$(BINUTILS)
diff --git a/rules/blackbox.make b/rules/blackbox.make
index dd72acf03..2d9d900fc 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -21,7 +21,7 @@ BLACKBOX_VERSION := 0.70.1
BLACKBOX_MD5 :=
BLACKBOX := blackbox-$(BLACKBOX_VERSION)
BLACKBOX_SUFFIX := tar.gz
-BLACKBOX_URL := $(PTXCONF_SETUP_SFMIRROR)/blackboxwm/$(BLACKBOX).$(BLACKBOX_SUFFIX)
+BLACKBOX_URL := $(call ptx/mirror, SF, blackboxwm/$(BLACKBOX).$(BLACKBOX_SUFFIX))
BLACKBOX_SOURCE := $(SRCDIR)/$(BLACKBOX).$(BLACKBOX_SUFFIX)
BLACKBOX_DIR := $(BUILDDIR)/$(BLACKBOX)
diff --git a/rules/bluez.make b/rules/bluez.make
index febbdc7da..7e4624018 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -20,7 +20,7 @@ BLUEZ_VERSION := 4.96
BLUEZ_MD5 := 296111afac49e3f9035085ac14daf518
BLUEZ := bluez-$(BLUEZ_VERSION)
BLUEZ_SUFFIX := tar.gz
-BLUEZ_URL := $(PTXCONF_SETUP_KERNELMIRROR)/bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX)
+BLUEZ_URL := $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
BLUEZ_SOURCE := $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX)
BLUEZ_DIR := $(BUILDDIR)/$(BLUEZ)
BLUEZ_LICENSE := GPLv2+ LGPLv2.1+
diff --git a/rules/boa.make b/rules/boa.make
index b5d8f0a08..26187b4cc 100644
--- a/rules/boa.make
+++ b/rules/boa.make
@@ -21,7 +21,7 @@ BOA_MD5 := e24b570bd767a124fcfb40a34d148ba9
BOA_SUFFIX := tar.gz
BOA := boa-$(BOA_VERSION)
BOA_TARBALL := boa_$(BOA_VERSION).orig.$(BOA_SUFFIX)
-BOA_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/b/boa/$(BOA_TARBALL)
+BOA_URL := $(call ptx/mirror, DEB, pool/main/b/boa/$(BOA_TARBALL))
BOA_SOURCE := $(SRCDIR)/$(BOA_TARBALL)
BOA_DIR := $(BUILDDIR)/$(BOA)
BOA_LICENSE := GPLv2
diff --git a/rules/boost.make b/rules/boost.make
index 3b57b25c5..f828bf7e0 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -21,7 +21,7 @@ BOOST_VERSION := 1_47_0
BOOST_MD5 := a2dc343f7bc7f83f8941e47ed4a18200
BOOST := boost_$(BOOST_VERSION)
BOOST_SUFFIX := tar.bz2
-BOOST_URL := $(PTXCONF_SETUP_SFMIRROR)/boost/$(BOOST).$(BOOST_SUFFIX)
+BOOST_URL := $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX))
BOOST_SOURCE := $(SRCDIR)/$(BOOST).$(BOOST_SUFFIX)
BOOST_DIR := $(BUILDDIR)/$(BOOST)
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index fca665661..72d2c33e2 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -21,7 +21,7 @@ BRIDGE_UTILS_VERSION := 1.5
BRIDGE_UTILS_MD5 := ec7b381160b340648dede58c31bb2238
BRIDGE_UTILS := bridge-utils-$(BRIDGE_UTILS_VERSION)
BRIDGE_UTILS_SUFFIX := tar.gz
-BRIDGE_UTILS_URL := $(PTXCONF_SETUP_SFMIRROR)/bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
+BRIDGE_UTILS_URL := $(call ptx/mirror, SF, bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX))
BRIDGE_UTILS_SOURCE := $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
BRIDGE_UTILS_DIR := $(BUILDDIR)/$(BRIDGE_UTILS)
diff --git a/rules/classpath.make b/rules/classpath.make
index 0e4490801..1cb47f2a1 100644
--- a/rules/classpath.make
+++ b/rules/classpath.make
@@ -28,7 +28,7 @@ CLASSPATH_VERSION := 0.98
CLASSPATH_MD5 := 90c6571b8b0309e372faa0f9f6255ea9
CLASSPATH := classpath-$(CLASSPATH_VERSION)
CLASSPATH_SUFFIX := tar.gz
-CLASSPATH_URL := $(PTXCONF_SETUP_GNUMIRROR)/classpath/$(CLASSPATH).$(CLASSPATH_SUFFIX)
+CLASSPATH_URL := $(call ptx/mirror, GNU, classpath/$(CLASSPATH).$(CLASSPATH_SUFFIX))
CLASSPATH_SOURCE := $(SRCDIR)/$(CLASSPATH).$(CLASSPATH_SUFFIX)
CLASSPATH_DIR := $(BUILDDIR)/$(CLASSPATH)
diff --git a/rules/connman.make b/rules/connman.make
index 7ef72cb32..0c1afe06d 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -20,7 +20,7 @@ CONNMAN_VERSION := 0.77
CONNMAN_MD5 := 2e95edb0ead4fff3e84458f7fa192a64
CONNMAN := connman-$(CONNMAN_VERSION)
CONNMAN_SUFFIX := tar.gz
-CONNMAN_URL := $(PTXCONF_SETUP_KERNELMIRROR)/network/connman/$(CONNMAN).$(CONNMAN_SUFFIX)
+CONNMAN_URL := $(call ptx/mirror, KERNEL, network/connman/$(CONNMAN).$(CONNMAN_SUFFIX))
CONNMAN_SOURCE := $(SRCDIR)/$(CONNMAN).$(CONNMAN_SUFFIX)
CONNMAN_DIR := $(BUILDDIR)/$(CONNMAN)
diff --git a/rules/coreutils.make b/rules/coreutils.make
index f7ad11122..e17c9159d 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_COREUTILS) += coreutils
COREUTILS_VERSION := 8.5
COREUTILS_MD5 := c1ffe586d001e87d66cd80c4536ee823
COREUTILS := coreutils-$(COREUTILS_VERSION)
-COREUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/coreutils/$(COREUTILS).tar.gz
+COREUTILS_URL := $(call ptx/mirror, GNU, coreutils/$(COREUTILS).tar.gz)
COREUTILS_SOURCE := $(SRCDIR)/$(COREUTILS).tar.gz
COREUTILS_DIR := $(BUILDDIR)/$(COREUTILS)
COREUTILS_LICENSE := GPLv3
diff --git a/rules/cppunit.make b/rules/cppunit.make
index 875b32267..2bab53c87 100644
--- a/rules/cppunit.make
+++ b/rules/cppunit.make
@@ -21,7 +21,7 @@ CPPUNIT_VERSION := 1.12.1
CPPUNIT_MD5 := bd30e9cf5523cdfc019b94f5e1d7fd19
CPPUNIT := cppunit-$(CPPUNIT_VERSION)
CPPUNIT_SUFFIX := tar.gz
-CPPUNIT_URL := $(PTXCONF_SETUP_SFMIRROR)/cppunit/$(CPPUNIT).$(CPPUNIT_SUFFIX)
+CPPUNIT_URL := $(call ptx/mirror, SF, cppunit/$(CPPUNIT).$(CPPUNIT_SUFFIX))
CPPUNIT_SOURCE := $(SRCDIR)/$(CPPUNIT).$(CPPUNIT_SUFFIX)
CPPUNIT_DIR := $(BUILDDIR)/$(CPPUNIT)
diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make
index 1694aff58..33f3f013b 100644
--- a/rules/cpufrequtils.make
+++ b/rules/cpufrequtils.make
@@ -20,7 +20,7 @@ CPUFREQUTILS_VERSION := 007
CPUFREQUTILS_MD5 := fdd833ce70a9ae40ae8bce5b18f2becf
CPUFREQUTILS := cpufrequtils-$(CPUFREQUTILS_VERSION)
CPUFREQUTILS_SUFFIX := tar.bz2
-CPUFREQUTILS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/kernel/cpufreq/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX)
+CPUFREQUTILS_URL := $(call ptx/mirror, KERNEL, utils/kernel/cpufreq/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX))
CPUFREQUTILS_SOURCE := $(SRCDIR)/$(CPUFREQUTILS).$(CPUFREQUTILS_SUFFIX)
CPUFREQUTILS_DIR := $(BUILDDIR)/$(CPUFREQUTILS)
diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make
index 9deab522b..673923f96 100644
--- a/rules/cross-nasm.make
+++ b/rules/cross-nasm.make
@@ -21,7 +21,7 @@ CROSS_NASM_VERSION := 2.07
CROSS_NASM_MD5 := d8934231e81874c29374ddef1fbdb1ed
CROSS_NASM := nasm-$(CROSS_NASM_VERSION)
CROSS_NASM_SUFFIX := tar.bz2
-CROSS_NASM_URL := $(PTXCONF_SETUP_SFMIRROR)/nasm/$(CROSS_NASM).$(CROSS_NASM_SUFFIX)
+CROSS_NASM_URL := $(call ptx/mirror, SF, nasm/$(CROSS_NASM).$(CROSS_NASM_SUFFIX))
CROSS_NASM_SOURCE := $(SRCDIR)/$(CROSS_NASM).$(CROSS_NASM_SUFFIX)
CROSS_NASM_DIR := $(CROSS_BUILDDIR)/$(CROSS_NASM)
diff --git a/rules/diffutils.make b/rules/diffutils.make
index 75bbbaa73..ac7380d4f 100644
--- a/rules/diffutils.make
+++ b/rules/diffutils.make
@@ -20,7 +20,7 @@ DIFFUTILS_VERSION := 2.8.1
DIFFUTILS_MD5 := 71f9c5ae19b60608f6c7f162da86a428
DIFFUTILS := diffutils-$(DIFFUTILS_VERSION)
DIFFUTILS_SUFFIX := tar.gz
-DIFFUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/diffutils/$(DIFFUTILS).$(DIFFUTILS_SUFFIX)
+DIFFUTILS_URL := $(call ptx/mirror, GNU, diffutils/$(DIFFUTILS).$(DIFFUTILS_SUFFIX))
DIFFUTILS_SOURCE := $(SRCDIR)/$(DIFFUTILS).$(DIFFUTILS_SUFFIX)
DIFFUTILS_DIR := $(BUILDDIR)/$(DIFFUTILS)
diff --git a/rules/dri2proto.make b/rules/dri2proto.make
index af7d21425..694bd68c6 100644
--- a/rules/dri2proto.make
+++ b/rules/dri2proto.make
@@ -21,7 +21,7 @@ DRI2PROTO_VERSION := 2.3
DRI2PROTO_MD5 := 3407b494d5e90d584c9af52aa8f9f028
DRI2PROTO := dri2proto-$(DRI2PROTO_VERSION)
DRI2PROTO_SUFFIX := tar.bz2
-DRI2PROTO_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(DRI2PROTO).$(DRI2PROTO_SUFFIX)
+DRI2PROTO_URL := $(call ptx/mirror, XORG, individual/proto/$(DRI2PROTO).$(DRI2PROTO_SUFFIX))
DRI2PROTO_SOURCE := $(SRCDIR)/$(DRI2PROTO).$(DRI2PROTO_SUFFIX)
DRI2PROTO_DIR := $(BUILDDIR)/$(DRI2PROTO)
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 3c4970a47..c24bd2773 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -21,7 +21,7 @@ E2FSPROGS_VERSION := 1.41.14
E2FSPROGS_MD5 := 05f70470aea2ef7efbb0845b2b116720
E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_SUFFIX := tar.gz
-E2FSPROGS_URL := $(PTXCONF_SETUP_SFMIRROR)/e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
+E2FSPROGS_URL := $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
E2FSPROGS_SOURCE := $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
E2FSPROGS_DIR := $(BUILDDIR)/$(E2FSPROGS)
diff --git a/rules/etherwake.make b/rules/etherwake.make
index 298652b5e..af02c79b3 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -22,7 +22,7 @@ ETHERWAKE_MD5 := 628e8b2a28d47f262e4c26c989402a59
ETHERWAKE_SUFFIX := tar.gz
ETHERWAKE := etherwake-$(ETHERWAKE_VERSION).orig
ETHERWAKE_TARBALL := etherwake_$(ETHERWAKE_VERSION).orig.$(ETHERWAKE_SUFFIX)
-ETHERWAKE_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/e/etherwake/$(ETHERWAKE_TARBALL)
+ETHERWAKE_URL := $(call ptx/mirror, DEB, pool/main/e/etherwake/$(ETHERWAKE_TARBALL))
ETHERWAKE_SOURCE := $(SRCDIR)/$(ETHERWAKE_TARBALL)
ETHERWAKE_DIR := $(BUILDDIR)/$(ETHERWAKE)
ETHERWAKE_LICENSE := GPL
diff --git a/rules/ethtool.make b/rules/ethtool.make
index fcb56e402..d52574a52 100644
--- a/rules/ethtool.make
+++ b/rules/ethtool.make
@@ -21,7 +21,7 @@ ETHTOOL_VERSION := 3.0
ETHTOOL_MD5 := cb129398cbbf39859901b55ecac101da
ETHTOOL_SUFFIX := tar.bz2
ETHTOOL := ethtool-$(ETHTOOL_VERSION)
-ETHTOOL_URL := $(PTXCONF_SETUP_KERNELMIRROR)/../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)
+ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX))
ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX)
ETHTOOL_DIR := $(BUILDDIR)/$(ETHTOOL)
diff --git a/rules/findutils.make b/rules/findutils.make
index c5dc2ef5e..4a6032cb2 100644
--- a/rules/findutils.make
+++ b/rules/findutils.make
@@ -21,7 +21,7 @@ FINDUTILS_VERSION := 4.2.23
FINDUTILS_MD5 := ecaff8b060e8d69c10eb2391a8032e26
FINDUTILS := findutils-$(FINDUTILS_VERSION)
FINDUTILS_SUFFIX := tar.gz
-FINDUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/findutils/$(FINDUTILS).$(FINDUTILS_SUFFIX)
+FINDUTILS_URL := $(call ptx/mirror, GNU, findutils/$(FINDUTILS).$(FINDUTILS_SUFFIX))
FINDUTILS_SOURCE := $(SRCDIR)/$(FINDUTILS).$(FINDUTILS_SUFFIX)
FINDUTILS_DIR := $(BUILDDIR)/$(FINDUTILS)
diff --git a/rules/flac.make b/rules/flac.make
index 854c9d280..5a3f08db4 100644
--- a/rules/flac.make
+++ b/rules/flac.make
@@ -20,7 +20,7 @@ FLAC_VERSION := 1.2.1
FLAC_MD5 := 153c8b15a54da428d1f0fadc756c22c7
FLAC := flac-$(FLAC_VERSION)
FLAC_SUFFIX := tar.gz
-FLAC_URL := $(PTXCONF_SETUP_SFMIRROR)/flac/$(FLAC).$(FLAC_SUFFIX)
+FLAC_URL := $(call ptx/mirror, SF, flac/$(FLAC).$(FLAC_SUFFIX))
FLAC_SOURCE := $(SRCDIR)/$(FLAC).$(FLAC_SUFFIX)
FLAC_DIR := $(BUILDDIR)/$(FLAC)
FLAC_LICENSE := unknown
diff --git a/rules/flex.make b/rules/flex.make
index d94301ef0..851ebb9c2 100644
--- a/rules/flex.make
+++ b/rules/flex.make
@@ -20,7 +20,7 @@ FLEX_VERSION := 2.5.35
FLEX_MD5 := 10714e50cea54dc7a227e3eddcd44d57
FLEX := flex-$(FLEX_VERSION)
FLEX_SUFFIX := tar.bz2
-FLEX_URL := $(PTXCONF_SETUP_SFMIRROR)/flex/$(FLEX).$(FLEX_SUFFIX)
+FLEX_URL := $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
FLEX_SOURCE := $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
FLEX_DIR := $(BUILDDIR)/$(FLEX)
FLEX_LICENSE := unknown
diff --git a/rules/fluxbox.make b/rules/fluxbox.make
index 48af34045..c00e4d022 100644
--- a/rules/fluxbox.make
+++ b/rules/fluxbox.make
@@ -20,7 +20,7 @@ FLUXBOX_VERSION := 1.3.2
FLUXBOX_MD5 := f95b0bdb9ee41bfac124bd0fc601f248
FLUXBOX := fluxbox-$(FLUXBOX_VERSION)
FLUXBOX_SUFFIX := tar.bz2
-FLUXBOX_URL := $(PTXCONF_SETUP_SFMIRROR)/fluxbox/$(FLUXBOX).$(FLUXBOX_SUFFIX)
+FLUXBOX_URL := $(call ptx/mirror, SF, fluxbox/$(FLUXBOX).$(FLUXBOX_SUFFIX))
FLUXBOX_SOURCE := $(SRCDIR)/$(FLUXBOX).$(FLUXBOX_SUFFIX)
FLUXBOX_DIR := $(BUILDDIR)/$(FLUXBOX)
FLUXBOX_LICENSE := unknown
diff --git a/rules/freeglut.make b/rules/freeglut.make
index ccf2c2950..3ed0d040a 100644
--- a/rules/freeglut.make
+++ b/rules/freeglut.make
@@ -20,7 +20,7 @@ FREEGLUT_VERSION := 2.6.0
FREEGLUT_MD5 := 39f0f2de89f399529d2b981188082218
FREEGLUT := freeglut-$(FREEGLUT_VERSION)
FREEGLUT_SUFFIX := tar.gz
-FREEGLUT_URL := $(PTXCONF_SETUP_SFMIRROR)/freeglut/$(FREEGLUT).$(FREEGLUT_SUFFIX)
+FREEGLUT_URL := $(call ptx/mirror, SF, freeglut/$(FREEGLUT).$(FREEGLUT_SUFFIX))
FREEGLUT_SOURCE := $(SRCDIR)/$(FREEGLUT).$(FREEGLUT_SUFFIX)
FREEGLUT_DIR := $(BUILDDIR)/$(FREEGLUT)
FREEGLUT_LICENSE := unknown
diff --git a/rules/fuse.make b/rules/fuse.make
index 53871e0fb..c592496ef 100644
--- a/rules/fuse.make
+++ b/rules/fuse.make
@@ -20,7 +20,7 @@ FUSE_VERSION := 2.7.4
FUSE_MD5 := 4879f06570d2225667534c37fea04213
FUSE := fuse-$(FUSE_VERSION)
FUSE_SUFFIX := tar.gz
-FUSE_URL := $(PTXCONF_SETUP_SFMIRROR)/fuse/$(FUSE).$(FUSE_SUFFIX)
+FUSE_URL := $(call ptx/mirror, SF, fuse/$(FUSE).$(FUSE_SUFFIX))
FUSE_SOURCE := $(SRCDIR)/$(FUSE).$(FUSE_SUFFIX)
FUSE_DIR := $(BUILDDIR)/$(FUSE)
diff --git a/rules/gawk.make b/rules/gawk.make
index c2cc40482..312e784cb 100644
--- a/rules/gawk.make
+++ b/rules/gawk.make
@@ -20,7 +20,7 @@ GAWK_VERSION := 3.1.6
GAWK_MD5 := b237751aef53c9ead9644e376bc53386
GAWK := gawk-$(GAWK_VERSION)
GAWK_SUFFIX := tar.gz
-GAWK_URL := $(PTXCONF_SETUP_GNUMIRROR)/gawk/$(GAWK).$(GAWK_SUFFIX)
+GAWK_URL := $(call ptx/mirror, GNU, gawk/$(GAWK).$(GAWK_SUFFIX))
GAWK_SOURCE := $(SRCDIR)/$(GAWK).$(GAWK_SUFFIX)
GAWK_DIR := $(BUILDDIR)/$(GAWK)
diff --git a/rules/gdb.make b/rules/gdb.make
index e869717aa..3b1731711 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -28,7 +28,7 @@ GDB_BUILDDIR := $(BUILDDIR)/$(GDB)-build
GDB_LICENSE := GPLv3+
GDB_URL := \
- $(PTXCONF_SETUP_GNUMIRROR)/gdb/$(GDB).$(GDB_SUFFIX) \
+ $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \
ftp://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX)
# ----------------------------------------------------------------------------
diff --git a/rules/gettext.make b/rules/gettext.make
index 435b11e8c..b9076dd70 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -22,7 +22,7 @@ GETTEXT_VERSION := 0.18.1
GETTEXT_MD5 := 2ae04f960d5fa03774636ddef19ebdbf
GETTEXT := gettext-$(GETTEXT_VERSION)
GETTEXT_SUFFIX := tar.gz
-GETTEXT_URL := $(PTXCONF_SETUP_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX)
+GETTEXT_URL := $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX))
GETTEXT_SOURCE := $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX)
GETTEXT_DIR := $(BUILDDIR)/$(GETTEXT)
diff --git a/rules/glew.make b/rules/glew.make
index 567f5f479..a03545603 100644
--- a/rules/glew.make
+++ b/rules/glew.make
@@ -20,7 +20,7 @@ GLEW_VERSION := 1.5.2
GLEW_MD5 := 310916d887253dc9f4be6ab13501603a
GLEW := glew-$(GLEW_VERSION)
GLEW_SUFFIX := tgz
-GLEW_URL := $(PTXCONF_SETUP_SFMIRROR)/glew/$(GLEW_VERSION)/$(GLEW).$(GLEW_SUFFIX)
+GLEW_URL := $(call ptx/mirror, SF, glew/$(GLEW_VERSION)/$(GLEW).$(GLEW_SUFFIX))
GLEW_SOURCE := $(SRCDIR)/$(GLEW).$(GLEW_SUFFIX)
GLEW_DIR := $(BUILDDIR)/$(GLEW)
GLEW_LICENSE := unknown
diff --git a/rules/gmake.make b/rules/gmake.make
index fc5529476..39ceec8cf 100644
--- a/rules/gmake.make
+++ b/rules/gmake.make
@@ -20,7 +20,7 @@ GMAKE_VERSION := 3.81
GMAKE_MD5 := 354853e0b2da90c527e35aabb8d6f1e6
GMAKE := make-$(GMAKE_VERSION)
GMAKE_SUFFIX := tar.bz2
-GMAKE_URL := $(PTXCONF_SETUP_GNUMIRROR)/make/$(GMAKE).$(GMAKE_SUFFIX)
+GMAKE_URL := $(call ptx/mirror, GNU, make/$(GMAKE).$(GMAKE_SUFFIX))
GMAKE_SOURCE := $(SRCDIR)/$(GMAKE).$(GMAKE_SUFFIX)
GMAKE_DIR := $(BUILDDIR)/$(GMAKE)
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 896087cf0..099d7d083 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -20,7 +20,7 @@ GNUPLOT_VERSION := 4.4.3
GNUPLOT_MD5 := 639603752996f4923bc02c895fa03b45
GNUPLOT := gnuplot-$(GNUPLOT_VERSION)
GNUPLOT_SUFFIX := tar.gz
-GNUPLOT_URL := $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
+GNUPLOT_URL := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX))
GNUPLOT_SOURCE := $(SRCDIR)/$(GNUPLOT).$(GNUPLOT_SUFFIX)
GNUPLOT_DIR := $(BUILDDIR)/$(GNUPLOT)
diff --git a/rules/grep.make b/rules/grep.make
index 30945dca7..68124aab8 100644
--- a/rules/grep.make
+++ b/rules/grep.make
@@ -21,7 +21,7 @@ GREP_VERSION := 2.5.3
GREP_MD5 := 27061ce1fde82876970b6549a156da8b
GREP := grep-$(GREP_VERSION)
GREP_SUFFIX := tar.bz2
-GREP_URL := $(PTXCONF_SETUP_GNUMIRROR)/grep/$(GREP).$(GREP_SUFFIX)
+GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX))
GREP_SOURCE := $(SRCDIR)/$(GREP).$(GREP_SUFFIX)
GREP_DIR := $(BUILDDIR)/$(GREP)
diff --git a/rules/haserl.make b/rules/haserl.make
index 8e3c576fb..bdbead0d4 100644
--- a/rules/haserl.make
+++ b/rules/haserl.make
@@ -21,7 +21,7 @@ HASERL_VERSION := 0.9.26
HASERL_MD5 := 8cd64e591209751a062ad4e08f1d10dd
HASERL := haserl-$(HASERL_VERSION)
HASERL_SUFFIX := tar.gz
-HASERL_URL := $(PTXCONF_SETUP_SFMIRROR)/haserl/$(HASERL).$(HASERL_SUFFIX)
+HASERL_URL := $(call ptx/mirror, SF, haserl/$(HASERL).$(HASERL_SUFFIX))
HASERL_SOURCE := $(SRCDIR)/$(HASERL).$(HASERL_SUFFIX)
HASERL_DIR := $(BUILDDIR)/$(HASERL)
diff --git a/rules/hdparm.make b/rules/hdparm.make
index bb2ed83f7..80c3dc209 100644
--- a/rules/hdparm.make
+++ b/rules/hdparm.make
@@ -21,7 +21,7 @@ HDPARM_VERSION := 9.28
HDPARM_MD5 := b672d175bbf924b3f7575a8279eb063d
HDPARM := hdparm-$(HDPARM_VERSION)
HDPARM_SUFFIX := tar.gz
-HDPARM_URL := $(PTXCONF_SETUP_SFMIRROR)/hdparm/$(HDPARM).$(HDPARM_SUFFIX)
+HDPARM_URL := $(call ptx/mirror, SF, hdparm/$(HDPARM).$(HDPARM_SUFFIX))
HDPARM_SOURCE := $(SRCDIR)/$(HDPARM).$(HDPARM_SUFFIX)
HDPARM_DIR := $(BUILDDIR)/$(HDPARM)
diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make
index ccde9a6a9..a0c365cb7 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -20,7 +20,7 @@ HOST_AUTOTOOLS_AUTOCONF_VERSION := 2.68
HOST_AUTOTOOLS_AUTOCONF_MD5 := 864d785215aa60d627c91fcb21b05b07
HOST_AUTOTOOLS_AUTOCONF := autoconf-$(HOST_AUTOTOOLS_AUTOCONF_VERSION)
HOST_AUTOTOOLS_AUTOCONF_SUFFIX := tar.bz2
-HOST_AUTOTOOLS_AUTOCONF_URL := $(PTXCONF_SETUP_GNUMIRROR)/autoconf/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX)
+HOST_AUTOTOOLS_AUTOCONF_URL := $(call ptx/mirror, GNU, autoconf/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX))
HOST_AUTOTOOLS_AUTOCONF_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX)
HOST_AUTOTOOLS_AUTOCONF_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_AUTOCONF)
HOST_AUTOTOOLS_AUTOCONF_DEVPKG := NO
diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make
index baa737e84..1ca514cdb 100644
--- a/rules/host-autotools-automake.make
+++ b/rules/host-autotools-automake.make
@@ -20,7 +20,7 @@ HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.11.1
HOST_AUTOTOOLS_AUTOMAKE_MD5 := c2972c4d9b3e29c03d5f2af86249876f
HOST_AUTOTOOLS_AUTOMAKE := automake-$(HOST_AUTOTOOLS_AUTOMAKE_VERSION)
HOST_AUTOTOOLS_AUTOMAKE_SUFFIX := tar.bz2
-HOST_AUTOTOOLS_AUTOMAKE_URL := $(PTXCONF_SETUP_GNUMIRROR)/automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX)
+HOST_AUTOTOOLS_AUTOMAKE_URL := $(call ptx/mirror, GNU, automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX))
HOST_AUTOTOOLS_AUTOMAKE_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX)
HOST_AUTOTOOLS_AUTOMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_AUTOMAKE)
HOST_AUTOTOOLS_AUTOMAKE_DEVPKG := NO
diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make
index 330b5fceb..e766660c2 100644
--- a/rules/host-autotools-libtool.make
+++ b/rules/host-autotools-libtool.make
@@ -20,7 +20,7 @@ HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.2
HOST_AUTOTOOLS_LIBTOOL_MD5 := d2f3b7d4627e69e13514a40e72a24d50
HOST_AUTOTOOLS_LIBTOOL := libtool-$(HOST_AUTOTOOLS_LIBTOOL_VERSION)
HOST_AUTOTOOLS_LIBTOOL_SUFFIX := tar.gz
-HOST_AUTOTOOLS_LIBTOOL_URL := $(PTXCONF_SETUP_GNUMIRROR)/libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX)
+HOST_AUTOTOOLS_LIBTOOL_URL := $(call ptx/mirror, GNU, libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX))
HOST_AUTOTOOLS_LIBTOOL_SOURCE := $(SRCDIR)/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX)
HOST_AUTOTOOLS_LIBTOOL_DIR := $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_LIBTOOL)
HOST_AUTOTOOLS_LIBTOOL_DEVPKG := NO
diff --git a/rules/host-cramfs.make b/rules/host-cramfs.make
index 1c247faa2..fc78e6738 100644
--- a/rules/host-cramfs.make
+++ b/rules/host-cramfs.make
@@ -21,7 +21,7 @@ HOST_CRAMFS_VERSION := 1.1
HOST_CRAMFS_MD5 := d3912b9f7bf745fbfea68f6a9b9de30f
HOST_CRAMFS := cramfs-$(HOST_CRAMFS_VERSION)
HOST_CRAMFS_SUFFIX := tar.gz
-HOST_CRAMFS_URL := $(PTXCONF_SETUP_SFMIRROR)/cramfs/$(HOST_CRAMFS).$(HOST_CRAMFS_SUFFIX)
+HOST_CRAMFS_URL := $(call ptx/mirror, SF, cramfs/$(HOST_CRAMFS).$(HOST_CRAMFS_SUFFIX))
HOST_CRAMFS_SOURCE := $(SRCDIR)/$(HOST_CRAMFS).$(HOST_CRAMFS_SUFFIX)
HOST_CRAMFS_DIR := $(HOST_BUILDDIR)/$(HOST_CRAMFS)
diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
index e31cb31bb..2947bb177 100644
--- a/rules/host-fakeroot.make
+++ b/rules/host-fakeroot.make
@@ -22,7 +22,7 @@ HOST_FAKEROOT_MD5 := bea628be77838aaa7323a2f7601c2d7e
HOST_FAKEROOT_SUFFIX := tar.bz2
HOST_FAKEROOT := fakeroot-$(HOST_FAKEROOT_VERSION)
HOST_FAKEROOT_TARBALL := fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_SUFFIX)
-HOST_FAKEROOT_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
+HOST_FAKEROOT_URL := $(call ptx/mirror, DEB, pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL))
HOST_FAKEROOT_SOURCE := $(SRCDIR)/$(HOST_FAKEROOT_TARBALL)
HOST_FAKEROOT_DIR := $(HOST_BUILDDIR)/$(HOST_FAKEROOT)
diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make
index b1f28ef10..0d52a9dc8 100644
--- a/rules/host-genext2fs.make
+++ b/rules/host-genext2fs.make
@@ -22,7 +22,7 @@ HOST_GENEXT2FS_VERSION := 1.4.1
HOST_GENEXT2FS_MD5 := b7b6361bcce2cedff1ae437fadafe53b
HOST_GENEXT2FS := genext2fs-$(HOST_GENEXT2FS_VERSION)
HOST_GENEXT2FS_SUFFIX := tar.gz
-HOST_GENEXT2FS_URL := $(PTXCONF_SETUP_SFMIRROR)/genext2fs/$(HOST_GENEXT2FS).$(HOST_GENEXT2FS_SUFFIX)
+HOST_GENEXT2FS_URL := $(call ptx/mirror, SF, genext2fs/$(HOST_GENEXT2FS).$(HOST_GENEXT2FS_SUFFIX))
HOST_GENEXT2FS_SOURCE := $(SRCDIR)/$(HOST_GENEXT2FS).$(HOST_GENEXT2FS_SUFFIX)
HOST_GENEXT2FS_DIR := $(HOST_BUILDDIR)/$(HOST_GENEXT2FS)
diff --git a/rules/host-gperf.make b/rules/host-gperf.make
index 03bc37584..3cf586191 100644
--- a/rules/host-gperf.make
+++ b/rules/host-gperf.make
@@ -20,7 +20,7 @@ HOST_GPERF_VERSION := 3.0.4
HOST_GPERF_MD5 := c1f1db32fb6598d6a93e6e88796a8632
HOST_GPERF := gperf-$(HOST_GPERF_VERSION)
HOST_GPERF_SUFFIX := tar.gz
-HOST_GPERF_URL := $(PTXCONF_SETUP_GNUMIRROR)/gperf/$(HOST_GPERF).$(HOST_GPERF_SUFFIX)
+HOST_GPERF_URL := $(call ptx/mirror, GNU, gperf/$(HOST_GPERF).$(HOST_GPERF_SUFFIX))
HOST_GPERF_SOURCE := $(SRCDIR)/$(HOST_GPERF).$(HOST_GPERF_SUFFIX)
HOST_GPERF_DIR := $(HOST_BUILDDIR)/$(HOST_GPERF)
diff --git a/rules/host-libiconv.make b/rules/host-libiconv.make
index 0e81214d5..ae13e2b36 100644
--- a/rules/host-libiconv.make
+++ b/rules/host-libiconv.make
@@ -21,7 +21,7 @@ HOST_LIBICONV_VERSION := 1.13.1
HOST_LIBICONV_MD5 := 7ab33ebd26687c744a37264a330bbe9a
HOST_LIBICONV := libiconv-$(HOST_LIBICONV_VERSION)
HOST_LIBICONV_SUFFIX := tar.gz
-HOST_LIBICONV_URL := $(PTXCONF_SETUP_GNUMIRROR)/libiconv/$(HOST_LIBICONV).$(HOST_LIBICONV_SUFFIX)
+HOST_LIBICONV_URL := $(call ptx/mirror, GNU, libiconv/$(HOST_LIBICONV).$(HOST_LIBICONV_SUFFIX))
HOST_LIBICONV_SOURCE := $(SRCDIR)/$(HOST_LIBICONV).$(HOST_LIBICONV_SUFFIX)
HOST_LIBICONV_DIR := $(HOST_BUILDDIR)/$(HOST_LIBICONV)
diff --git a/rules/host-makedepend.make b/rules/host-makedepend.make
index 26c299e7c..b75029458 100644
--- a/rules/host-makedepend.make
+++ b/rules/host-makedepend.make
@@ -20,7 +20,7 @@ HOST_MAKEDEPEND_VERSION := 1.0.2
HOST_MAKEDEPEND_MD5 := 62e58330fe8d1e3e28c7a45779833a48
HOST_MAKEDEPEND := makedepend-$(HOST_MAKEDEPEND_VERSION)
HOST_MAKEDEPEND_SUFFIX := tar.bz2
-HOST_MAKEDEPEND_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/util/$(HOST_MAKEDEPEND).$(HOST_MAKEDEPEND_SUFFIX)
+HOST_MAKEDEPEND_URL := $(call ptx/mirror, XORG, individual/util/$(HOST_MAKEDEPEND).$(HOST_MAKEDEPEND_SUFFIX))
HOST_MAKEDEPEND_SOURCE := $(SRCDIR)/$(HOST_MAKEDEPEND).$(HOST_MAKEDEPEND_SUFFIX)
HOST_MAKEDEPEND_DIR := $(HOST_BUILDDIR)/$(HOST_MAKEDEPEND)
diff --git a/rules/host-mtools.make b/rules/host-mtools.make
index 80a2d1867..d83655891 100644
--- a/rules/host-mtools.make
+++ b/rules/host-mtools.make
@@ -20,7 +20,7 @@ HOST_MTOOLS_VERSION := 4.0.16
HOST_MTOOLS_MD5 := e9b07f35272210f407012abaf5d1b9b5
HOST_MTOOLS := mtools-$(HOST_MTOOLS_VERSION)
HOST_MTOOLS_SUFFIX := tar.bz2
-HOST_MTOOLS_URL := $(PTXCONF_SETUP_GNUMIRROR)/mtools/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX)
+HOST_MTOOLS_URL := $(call ptx/mirror, GNU, mtools/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX))
HOST_MTOOLS_SOURCE := $(SRCDIR)/$(HOST_MTOOLS).$(HOST_MTOOLS_SUFFIX)
HOST_MTOOLS_DIR := $(HOST_BUILDDIR)/$(HOST_MTOOLS)
diff --git a/rules/host-qooxdoo.make b/rules/host-qooxdoo.make
index 5adafd682..8bb9cbefb 100644
--- a/rules/host-qooxdoo.make
+++ b/rules/host-qooxdoo.make
@@ -20,7 +20,7 @@ HOST_QOOXDOO_VERSION := 1.0
HOST_QOOXDOO_MD5 := 1176bf4dd5e4ed96b4007f283caa6af3
HOST_QOOXDOO := qooxdoo-$(HOST_QOOXDOO_VERSION)-sdk
HOST_QOOXDOO_SUFFIX := zip
-HOST_QOOXDOO_URL := $(PTXCONF_SETUP_SFMIRROR)/qooxdoo/$(HOST_QOOXDOO).$(HOST_QOOXDOO_SUFFIX)
+HOST_QOOXDOO_URL := $(call ptx/mirror, SF, qooxdoo/$(HOST_QOOXDOO).$(HOST_QOOXDOO_SUFFIX))
HOST_QOOXDOO_SOURCE := $(SRCDIR)/$(HOST_QOOXDOO).$(HOST_QOOXDOO_SUFFIX)
HOST_QOOXDOO_DIR := $(HOST_BUILDDIR)/$(HOST_QOOXDOO)
HOST_QOOXDOO_LICENSE := LGPLv2.1
diff --git a/rules/host-xorg-app-bdftopcf.make b/rules/host-xorg-app-bdftopcf.make
index 4765450bf..cccd2c02b 100644
--- a/rules/host-xorg-app-bdftopcf.make
+++ b/rules/host-xorg-app-bdftopcf.make
@@ -21,7 +21,7 @@ HOST_XORG_APP_BDFTOPCF_VERSION := 1.0.3
HOST_XORG_APP_BDFTOPCF_MD5 := 4a7a4a848c43c42f7d499b60666434a4
HOST_XORG_APP_BDFTOPCF := bdftopcf-$(HOST_XORG_APP_BDFTOPCF_VERSION)
HOST_XORG_APP_BDFTOPCF_SUFFIX := tar.bz2
-HOST_XORG_APP_BDFTOPCF_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(HOST_XORG_APP_BDFTOPCF).$(HOST_XORG_APP_BDFTOPCF_SUFFIX)
+HOST_XORG_APP_BDFTOPCF_URL := $(call ptx/mirror, XORG, individual/app/$(HOST_XORG_APP_BDFTOPCF).$(HOST_XORG_APP_BDFTOPCF_SUFFIX))
HOST_XORG_APP_BDFTOPCF_SOURCE := $(SRCDIR)/$(HOST_XORG_APP_BDFTOPCF).$(HOST_XORG_APP_BDFTOPCF_SUFFIX)
HOST_XORG_APP_BDFTOPCF_DIR := $(HOST_BUILDDIR)/$(HOST_XORG_APP_BDFTOPCF)
diff --git a/rules/host-xorg-util-macros.make b/rules/host-xorg-util-macros.make
index 363ab010c..9c46d5b81 100644
--- a/rules/host-xorg-util-macros.make
+++ b/rules/host-xorg-util-macros.make
@@ -20,7 +20,7 @@ HOST_XORG_UTIL_MACROS_VERSION := 1.11.0
HOST_XORG_UTIL_MACROS_MD5 := 22d5cdff672450cb6902e0d68c200dcb
HOST_XORG_UTIL_MACROS := util-macros-$(HOST_XORG_UTIL_MACROS_VERSION)
HOST_XORG_UTIL_MACROS_SUFFIX := tar.bz2
-HOST_XORG_UTIL_MACROS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/util/$(HOST_XORG_UTIL_MACROS).$(HOST_XORG_UTIL_MACROS_SUFFIX)
+HOST_XORG_UTIL_MACROS_URL := $(call ptx/mirror, XORG, individual/util/$(HOST_XORG_UTIL_MACROS).$(HOST_XORG_UTIL_MACROS_SUFFIX))
HOST_XORG_UTIL_MACROS_SOURCE := $(SRCDIR)/$(HOST_XORG_UTIL_MACROS).$(HOST_XORG_UTIL_MACROS_SUFFIX)
HOST_XORG_UTIL_MACROS_DIR := $(HOST_BUILDDIR)/$(HOST_XORG_UTIL_MACROS)
diff --git a/rules/htop.make b/rules/htop.make
index 4684b2a61..e7401b181 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -21,7 +21,7 @@ HTOP_VERSION := 0.8.3
HTOP_MD5 := 5c9f093f9eaddf6e77aa6d54c2116d0c
HTOP := htop-$(HTOP_VERSION)
HTOP_SUFFIX := tar.gz
-HTOP_URL := $(PTXCONF_SETUP_SFMIRROR)/htop/$(HTOP).$(HTOP_SUFFIX)
+HTOP_URL := $(call ptx/mirror, SF, htop/$(HTOP).$(HTOP_SUFFIX))
HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
HTOP_DIR := $(BUILDDIR)/$(HTOP)
diff --git a/rules/inetutils.make b/rules/inetutils.make
index c0e370aed..2b804fed5 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -21,7 +21,7 @@ INETUTILS_VERSION := 1.6
INETUTILS_MD5 := 23cc24bc77751bf77d50a07a7395f9b3
INETUTILS := inetutils-$(INETUTILS_VERSION)
INETUTILS_SUFFIX := tar.gz
-INETUTILS_URL := $(PTXCONF_SETUP_GNUMIRROR)/inetutils/$(INETUTILS).$(INETUTILS_SUFFIX)
+INETUTILS_URL := $(call ptx/mirror, GNU, inetutils/$(INETUTILS).$(INETUTILS_SUFFIX))
INETUTILS_SOURCE := $(SRCDIR)/$(INETUTILS).$(INETUTILS_SUFFIX)
INETUTILS_DIR := $(BUILDDIR)/$(INETUTILS)
diff --git a/rules/initng.make b/rules/initng.make
index c79ca13ca..e787ab3c5 100644
--- a/rules/initng.make
+++ b/rules/initng.make
@@ -21,7 +21,7 @@ INITNG_VERSION := 0.6.10.2
INITNG_MD5 := 51546462fb437f8e342c37d9458c6316
INITNG := initng-$(INITNG_VERSION)
INITNG_SUFFIX := tar.bz2
-INITNG_URL := $(PTXCONF_SETUP_SFMIRROR)/initng/$(INITNG).$(INITNG_SUFFIX)
+INITNG_URL := $(call ptx/mirror, SF, initng/$(INITNG).$(INITNG_SUFFIX))
INITNG_SOURCE := $(SRCDIR)/$(INITNG).$(INITNG_SUFFIX)
INITNG_DIR := $(BUILDDIR)/$(INITNG)
diff --git a/rules/inotify-tools.make b/rules/inotify-tools.make
index 8e74d10bf..9a979849b 100644
--- a/rules/inotify-tools.make
+++ b/rules/inotify-tools.make
@@ -20,7 +20,7 @@ INOTIFY_TOOLS_VERSION := 3.13
INOTIFY_TOOLS_MD5 := 35d7178297390f18bae451e083362acf
INOTIFY_TOOLS := inotify-tools-$(INOTIFY_TOOLS_VERSION)
INOTIFY_TOOLS_SUFFIX := tar.gz
-INOTIFY_TOOLS_URL := $(PTXCONF_SETUP_SFMIRROR)/inotify-tools/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX)
+INOTIFY_TOOLS_URL := $(call ptx/mirror, SF, inotify-tools/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX))
INOTIFY_TOOLS_SOURCE := $(SRCDIR)/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX)
INOTIFY_TOOLS_DIR := $(BUILDDIR)/$(INOTIFY_TOOLS)
diff --git a/rules/iperf.make b/rules/iperf.make
index ff1cd6cab..67884e0cf 100644
--- a/rules/iperf.make
+++ b/rules/iperf.make
@@ -20,7 +20,7 @@ IPERF_VERSION := 2.0.4
IPERF_MD5 := 8c5bc14cc2ea55f18f22afe3c23e3dcb
IPERF := iperf-$(IPERF_VERSION)
IPERF_SUFFIX := tar.gz
-IPERF_URL := $(PTXCONF_SETUP_SFMIRROR)/iperf/$(IPERF).$(IPERF_SUFFIX)
+IPERF_URL := $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX))
IPERF_SOURCE := $(SRCDIR)/$(IPERF).$(IPERF_SUFFIX)
IPERF_DIR := $(BUILDDIR)/$(IPERF)
diff --git a/rules/jamvm.make b/rules/jamvm.make
index 98231fb3f..1d12d6195 100644
--- a/rules/jamvm.make
+++ b/rules/jamvm.make
@@ -20,7 +20,7 @@ JAMVM_VERSION := 1.5.4
JAMVM_MD5 := 7654e9657691f5f09c4f481ed4686176
JAMVM := jamvm-$(JAMVM_VERSION)
JAMVM_SUFFIX := tar.gz
-JAMVM_URL := $(PTXCONF_SETUP_SFMIRROR)/jamvm/$(JAMVM).$(JAMVM_SUFFIX)
+JAMVM_URL := $(call ptx/mirror, SF, jamvm/$(JAMVM).$(JAMVM_SUFFIX))
JAMVM_SOURCE := $(SRCDIR)/$(JAMVM).$(JAMVM_SUFFIX)
JAMVM_DIR := $(BUILDDIR)/$(JAMVM)
diff --git a/rules/joe.make b/rules/joe.make
index 073aed4d5..f51777e5d 100644
--- a/rules/joe.make
+++ b/rules/joe.make
@@ -21,7 +21,7 @@ JOE_VERSION := 3.5
JOE_MD5 := 9bdffecce7ef910feaa06452d48843de
JOE := joe-$(JOE_VERSION)
JOE_SUFFIX := tar.gz
-JOE_URL := $(PTXCONF_SETUP_SFMIRROR)/joe-editor/$(JOE).$(JOE_SUFFIX)
+JOE_URL := $(call ptx/mirror, SF, joe-editor/$(JOE).$(JOE_SUFFIX))
JOE_SOURCE := $(SRCDIR)/$(JOE).$(JOE_SUFFIX)
JOE_DIR := $(BUILDDIR)/$(JOE)
diff --git a/rules/kbd.make b/rules/kbd.make
index 17a885f51..4b1767bed 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -20,7 +20,7 @@ KBD_VERSION := 1.15.2
KBD_MD5 := e850eb91e4d3b94b194efe8e953204c5
KBD := kbd-$(KBD_VERSION)
KBD_SUFFIX := tar.bz2
-KBD_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/kbd/$(KBD).$(KBD_SUFFIX)
+KBD_URL := $(call ptx/mirror, KERNEL, utils/kbd/$(KBD).$(KBD_SUFFIX))
KBD_SOURCE := $(SRCDIR)/$(KBD).$(KBD_SUFFIX)
KBD_DIR := $(BUILDDIR)/$(KBD)
KBD_LICENSE := GPLv2+
diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make
index 3f774927f..d451463ac 100644
--- a/rules/kexec-tools.make
+++ b/rules/kexec-tools.make
@@ -21,7 +21,7 @@ KEXEC_TOOLS_VERSION := 2.0.2
KEXEC_TOOLS_MD5 := 35d05fed1c97008ac34c5bfb929295eb
KEXEC_TOOLS := kexec-tools-$(KEXEC_TOOLS_VERSION)
KEXEC_TOOLS_SUFFIX := tar.bz2
-KEXEC_TOOLS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/kernel/people/horms/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)
+KEXEC_TOOLS_URL := $(call ptx/mirror, KERNEL, kernel/people/horms/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX))
KEXEC_TOOLS_SOURCE := $(SRCDIR)/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)
KEXEC_TOOLS_DIR := $(BUILDDIR)/$(KEXEC_TOOLS)
diff --git a/rules/klibc.make b/rules/klibc.make
index b4610ca8a..89f75b128 100644
--- a/rules/klibc.make
+++ b/rules/klibc.make
@@ -26,7 +26,7 @@ KLIBC_SOURCE := $(SRCDIR)/$(KLIBC).$(KLIBC_SUFFIX)
KLIBC_DIR := $(BUILDDIR)/$(KLIBC)
KLIBC_URL := \
- $(PTXCONF_SETUP_KERNELMIRROR)/libs/klibc/1.5/$(KLIBC).$(KLIBC_SUFFIX)
+ $(call ptx/mirror, KERNEL, libs/klibc/1.5/$(KLIBC).$(KLIBC_SUFFIX))
ifdef PTXCONF_KLIBC
$(STATEDIR)/kernel.compile: $(STATEDIR)/klibc.targetinstall.post
diff --git a/rules/lcms.make b/rules/lcms.make
index 24ac173d8..cd5611500 100644
--- a/rules/lcms.make
+++ b/rules/lcms.make
@@ -20,7 +20,7 @@ LCMS_VERSION := 1.19
LCMS_MD5 := 8af94611baf20d9646c7c2c285859818
LCMS := lcms-$(LCMS_VERSION)
LCMS_SUFFIX := tar.gz
-LCMS_URL := $(PTXCONF_SETUP_SFMIRROR)/lcms/$(LCMS).$(LCMS_SUFFIX)
+LCMS_URL := $(call ptx/mirror, SF, lcms/$(LCMS).$(LCMS_SUFFIX))
LCMS_SOURCE := $(SRCDIR)/$(LCMS).$(LCMS_SUFFIX)
LCMS_DIR := $(BUILDDIR)/lcms-1.19
diff --git a/rules/less.make b/rules/less.make
index c77bc5961..4d65a300c 100644
--- a/rules/less.make
+++ b/rules/less.make
@@ -20,7 +20,7 @@ LESS_VERSION := 443
LESS_MD5 := 47db098fb3cdaf847b3c4be05ee954fc
LESS := less-$(LESS_VERSION)
LESS_SUFFIX := tar.gz
-LESS_URL := $(PTXCONF_SETUP_GNUMIRROR)/less/$(LESS).$(LESS_SUFFIX)
+LESS_URL := $(call ptx/mirror, GNU, less/$(LESS).$(LESS_SUFFIX))
LESS_SOURCE := $(SRCDIR)/$(LESS).$(LESS_SUFFIX)
LESS_DIR := $(BUILDDIR)/$(LESS)
diff --git a/rules/libcap.make b/rules/libcap.make
index 0b268be18..e03c77918 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -20,7 +20,7 @@ LIBCAP_VERSION := 2.21
LIBCAP_MD5 := d7c23768860091b248db6a3769ddd9a3
LIBCAP := libcap-$(LIBCAP_VERSION)
LIBCAP_SUFFIX := tar.bz2
-LIBCAP_URL := $(PTXCONF_SETUP_KERNELMIRROR)/libs/security/linux-privs/libcap2/$(LIBCAP).$(LIBCAP_SUFFIX)
+LIBCAP_URL := $(call ptx/mirror, KERNEL, libs/security/linux-privs/libcap2/$(LIBCAP).$(LIBCAP_SUFFIX))
LIBCAP_SOURCE := $(SRCDIR)/$(LIBCAP).$(LIBCAP_SUFFIX)
LIBCAP_DIR := $(BUILDDIR)/$(LIBCAP)
LIBCAP_LICENSE := unknown
diff --git a/rules/libcgi.make b/rules/libcgi.make
index 66f15e029..dd45b69a8 100644
--- a/rules/libcgi.make
+++ b/rules/libcgi.make
@@ -21,7 +21,7 @@ LIBCGI_VERSION := 1.0
LIBCGI_MD5 := 110af367081d33c7ed6527a1a60fc274
LIBCGI := libcgi-$(LIBCGI_VERSION)
LIBCGI_SUFFIX := tar.gz
-LIBCGI_URL := $(PTXCONF_SETUP_SFMIRROR)/libcgi/$(LIBCGI).$(LIBCGI_SUFFIX)
+LIBCGI_URL := $(call ptx/mirror, SF, libcgi/$(LIBCGI).$(LIBCGI_SUFFIX))
LIBCGI_SOURCE := $(SRCDIR)/$(LIBCGI).$(LIBCGI_SUFFIX)
LIBCGI_DIR := $(BUILDDIR)/$(LIBCGI)
LIBCGI_LICENSE := LGPLv2.1
diff --git a/rules/libcgicc.make b/rules/libcgicc.make
index f26993478..75a33fc0b 100644
--- a/rules/libcgicc.make
+++ b/rules/libcgicc.make
@@ -21,7 +21,7 @@ LIBCGICC_VERSION := 3.2.9
LIBCGICC_MD5 := 9c62692a2f08e2ee48c3ccc401047e80
LIBCGICC := cgicc-$(LIBCGICC_VERSION)
LIBCGICC_SUFFIX := tar.gz
-LIBCGICC_URL := $(PTXCONF_SETUP_GNUMIRROR)/cgicc/$(LIBCGICC).$(LIBCGICC_SUFFIX)
+LIBCGICC_URL := $(call ptx/mirror, GNU, cgicc/$(LIBCGICC).$(LIBCGICC_SUFFIX))
LIBCGICC_SOURCE := $(SRCDIR)/$(LIBCGICC).$(LIBCGICC_SUFFIX)
LIBCGICC_DIR := $(BUILDDIR)/$(LIBCGICC)
diff --git a/rules/libdmtx.make b/rules/libdmtx.make
index 10e66ff73..44131f0ce 100644
--- a/rules/libdmtx.make
+++ b/rules/libdmtx.make
@@ -20,7 +20,7 @@ LIBDMTX_VERSION := 0.7.2
LIBDMTX_MD5 := 0684cf3857591e777b57248d652444ae
LIBDMTX := libdmtx-$(LIBDMTX_VERSION)
LIBDMTX_SUFFIX := tar.bz2
-LIBDMTX_URL := $(PTXCONF_SETUP_SFMIRROR)/libdmtx/$(LIBDMTX_VERSION)/$(LIBDMTX).$(LIBDMTX_SUFFIX)
+LIBDMTX_URL := $(call ptx/mirror, SF, libdmtx/$(LIBDMTX_VERSION)/$(LIBDMTX).$(LIBDMTX_SUFFIX))
LIBDMTX_SOURCE := $(SRCDIR)/$(LIBDMTX).$(LIBDMTX_SUFFIX)
LIBDMTX_DIR := $(BUILDDIR)/$(LIBDMTX)
LIBDMTX_LICENSE := unknown
diff --git a/rules/libgdbus.make b/rules/libgdbus.make
index 52bae3d42..6114b99ee 100644
--- a/rules/libgdbus.make
+++ b/rules/libgdbus.make
@@ -20,7 +20,7 @@ LIBGDBUS_VERSION := 0.2
LIBGDBUS_MD5 := 775a41347751d0b0169d6bace03c1361
LIBGDBUS := libgdbus-$(LIBGDBUS_VERSION)
LIBGDBUS_SUFFIX := tar.bz2
-LIBGDBUS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/bluetooth/$(LIBGDBUS).$(LIBGDBUS_SUFFIX)
+LIBGDBUS_URL := $(call ptx/mirror, KERNEL, bluetooth/$(LIBGDBUS).$(LIBGDBUS_SUFFIX))
LIBGDBUS_SOURCE := $(SRCDIR)/$(LIBGDBUS).$(LIBGDBUS_SUFFIX)
LIBGDBUS_DIR := $(BUILDDIR)/$(LIBGDBUS)
diff --git a/rules/libgmp.make b/rules/libgmp.make
index fc0d7536a..fd1b87800 100644
--- a/rules/libgmp.make
+++ b/rules/libgmp.make
@@ -21,7 +21,7 @@ LIBGMP_VERSION := 4.2.4
LIBGMP_MD5 := fc1e3b3a2a5038d4d74138d0b9cf8dbe
LIBGMP := gmp-$(LIBGMP_VERSION)
LIBGMP_SUFFIX := tar.bz2
-LIBGMP_URL := $(PTXCONF_SETUP_GNUMIRROR)/gmp/$(LIBGMP).$(LIBGMP_SUFFIX)
+LIBGMP_URL := $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX))
LIBGMP_SOURCE := $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX)
LIBGMP_DIR := $(BUILDDIR)/$(LIBGMP)
LIBGMP_LICENSE := GPLv3, LGPLv3
diff --git a/rules/libical.make b/rules/libical.make
index 8af9ed44e..5175f3946 100644
--- a/rules/libical.make
+++ b/rules/libical.make
@@ -20,7 +20,7 @@ LIBICAL_VERSION := 0.46
LIBICAL_MD5 := 9c08f88945bfd5d0791d102e4aa4125c
LIBICAL := libical-$(LIBICAL_VERSION)
LIBICAL_SUFFIX := tar.gz
-LIBICAL_URL := $(PTXCONF_SETUP_SFMIRROR)/project/freeassociation/libical/libical-0.46/$(LIBICAL).$(LIBICAL_SUFFIX)
+LIBICAL_URL := $(call ptx/mirror, SF, project/freeassociation/libical/libical-0.46/$(LIBICAL).$(LIBICAL_SUFFIX))
LIBICAL_SOURCE := $(SRCDIR)/$(LIBICAL).$(LIBICAL_SUFFIX)
LIBICAL_DIR := $(BUILDDIR)/$(LIBICAL)
LIBICAL_LICENSE := unknown
diff --git a/rules/libiodbc.make b/rules/libiodbc.make
index b8c715c1e..486fda02b 100644
--- a/rules/libiodbc.make
+++ b/rules/libiodbc.make
@@ -21,7 +21,7 @@ LIBIODBC_VERSION := 3.52.7
LIBIODBC_MD5 := ddbd274cb31d65be6a78da58fc09079a
LIBIODBC := libiodbc-$(LIBIODBC_VERSION)
LIBIODBC_SUFFIX := tar.gz
-LIBIODBC_URL := $(PTXCONF_SETUP_SFMIRROR)/iodbc/$(LIBIODBC).$(LIBIODBC_SUFFIX)
+LIBIODBC_URL := $(call ptx/mirror, SF, iodbc/$(LIBIODBC).$(LIBIODBC_SUFFIX))
LIBIODBC_SOURCE := $(SRCDIR)/$(LIBIODBC).$(LIBIODBC_SUFFIX)
LIBIODBC_DIR := $(BUILDDIR)/$(LIBIODBC)
LIBIOBDC_LICENSE := LGPLv2, BSD
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index 6d53d6d74..42a68434f 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -22,7 +22,7 @@ LIBLOCKFILE_MD5 := c24e2dfb4a2aab0263fe5ac1564d305e
LIBLOCKFILE_SUFFIX := tar.gz
LIBLOCKFILE := liblockfile-$(LIBLOCKFILE_VERSION)
LIBLOCKFILE_TARBALL := liblockfile_$(LIBLOCKFILE_VERSION).orig.$(LIBLOCKFILE_SUFFIX)
-LIBLOCKFILE_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/libl/liblockfile/$(LIBLOCKFILE_TARBALL)
+LIBLOCKFILE_URL := $(call ptx/mirror, DEB, pool/main/libl/liblockfile/$(LIBLOCKFILE_TARBALL))
LIBLOCKFILE_SOURCE := $(SRCDIR)/$(LIBLOCKFILE_TARBALL)
LIBLOCKFILE_DIR := $(BUILDDIR)/liblockfile-$(LIBLOCKFILE_VERSION)
LIBLOCKFILE_LICENSE := GPLv2+, LGPLv2+
diff --git a/rules/libltdl.make b/rules/libltdl.make
index ce9126a7e..6fb859ac9 100644
--- a/rules/libltdl.make
+++ b/rules/libltdl.make
@@ -20,7 +20,7 @@ LIBLTDL_VERSION := 1.5.26
LIBLTDL_MD5 := aa9c5107f3ec9ef4200eb6556f3b3c29
LIBLTDL := libtool-$(LIBLTDL_VERSION)
LIBLTDL_SUFFIX := tar.gz
-LIBLTDL_URL := $(PTXCONF_SETUP_GNUMIRROR)/libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX)
+LIBLTDL_URL := $(call ptx/mirror, GNU, libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX))
LIBLTDL_SOURCE := $(SRCDIR)/$(LIBLTDL).$(LIBLTDL_SUFFIX)
LIBLTDL_DIR := $(BUILDDIR)/$(LIBLTDL)
diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index 67d3d14f1..95488b748 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -20,7 +20,7 @@ LIBMICROHTTPD_VERSION := 0.4.4
LIBMICROHTTPD_MD5 := bcd61ebb10286379f55c7db9c79e0465
LIBMICROHTTPD := libmicrohttpd-$(LIBMICROHTTPD_VERSION)
LIBMICROHTTPD_SUFFIX := tar.gz
-LIBMICROHTTPD_URL := $(PTXCONF_SETUP_GNUMIRROR)/libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
+LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
LIBMICROHTTPD_SOURCE := $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
LIBMICROHTTPD_DIR := $(BUILDDIR)/$(LIBMICROHTTPD)
diff --git a/rules/libmng.make b/rules/libmng.make
index 420059fd3..c897693fb 100644
--- a/rules/libmng.make
+++ b/rules/libmng.make
@@ -20,7 +20,7 @@ LIBMNG_VERSION := 1.0.10
LIBMNG_MD5 := eaf1476a3bb29f6190bca660e6abef16
LIBMNG := libmng-$(LIBMNG_VERSION)
LIBMNG_SUFFIX := tar.bz2
-LIBMNG_URL := $(PTXCONF_SETUP_SFMIRROR)/libmng/$(LIBMNG).$(LIBMNG_SUFFIX)
+LIBMNG_URL := $(call ptx/mirror, SF, libmng/$(LIBMNG).$(LIBMNG_SUFFIX))
LIBMNG_SOURCE := $(SRCDIR)/$(LIBMNG).$(LIBMNG_SUFFIX)
LIBMNG_DIR := $(BUILDDIR)/$(LIBMNG)
diff --git a/rules/libnet.make b/rules/libnet.make
index 1a154dc6c..38845963c 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -21,7 +21,7 @@ LIBNET_VERSION := 1.1.4
LIBNET_MD5 := c5e06418a89cc4209f677a776a798fd9
LIBNET := libnet-$(LIBNET_VERSION)
LIBNET_SUFFIX := tar.gz
-LIBNET_URL := $(PTXCONF_SETUP_SFMIRROR)/libnet-dev/$(LIBNET).$(LIBNET_SUFFIX)
+LIBNET_URL := $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX))
LIBNET_SOURCE := $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX)
LIBNET_DIR := $(BUILDDIR)/$(LIBNET)
diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make
index 65f57c2b4..ea8433aa5 100644
--- a/rules/libnetpbm.make
+++ b/rules/libnetpbm.make
@@ -21,7 +21,7 @@ LIBNETPBM_VERSION := 10.35.72
LIBNETPBM_MD5 := 7b816e0633ccbf29273ce5a3bab335cd
LIBNETPBM := netpbm-$(LIBNETPBM_VERSION)
LIBNETPBM_SUFFIX := tgz
-LIBNETPBM_URL := $(PTXCONF_SETUP_SFMIRROR)/netpbm/$(LIBNETPBM).$(LIBNETPBM_SUFFIX)
+LIBNETPBM_URL := $(call ptx/mirror, SF, netpbm/$(LIBNETPBM).$(LIBNETPBM_SUFFIX))
LIBNETPBM_SOURCE := $(SRCDIR)/$(LIBNETPBM).$(LIBNETPBM_SUFFIX)
LIBNETPBM_DIR := $(BUILDDIR)/$(LIBNETPBM)
diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
index 8a10c4dbd..ad122235d 100644
--- a/rules/libpciaccess.make
+++ b/rules/libpciaccess.make
@@ -20,7 +20,7 @@ LIBPCIACCESS_VERSION := 0.12.0
LIBPCIACCESS_MD5 := 285e07976274572e1f1e68edee09b70a
LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION)
LIBPCIACCESS_SUFFIX := tar.bz2
-LIBPCIACCESS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)
+LIBPCIACCESS_URL := $(call ptx/mirror, XORG, individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX))
LIBPCIACCESS_SOURCE := $(SRCDIR)/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)
LIBPCIACCESS_DIR := $(BUILDDIR)/$(LIBPCIACCESS)
diff --git a/rules/libpcre.make b/rules/libpcre.make
index e7c5c588d..a0f5a0b2a 100644
--- a/rules/libpcre.make
+++ b/rules/libpcre.make
@@ -21,7 +21,7 @@ LIBPCRE_VERSION := 8.00
LIBPCRE_MD5 := caf564aa69d68e965e9bf0ff2a094c65
LIBPCRE := pcre-$(LIBPCRE_VERSION)
LIBPCRE_SUFFIX := tar.bz2
-LIBPCRE_URL := $(PTXCONF_SETUP_SFMIRROR)/pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX)
+LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX))
LIBPCRE_SOURCE := $(SRCDIR)/$(LIBPCRE).$(LIBPCRE_SUFFIX)
LIBPCRE_DIR := $(BUILDDIR)/$(LIBPCRE)
diff --git a/rules/libpng.make b/rules/libpng.make
index 5439586a4..cabe2332d 100644
--- a/rules/libpng.make
+++ b/rules/libpng.make
@@ -22,7 +22,7 @@ LIBPNG_VERSION := 1.2.44
LIBPNG_MD5 := 89b62f8daaeeab1342e307d6d1411ff1
LIBPNG := libpng-$(LIBPNG_VERSION)
LIBPNG_SUFFIX := tar.gz
-LIBPNG_URL := $(PTXCONF_SETUP_SFMIRROR)/libpng/$(LIBPNG).$(LIBPNG_SUFFIX)
+LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX))
LIBPNG_SOURCE := $(SRCDIR)/$(LIBPNG).$(LIBPNG_SUFFIX)
LIBPNG_DIR := $(BUILDDIR)/$(LIBPNG)
LIBPNG_LICENSE := libpng
diff --git a/rules/libsysfs.make b/rules/libsysfs.make
index 0d3ba5c09..98173a737 100644
--- a/rules/libsysfs.make
+++ b/rules/libsysfs.make
@@ -20,7 +20,7 @@ LIBSYSFS_VERSION := 2.1.0
LIBSYSFS_MD5 := 14e7dcd0436d2f49aa403f67e1ef7ddc
LIBSYSFS := sysfsutils-$(LIBSYSFS_VERSION)
LIBSYSFS_SUFFIX := tar.gz
-LIBSYSFS_URL := $(PTXCONF_SETUP_SFMIRROR)/linux-diag/$(LIBSYSFS).$(LIBSYSFS_SUFFIX)
+LIBSYSFS_URL := $(call ptx/mirror, SF, linux-diag/$(LIBSYSFS).$(LIBSYSFS_SUFFIX))
LIBSYSFS_SOURCE := $(SRCDIR)/$(LIBSYSFS).$(LIBSYSFS_SUFFIX)
LIBSYSFS_DIR := $(BUILDDIR)/$(LIBSYSFS)
diff --git a/rules/libusb-compat.make b/rules/libusb-compat.make
index 700adf55d..14eb41a28 100644
--- a/rules/libusb-compat.make
+++ b/rules/libusb-compat.make
@@ -20,7 +20,7 @@ LIBUSB_COMPAT_VERSION := 0.1.3
LIBUSB_COMPAT_MD5 := 570ac2ea085b80d1f74ddc7c6a93c0eb
LIBUSB_COMPAT := libusb-compat-$(LIBUSB_COMPAT_VERSION)
LIBUSB_COMPAT_SUFFIX := tar.bz2
-LIBUSB_COMPAT_URL := $(PTXCONF_SETUP_SFMIRROR)/libusb/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX)
+LIBUSB_COMPAT_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX))
LIBUSB_COMPAT_SOURCE := $(SRCDIR)/$(LIBUSB_COMPAT).$(LIBUSB_COMPAT_SUFFIX)
LIBUSB_COMPAT_DIR := $(BUILDDIR)/$(LIBUSB_COMPAT)
LIBUSB_COMPAT_LICENSE := LGPLv2.1
diff --git a/rules/libusb.make b/rules/libusb.make
index d02917254..1355e7a96 100644
--- a/rules/libusb.make
+++ b/rules/libusb.make
@@ -20,7 +20,7 @@ LIBUSB_VERSION := 1.0.8
LIBUSB_MD5 := 37d34e6eaa69a4b645a19ff4ca63ceef
LIBUSB := libusb-$(LIBUSB_VERSION)
LIBUSB_SUFFIX := tar.bz2
-LIBUSB_URL := $(PTXCONF_SETUP_SFMIRROR)/libusb/$(LIBUSB).$(LIBUSB_SUFFIX)
+LIBUSB_URL := $(call ptx/mirror, SF, libusb/$(LIBUSB).$(LIBUSB_SUFFIX))
LIBUSB_SOURCE := $(SRCDIR)/$(LIBUSB).$(LIBUSB_SUFFIX)
LIBUSB_DIR := $(BUILDDIR)/$(LIBUSB)
LIBUSB_LICENSE := LGPLv2.1
diff --git a/rules/libv4l2-python.make b/rules/libv4l2-python.make
index 701116a18..f4baf6676 100644
--- a/rules/libv4l2-python.make
+++ b/rules/libv4l2-python.make
@@ -20,7 +20,7 @@ LIBV4L2_PYTHON_VERSION := 0.8
LIBV4L2_PYTHON_MD5 := 89ecc981925552e78cbe4620d62c2c81
LIBV4L2_PYTHON := pyDataMatrixScanner
LIBV4L2_PYTHON_SUFFIX := tar.gz
-LIBV4L2_PYTHON_URL := $(PTXCONF_SETUP_SFMIRROR)/pydmscanner/$(LIBV4L2_PYTHON)-$(LIBV4L2_PYTHON_VERSION).$(LIBV4L2_PYTHON_SUFFIX)
+LIBV4L2_PYTHON_URL := $(call ptx/mirror, SF, pydmscanner/$(LIBV4L2_PYTHON)-$(LIBV4L2_PYTHON_VERSION).$(LIBV4L2_PYTHON_SUFFIX))
LIBV4L2_PYTHON_SOURCE := $(SRCDIR)/$(LIBV4L2_PYTHON)-$(LIBV4L2_PYTHON_VERSION).$(LIBV4L2_PYTHON_SUFFIX)
LIBV4L2_PYTHON_DIR := $(BUILDDIR)/$(LIBV4L2_PYTHON)
LIBV4L2_PYTHON_LICENSE := unknown
diff --git a/rules/lmbench.make b/rules/lmbench.make
index 4e82c529b..d07777edf 100644
--- a/rules/lmbench.make
+++ b/rules/lmbench.make
@@ -20,7 +20,7 @@ LMBENCH_VERSION := 3.0-a9
LMBENCH_MD5 := b3351a3294db66a72e2864a199d37cbf
LMBENCH := lmbench-$(LMBENCH_VERSION)
LMBENCH_SUFFIX := tgz
-LMBENCH_URL := $(PTXCONF_SETUP_SFMIRROR)/lmbench/$(LMBENCH).$(LMBENCH_SUFFIX)
+LMBENCH_URL := $(call ptx/mirror, SF, lmbench/$(LMBENCH).$(LMBENCH_SUFFIX))
LMBENCH_SOURCE := $(SRCDIR)/$(LMBENCH).$(LMBENCH_SUFFIX)
LMBENCH_DIR := $(BUILDDIR)/$(LMBENCH)
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index bbf7db200..5393c510a 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -20,7 +20,7 @@ LPC21ISP_VERSION := 1.79
LPC21ISP_MD5 := 93cf6b2a35d7e1d96a2887a21a8b2b77
LPC21ISP := lpc21isp-$(LPC21ISP_VERSION)
LPC21ISP_SUFFIX := tar.gz
-LPC21ISP_URL := $(PTXCONF_SETUP_SFMIRROR)/lpc21isp/$(LPC21ISP_VERSION)/$(LPC21ISP).$(LPC21ISP_SUFFIX)
+LPC21ISP_URL := $(call ptx/mirror, SF, lpc21isp/$(LPC21ISP_VERSION)/$(LPC21ISP).$(LPC21ISP_SUFFIX))
LPC21ISP_SOURCE := $(SRCDIR)/$(LPC21ISP).$(LPC21ISP_SUFFIX)
LPC21ISP_DIR := $(BUILDDIR)/lpc21isp
LPC21ISP_LICENSE := GPLv3+
diff --git a/rules/lsof.make b/rules/lsof.make
index 67594ecdf..b021758f0 100644
--- a/rules/lsof.make
+++ b/rules/lsof.make
@@ -21,7 +21,7 @@ LSOF_MD5 := 138b628cb1b6a3b16b32b792f77abcce
LSOF_SUFFIX := tar.gz
LSOF := lsof-$(LSOF_VERSION)
LSOF_TARBALL := lsof_$(LSOF_VERSION).orig.$(LSOF_SUFFIX)
-LSOF_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/l/lsof/$(LSOF_TARBALL)
+LSOF_URL := $(call ptx/mirror, DEB, pool/main/l/lsof/$(LSOF_TARBALL))
LSOF_SOURCE := $(SRCDIR)/$(LSOF_TARBALL)
LSOF_DIR := $(BUILDDIR)/$(LSOF)
diff --git a/rules/ltp-base.make b/rules/ltp-base.make
index b22bfe83b..342b59aa6 100644
--- a/rules/ltp-base.make
+++ b/rules/ltp-base.make
@@ -20,7 +20,7 @@ LTP_BASE_VERSION := 20090131
LTP_BASE_MD5 :=
LTP_BASE := ltp-full-$(LTP_BASE_VERSION)
LTP_BASE_SUFFIX := tgz
-LTP_BASE_URL := $(PTXCONF_SETUP_SFMIRROR)/ltp/$(LTP_BASE).$(LTP_BASE_SUFFIX)
+LTP_BASE_URL := $(call ptx/mirror, SF, ltp/$(LTP_BASE).$(LTP_BASE_SUFFIX))
LTP_BASE_SOURCE := $(SRCDIR)/$(LTP_BASE).$(LTP_BASE_SUFFIX)
LTP_BASE_DIR := $(BUILDDIR)/$(LTP_BASE)
LTP_BASE_BIN_DIR := /usr/bin/ltp
diff --git a/rules/memstat.make b/rules/memstat.make
index 53ee76e29..b4053c81c 100644
--- a/rules/memstat.make
+++ b/rules/memstat.make
@@ -20,7 +20,7 @@ MEMSTAT_VERSION := 0.8
MEMSTAT_MD5 := 8ba8c468a414dc1e7d38ea1eb832cf8c
MEMSTAT := memstat_$(MEMSTAT_VERSION)
MEMSTAT_SUFFIX := tar.gz
-MEMSTAT_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/m/memstat/memstat_$(MEMSTAT_VERSION).$(MEMSTAT_SUFFIX)
+MEMSTAT_URL := $(call ptx/mirror, DEB, pool/main/m/memstat/memstat_$(MEMSTAT_VERSION).$(MEMSTAT_SUFFIX))
MEMSTAT_SOURCE := $(SRCDIR)/memstat_$(MEMSTAT_VERSION).$(MEMSTAT_SUFFIX)
MEMSTAT_DIR := $(BUILDDIR)/memstat-$(MEMSTAT_VERSION)
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 7bc5d42b3..253ab9888 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -27,7 +27,7 @@ MESALIB_SOURCE := $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESALIB_URL := \
- $(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESALIB).$(MESALIB_SUFFIX) \
+ $(call ptx/mirror, SF, mesa3d/$(MESALIB).$(MESALIB_SUFFIX)) \
ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESALIB).$(MESALIB_SUFFIX)
MESADEMOS := MesaDemos-$(MESALIB_VERSION)
@@ -36,7 +36,7 @@ MESADEMOS_SOURCE := $(SRCDIR)/$(MESADEMOS).$(MESALIB_SUFFIX)
MESADEMOS_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
MESADEMOS_URL := \
- $(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX) \
+ $(call ptx/mirror, SF, mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX)) \
ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESADEMOS).$(MESALIB_SUFFIX)
# ----------------------------------------------------------------------------
diff --git a/rules/mii-diag.make b/rules/mii-diag.make
index 1ad262d30..62d83331f 100644
--- a/rules/mii-diag.make
+++ b/rules/mii-diag.make
@@ -22,7 +22,7 @@ MII_DIAG_MD5 := 2c0cc0cd29c80f86921e6f300709bf81
MII_DIAG_SUFFIX := tar.gz
MII_DIAG := mii-diag-$(MII_DIAG_VERSION).orig
MII_DIAG_TARBALL := mii-diag_$(MII_DIAG_VERSION).orig.$(MII_DIAG_SUFFIX)
-MII_DIAG_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/m/mii-diag/$(MII_DIAG_TARBALL)
+MII_DIAG_URL := $(call ptx/mirror, DEB, pool/main/m/mii-diag/$(MII_DIAG_TARBALL))
MII_DIAG_SOURCE := $(SRCDIR)/$(MII_DIAG_TARBALL)
MII_DIAG_DIR := $(BUILDDIR)/$(MII_DIAG)
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
index 761ed7e3a..acf931894 100644
--- a/rules/module-init-tools.make
+++ b/rules/module-init-tools.make
@@ -21,7 +21,7 @@ MODULE_INIT_TOOLS_VERSION := 3.16
MODULE_INIT_TOOLS_MD5 := bc44832c6e41707b8447e2847d2019f5
MODULE_INIT_TOOLS := module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
MODULE_INIT_TOOLS_SUFFIX := tar.bz2
-MODULE_INIT_TOOLS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX)
+MODULE_INIT_TOOLS_URL := $(call ptx/mirror, KERNEL, utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX))
MODULE_INIT_TOOLS_SOURCE := $(SRCDIR)/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX)
MODULE_INIT_TOOLS_DIR := $(BUILDDIR)/$(MODULE_INIT_TOOLS)
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 539a0b54a..19247bdf4 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -20,7 +20,7 @@ NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
NCURSES_MD5 := 8cb9c412e5f2d96bc6f459aa8c6282a1
NCURSES := ncurses-$(NCURSES_VERSION)
NCURSES_SUFFIX := tar.gz
-NCURSES_URL := $(PTXCONF_SETUP_GNUMIRROR)/ncurses/$(NCURSES).$(NCURSES_SUFFIX)
+NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
NCURSES_DIR := $(BUILDDIR)/$(NCURSES)
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 2b89bee8c..ad2d36008 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -21,7 +21,7 @@ NET_SNMP_VERSION := 5.6.1
NET_SNMP_MD5 := b4e30ead5783b0bb1d280172c6095ea4
NET_SNMP := net-snmp-$(NET_SNMP_VERSION)
NET_SNMP_SUFFIX := tar.gz
-NET_SNMP_URL := $(PTXCONF_SETUP_SFMIRROR)/net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX)
+NET_SNMP_URL := $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX))
NET_SNMP_SOURCE := $(SRCDIR)/$(NET_SNMP).$(NET_SNMP_SUFFIX)
NET_SNMP_DIR := $(BUILDDIR)/$(NET_SNMP)
diff --git a/rules/netcat.make b/rules/netcat.make
index 0a594902a..83bdb23d7 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -21,7 +21,7 @@ NETCAT_VERSION := 0.7.1
NETCAT_MD5 := 088def25efe04dcdd1f8369d8926ab34
NETCAT := netcat-$(NETCAT_VERSION)
NETCAT_SUFFIX := tar.gz
-NETCAT_URL := $(PTXCONF_SETUP_SFMIRROR)/netcat/$(NETCAT).$(NETCAT_SUFFIX)
+NETCAT_URL := $(call ptx/mirror, SF, netcat/$(NETCAT).$(NETCAT_SUFFIX))
NETCAT_SOURCE := $(SRCDIR)/$(NETCAT).$(NETCAT_SUFFIX)
NETCAT_DIR := $(BUILDDIR)/$(NETCAT)
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index c6aa19bb9..8e50372e5 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -20,7 +20,7 @@ NFSUTILS_VERSION := 1.2.3
NFSUTILS_MD5 := 1131dc5f27c4f3905a6e7ee0d594fd4d
NFSUTILS := nfs-utils-$(NFSUTILS_VERSION)
NFSUTILS_SUFFIX := tar.bz2
-NFSUTILS_URL := $(PTXCONF_SETUP_SFMIRROR)/nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX)
+NFSUTILS_URL := $(call ptx/mirror, SF, nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX))
NFSUTILS_SOURCE := $(SRCDIR)/$(NFSUTILS).$(NFSUTILS_SUFFIX)
NFSUTILS_DIR := $(BUILDDIR)/$(NFSUTILS)
diff --git a/rules/oprofile.make b/rules/oprofile.make
index c22563c3d..ff5c749a1 100644
--- a/rules/oprofile.make
+++ b/rules/oprofile.make
@@ -23,7 +23,7 @@ OPROFILE_VERSION := 0.9.7
OPROFILE_MD5 := 8b5d1d9b65f84420bcc3234777ad3be3
OPROFILE := oprofile-$(OPROFILE_VERSION)
OPROFILE_SUFFIX := tar.gz
-OPROFILE_URL := $(PTXCONF_SETUP_SFMIRROR)/oprofile/$(OPROFILE).$(OPROFILE_SUFFIX)
+OPROFILE_URL := $(call ptx/mirror, SF, oprofile/$(OPROFILE).$(OPROFILE_SUFFIX))
OPROFILE_SOURCE := $(SRCDIR)/$(OPROFILE).$(OPROFILE_SUFFIX)
OPROFILE_DIR := $(BUILDDIR)/$(OPROFILE)
diff --git a/rules/owfs.make b/rules/owfs.make
index 107169ab7..9c7b4e76f 100644
--- a/rules/owfs.make
+++ b/rules/owfs.make
@@ -20,7 +20,7 @@ OWFS_VERSION := 2.8p6
OWFS_MD5 := ffd2cec1ceeccfd911b4f181b66829c2
OWFS := owfs-$(OWFS_VERSION)
OWFS_SUFFIX := tar.gz
-OWFS_URL := $(PTXCONF_SETUP_SFMIRROR)/owfs/$(OWFS).$(OWFS_SUFFIX)
+OWFS_URL := $(call ptx/mirror, SF, owfs/$(OWFS).$(OWFS_SUFFIX))
OWFS_SOURCE := $(SRCDIR)/$(OWFS).$(OWFS_SUFFIX)
OWFS_DIR := $(BUILDDIR)/$(OWFS)
OWFS_LICENSE := GPLv2+, LGPLv2+
diff --git a/rules/parted.make b/rules/parted.make
index 0f3933701..dc381032f 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -20,7 +20,7 @@ PARTED_VERSION := 2.3
PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d
PARTED := parted-$(PARTED_VERSION)
PARTED_SUFFIX := tar.gz
-PARTED_URL := $(PTXCONF_SETUP_GNUMIRROR)/parted/$(PARTED).$(PARTED_SUFFIX)
+PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
PARTED_DIR := $(BUILDDIR)/$(PARTED)
PARTED_LICENSE := GPLv3
diff --git a/rules/pciutils.make b/rules/pciutils.make
index bdfb115af..f77484c86 100644
--- a/rules/pciutils.make
+++ b/rules/pciutils.make
@@ -21,7 +21,7 @@ PCIUTILS_VERSION := 3.1.2
PCIUTILS_MD5 := 46387fd7a18c33fbb5311fdb3ab9ea12
PCIUTILS := pciutils-$(PCIUTILS_VERSION)
PCIUTILS_SUFFIX := tar.bz2
-PCIUTILS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX)
+PCIUTILS_URL := $(call ptx/mirror, KERNEL, ../software/utils/pciutils/$(PCIUTILS).$(PCIUTILS_SUFFIX))
PCIUTILS_SOURCE := $(SRCDIR)/$(PCIUTILS).$(PCIUTILS_SUFFIX)
PCIUTILS_DIR := $(BUILDDIR)/$(PCIUTILS)
diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
index b087994a4..5e14b8531 100644
--- a/rules/pcmciautils.make
+++ b/rules/pcmciautils.make
@@ -21,7 +21,7 @@ PCMCIAUTILS_VERSION := 017
PCMCIAUTILS_MD5 := ee5837214d297661c8b8189055a351fc
PCMCIAUTILS := pcmciautils-$(PCMCIAUTILS_VERSION)
PCMCIAUTILS_SUFFIX := tar.gz
-PCMCIAUTILS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/kernel/pcmcia/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX)
+PCMCIAUTILS_URL := $(call ptx/mirror, KERNEL, utils/kernel/pcmcia/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX))
PCMCIAUTILS_SOURCE := $(SRCDIR)/$(PCMCIAUTILS).$(PCMCIAUTILS_SUFFIX)
PCMCIAUTILS_DIR := $(BUILDDIR)/$(PCMCIAUTILS)
diff --git a/rules/pixman.make b/rules/pixman.make
index 034662a34..035f896ee 100644
--- a/rules/pixman.make
+++ b/rules/pixman.make
@@ -20,7 +20,7 @@ PIXMAN_VERSION := 0.21.2
PIXMAN_MD5 := 4bc4cf052635265f7a98ad3e890ae329
PIXMAN := pixman-$(PIXMAN_VERSION)
PIXMAN_SUFFIX := tar.bz2
-PIXMAN_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)
+PIXMAN_URL := $(call ptx/mirror, XORG, individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX))
PIXMAN_SOURCE := $(SRCDIR)/$(PIXMAN).$(PIXMAN_SUFFIX)
PIXMAN_DIR := $(BUILDDIR)/$(PIXMAN)
diff --git a/rules/poco.make b/rules/poco.make
index 3f536ef3c..339603813 100644
--- a/rules/poco.make
+++ b/rules/poco.make
@@ -20,7 +20,7 @@ POCO_VERSION := 1.4.1p1
POCO_MD5 := bedcf66df951a6e534a004f18344f385
POCO := poco-$(POCO_VERSION)
POCO_SUFFIX := tar.gz
-POCO_URL := $(PTXCONF_SETUP_SFMIRROR)/project/poco/sources/poco-1.4.1/$(POCO).$(POCO_SUFFIX)
+POCO_URL := $(call ptx/mirror, SF, project/poco/sources/poco-1.4.1/$(POCO).$(POCO_SUFFIX))
POCO_SOURCE := $(SRCDIR)/$(POCO).$(POCO_SUFFIX)
POCO_DIR := $(shell readlink -f "$(BUILDDIR)/$(POCO)")
POCO_LICENSE := unknown
diff --git a/rules/pop3spam.make b/rules/pop3spam.make
index b2e4f1ad4..72ca49213 100644
--- a/rules/pop3spam.make
+++ b/rules/pop3spam.make
@@ -21,7 +21,7 @@ POP3SPAM_VERSION := 0.9
POP3SPAM_MD5 := 54a8cdb35e6450187dbebb0053e04bcd
POP3SPAM := pop3spam-$(POP3SPAM_VERSION)
POP3SPAM_SUFFIX := tar.bz2
-POP3SPAM_URL := $(PTXCONF_SETUP_SFMIRROR)/pop3spam/$(POP3SPAM).$(POP3SPAM_SUFFIX)
+POP3SPAM_URL := $(call ptx/mirror, SF, pop3spam/$(POP3SPAM).$(POP3SPAM_SUFFIX))
POP3SPAM_SOURCE := $(SRCDIR)/$(POP3SPAM).$(POP3SPAM_SUFFIX)
POP3SPAM_DIR := $(BUILDDIR)/$(POP3SPAM)
diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make
index 2e58deb88..eefdb4a54 100644
--- a/rules/pre/kernel.make
+++ b/rules/pre/kernel.make
@@ -36,15 +36,15 @@ KERNEL_HEADERS_DIR := $(PTXDIST_SYSROOT_TARGET)/kernel-headers
KERNEL_HEADERS_INCLUDE_DIR := $(KERNEL_HEADERS_DIR)/include
kernel/url = \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/testing/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/testing/v$(call kernel-major,$(1)).$(call kernel-minor,$(1)).$(call kernel-micro,$(1))/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/longterm/v$(call kernel-major,$(1)).$(call kernel-minor,$(1)).$(call kernel-micro,$(1))/$($(1)).$($(1)_SUFFIX) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/testing/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/testing/v$(call kernel-major,$(1)).$(call kernel-minor,$(1)).$(call kernel-micro,$(1))/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/longterm/v$(call kernel-major,$(1)).$(call kernel-minor,$(1)).$(call kernel-micro,$(1))/$($(1)).$($(1)_SUFFIX)) \
\
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).x/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).x/testing/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).x/testing/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX) \
- $(PTXCONF_SETUP_KERNELMIRROR)/kernel/v$(call kernel-major,$(1)).x/longterm/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX)
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).x/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).x/testing/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).x/testing/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX)) \
+ $(call ptx/mirror, KERNEL, kernel/v$(call kernel-major,$(1)).x/longterm/v$(call kernel-major,$(1)).$(call kernel-minor,$(1))/$($(1)).$($(1)_SUFFIX))
kernel-url = \
$(call kernel/url,$(strip $(1)))
diff --git a/rules/prelink.make b/rules/prelink.make
index 24ed79ba1..0df38e5d9 100644
--- a/rules/prelink.make
+++ b/rules/prelink.make
@@ -21,7 +21,7 @@ PRELINK_MD5 := ed90412ad4ee7f5b5e8fff3d6649e49b
PRELINK_SUFFIX := orig.tar.gz
PRELINK := prelink-$(PRELINK_VERSION)
PRELINK_TARBALL := prelink_$(PRELINK_VERSION).$(PRELINK_SUFFIX)
-PRELINK_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/p/prelink/$(PRELINK_TARBALL)
+PRELINK_URL := $(call ptx/mirror, DEB, pool/main/p/prelink/$(PRELINK_TARBALL))
PRELINK_SOURCE := $(SRCDIR)/$(PRELINK_TARBALL)
PRELINK_DIR := $(BUILDDIR)/$(PRELINK)
diff --git a/rules/ps3-utils.make b/rules/ps3-utils.make
index 147ea17ca..58e96a99c 100644
--- a/rules/ps3-utils.make
+++ b/rules/ps3-utils.make
@@ -21,7 +21,7 @@ PS3_UTILS_MD5 := 40ec16f4a7612c67c0ef5ea1828d1c7f
PS3_UTILS_LICENSE := GPLv2
PS3_UTILS := ps3-utils-$(PS3_UTILS_VERSION)
PS3_UTILS_SUFFIX := tar.gz
-PS3_UTILS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/kernel/people/geoff/cell/ps3-utils/$(PS3_UTILS).$(PS3_UTILS_SUFFIX)
+PS3_UTILS_URL := $(call ptx/mirror, KERNEL, kernel/people/geoff/cell/ps3-utils/$(PS3_UTILS).$(PS3_UTILS_SUFFIX))
PS3_UTILS_SOURCE := $(SRCDIR)/$(PS3_UTILS).$(PS3_UTILS_SUFFIX)
PS3_UTILS_DIR := $(BUILDDIR)/$(PS3_UTILS)
diff --git a/rules/quota-tools.make b/rules/quota-tools.make
index 37418c1d6..d6984a909 100644
--- a/rules/quota-tools.make
+++ b/rules/quota-tools.make
@@ -21,7 +21,7 @@ QUOTA_TOOLS_MD5 := cb3e98a039c0cf98e7c1ad4b50a5bda7
QUOTA_TOOLS := quota-tools
QUOTA_TOOLS_SUFFIX := tar.gz
QUOTA_TOOLS_PACKAGE := quota-$(QUOTA_TOOLS_VERSION).${QUOTA_TOOLS_SUFFIX}
-QUOTA_TOOLS_URL := $(PTXCONF_SETUP_SFMIRROR)/linuxquota/$(QUOTA_TOOLS_PACKAGE)
+QUOTA_TOOLS_URL := $(call ptx/mirror, SF, linuxquota/$(QUOTA_TOOLS_PACKAGE))
QUOTA_TOOLS_SOURCE := $(SRCDIR)/$(QUOTA_TOOLS_PACKAGE)
QUOTA_TOOLS_DIR := $(BUILDDIR)/$(QUOTA_TOOLS)
QUOTA_TOOLS_LICENSE := GPLv2
diff --git a/rules/qwt.make b/rules/qwt.make
index 9a5163c61..cdb9b57b1 100644
--- a/rules/qwt.make
+++ b/rules/qwt.make
@@ -20,7 +20,7 @@ QWT_VERSION := 6.0.1
QWT_MD5 := ace68558eab873e2da7e641179c4ef0c
QWT := qwt-$(QWT_VERSION)
QWT_SUFFIX := tar.bz2
-QWT_URL := $(PTXCONF_SETUP_SFMIRROR)/qwt/$(QWT).$(QWT_SUFFIX)
+QWT_URL := $(call ptx/mirror, SF, qwt/$(QWT).$(QWT_SUFFIX))
QWT_SOURCE := $(SRCDIR)/$(QWT).$(QWT_SUFFIX)
QWT_DIR := $(BUILDDIR)/$(QWT)
diff --git a/rules/rawrec.make b/rules/rawrec.make
index 39d0dd027..b10de111d 100644
--- a/rules/rawrec.make
+++ b/rules/rawrec.make
@@ -21,7 +21,7 @@ RAWREC_VERSION := 0.9.98
RAWREC_MD5 := 15a26258853cf061e9b7e5a81f147528
RAWREC := rawrec-$(RAWREC_VERSION)
RAWREC_SUFFIX := tar.gz
-RAWREC_URL := $(PTXCONF_SETUP_SFMIRROR)/rawrec/$(RAWREC).$(RAWREC_SUFFIX)
+RAWREC_URL := $(call ptx/mirror, SF, rawrec/$(RAWREC).$(RAWREC_SUFFIX))
RAWREC_SOURCE := $(SRCDIR)/$(RAWREC).$(RAWREC_SUFFIX)
RAWREC_DIR := $(BUILDDIR)/$(RAWREC)
diff --git a/rules/readline.make b/rules/readline.make
index 410130858..d5a8ec05e 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -21,7 +21,7 @@ READLINE_VERSION := 6.2
READLINE_MD5 := 67948acb2ca081f23359d0256e9a271c
READLINE := readline-$(READLINE_VERSION)
READLINE_SUFFIX := tar.gz
-READLINE_URL := $(PTXCONF_SETUP_GNUMIRROR)/readline/$(READLINE).$(READLINE_SUFFIX)
+READLINE_URL := $(call ptx/mirror, GNU, readline/$(READLINE).$(READLINE_SUFFIX))
READLINE_SOURCE := $(SRCDIR)/$(READLINE).$(READLINE_SUFFIX)
READLINE_DIR := $(BUILDDIR)/$(READLINE)
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 148acb116..3bc6568c9 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -24,7 +24,7 @@ RT_TESTS_MD5 := 98da46135f0a91c96cb7e5b27c7e3bb6
RT_TESTS_LICENSE := GPLv2, GPLv2+
RT_TESTS := rt-tests-$(RT_TESTS_VERSION)
RT_TESTS_SUFFIX := tar.bz2
-RT_TESTS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/kernel/people/clrkwllms/rt-tests/$(RT_TESTS).$(RT_TESTS_SUFFIX)
+RT_TESTS_URL := $(call ptx/mirror, KERNEL, kernel/people/clrkwllms/rt-tests/$(RT_TESTS).$(RT_TESTS_SUFFIX))
RT_TESTS_SOURCE := $(SRCDIR)/$(RT_TESTS).$(RT_TESTS_SUFFIX)
RT_TESTS_DIR := $(BUILDDIR)/$(RT_TESTS)
diff --git a/rules/screen.make b/rules/screen.make
index c8ccb362d..232e4b854 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -20,7 +20,7 @@ SCREEN_VERSION := 4.0.3
SCREEN_MD5 := 8506fd205028a96c741e4037de6e3c42
SCREEN := screen-$(SCREEN_VERSION)
SCREEN_SUFFIX := tar.gz
-SCREEN_URL := $(PTXCONF_SETUP_GNUMIRROR)/screen/$(SCREEN).$(SCREEN_SUFFIX)
+SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
SCREEN_SOURCE := $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX)
SCREEN_DIR := $(BUILDDIR)/$(SCREEN)
diff --git a/rules/scummvm.make b/rules/scummvm.make
index ff5c5e512..686d623dd 100644
--- a/rules/scummvm.make
+++ b/rules/scummvm.make
@@ -20,7 +20,7 @@ SCUMMVM_VERSION := 1.0.0
SCUMMVM_MD5 := 11b911937e0fc73c94a7bdc374ab617c
SCUMMVM := scummvm-$(SCUMMVM_VERSION)
SCUMMVM_SUFFIX := tar.bz2
-SCUMMVM_URL := $(PTXCONF_SETUP_SFMIRROR)/scummvm/$(SCUMMVM).$(SCUMMVM_SUFFIX)
+SCUMMVM_URL := $(call ptx/mirror, SF, scummvm/$(SCUMMVM).$(SCUMMVM_SUFFIX))
SCUMMVM_SOURCE := $(SRCDIR)/$(SCUMMVM).$(SCUMMVM_SUFFIX)
SCUMMVM_DIR := $(BUILDDIR)/$(SCUMMVM)
diff --git a/rules/sed.make b/rules/sed.make
index 5291fe704..05ae4c50b 100644
--- a/rules/sed.make
+++ b/rules/sed.make
@@ -21,7 +21,7 @@ SED_VERSION := 4.2.1
SED_MD5 := 7d310fbd76e01a01115075c1fd3f455a
SED := sed-$(SED_VERSION)
SED_SUFFIX := tar.bz2
-SED_URL := $(PTXCONF_SETUP_GNUMIRROR)/sed/$(SED).$(SED_SUFFIX)
+SED_URL := $(call ptx/mirror, GNU, sed/$(SED).$(SED_SUFFIX))
SED_SOURCE := $(SRCDIR)/$(SED).$(SED_SUFFIX)
SED_DIR := $(BUILDDIR)/$(SED)
SED_LICENSE := GPLv3
diff --git a/rules/serdisplib.make b/rules/serdisplib.make
index 5a9971cbb..47c335b8b 100644
--- a/rules/serdisplib.make
+++ b/rules/serdisplib.make
@@ -20,7 +20,7 @@ SERDISPLIB_VERSION := 1.97.9
SERDISPLIB_MD5 := 130552ec60d01e974712a60274f34de7
SERDISPLIB := serdisplib-$(SERDISPLIB_VERSION)
SERDISPLIB_SUFFIX := tar.gz
-SERDISPLIB_URL := $(PTXCONF_SETUP_SFMIRROR)/project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
+SERDISPLIB_URL := $(call ptx/mirror, SF, project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX))
SERDISPLIB_SOURCE := $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
SERDISPLIB_DIR := $(BUILDDIR)/$(SERDISPLIB)
SERDISPLIB_LICENSE := GPL
diff --git a/rules/setserial.make b/rules/setserial.make
index 1f6f466c6..c7859f5b3 100644
--- a/rules/setserial.make
+++ b/rules/setserial.make
@@ -20,7 +20,7 @@ SETSERIAL_VERSION := 2.17
SETSERIAL_MD5 := c4867d72c41564318e0107745eb7a0f2
SETSERIAL := setserial-$(SETSERIAL_VERSION)
SETSERIAL_SUFFIX := tar.gz
-SETSERIAL_URL := $(PTXCONF_SETUP_SFMIRROR)/setserial/$(SETSERIAL).$(SETSERIAL_SUFFIX)
+SETSERIAL_URL := $(call ptx/mirror, SF, setserial/$(SETSERIAL).$(SETSERIAL_SUFFIX))
SETSERIAL_SOURCE := $(SRCDIR)/$(SETSERIAL).$(SETSERIAL_SUFFIX)
SETSERIAL_DIR := $(BUILDDIR)/$(SETSERIAL)
diff --git a/rules/smartmontools.make b/rules/smartmontools.make
index 0bf3ff3fb..8074c034f 100644
--- a/rules/smartmontools.make
+++ b/rules/smartmontools.make
@@ -20,7 +20,7 @@ SMARTMONTOOLS_VERSION := 5.42
SMARTMONTOOLS_MD5 := 4460bf9a79a1252ff5c00ba52cf76b2a
SMARTMONTOOLS := smartmontools-$(SMARTMONTOOLS_VERSION)
SMARTMONTOOLS_SUFFIX := tar.gz
-SMARTMONTOOLS_URL := $(PTXCONF_SETUP_SFMIRROR)/smartmontools/$(SMARTMONTOOLS).$(SMARTMONTOOLS_SUFFIX)
+SMARTMONTOOLS_URL := $(call ptx/mirror, SF, smartmontools/$(SMARTMONTOOLS).$(SMARTMONTOOLS_SUFFIX))
SMARTMONTOOLS_SOURCE := $(SRCDIR)/$(SMARTMONTOOLS).$(SMARTMONTOOLS_SUFFIX)
SMARTMONTOOLS_DIR := $(BUILDDIR)/$(SMARTMONTOOLS)
SMARTMONTOOLS_LICENSE := GPLv2
diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
index 12f375193..c927c609e 100644
--- a/rules/squashfs-tools.make
+++ b/rules/squashfs-tools.make
@@ -20,7 +20,7 @@ SQUASHFS_TOOLS_VERSION := $(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_V3X, 3.4
SQUASHFS_TOOLS_MD5 := 8e1b2b96f5d5f3fe48fef226ae8cd341
SQUASHFS_TOOLS := squashfs$(SQUASHFS_TOOLS_VERSION)
SQUASHFS_TOOLS_SUFFIX := tar.gz
-SQUASHFS_TOOLS_URL := $(PTXCONF_SETUP_SFMIRROR)/squashfs/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX)
+SQUASHFS_TOOLS_URL := $(call ptx/mirror, SF, squashfs/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX))
SQUASHFS_TOOLS_SOURCE := $(SRCDIR)/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX)
SQUASHFS_TOOLS_DIR := $(BUILDDIR)/$(SQUASHFS_TOOLS)
SQUASHFS_TOOLS_SUBDIR := squashfs-tools
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index 6bc2d84a5..647f1bcd2 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -22,7 +22,7 @@ SSMTP_MD5 := 65b4e0df4934a6cd08c506cabcbe584f
SSMTP := ssmtp-$(SSMTP_VERSION)
SSMTP_SUFFIX := tar.bz2
SSMTP_SRC := ssmtp_$(SSMTP_VERSION).orig.$(SSMTP_SUFFIX)
-SSMTP_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/s/ssmtp/$(SSMTP_SRC)
+SSMTP_URL := $(call ptx/mirror, DEB, pool/main/s/ssmtp/$(SSMTP_SRC))
SSMTP_SOURCE := $(SRCDIR)/$(SSMTP_SRC)
SSMTP_DIR := $(BUILDDIR)/ssmtp-$(SSMTP_VERSION)
SSMTP_LICENSE := GPLv2+
diff --git a/rules/strace.make b/rules/strace.make
index 2ac89e40c..3646cd6d3 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -22,7 +22,7 @@ STRACE_VERSION := 4.6
STRACE_MD5 := e537b2b1afeec70c0e6e27a0d0fd671e
STRACE := strace-$(STRACE_VERSION)
STRACE_SUFFIX := tar.xz
-STRACE_URL := $(PTXCONF_SETUP_SFMIRROR)/strace/$(STRACE).$(STRACE_SUFFIX)
+STRACE_URL := $(call ptx/mirror, SF, strace/$(STRACE).$(STRACE_SUFFIX))
STRACE_SOURCE := $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX)
STRACE_DIR := $(BUILDDIR)/$(STRACE)
diff --git a/rules/syslinux.make b/rules/syslinux.make
index 6e4aaf69f..fbb8f1031 100644
--- a/rules/syslinux.make
+++ b/rules/syslinux.make
@@ -20,7 +20,7 @@ SYSLINUX_VERSION := 3.86
SYSLINUX_MD5 := d6fb0231e82190b4932b2aa20274911a
SYSLINUX := syslinux-$(SYSLINUX_VERSION)
SYSLINUX_SUFFIX := tar.bz2
-SYSLINUX_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/boot/syslinux/3.xx/$(SYSLINUX).$(SYSLINUX_SUFFIX)
+SYSLINUX_URL := $(call ptx/mirror, KERNEL, utils/boot/syslinux/3.xx/$(SYSLINUX).$(SYSLINUX_SUFFIX))
SYSLINUX_SOURCE := $(SRCDIR)/$(SYSLINUX).$(SYSLINUX_SUFFIX)
SYSLINUX_DIR := $(BUILDDIR)/$(SYSLINUX)
SYSLINUX_LICENSE := unknown
diff --git a/rules/tcl.make b/rules/tcl.make
index e0b651fc5..330a25f46 100644
--- a/rules/tcl.make
+++ b/rules/tcl.make
@@ -23,7 +23,7 @@ TCL_VERSION := $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL)
TCL_MD5 := f70ad8f78b5e4a9f792fe101f22b125f
TCL := tcl$(TCL_VERSION)
TCL_SUFFIX := -src.tar.gz
-TCL_URL := $(PTXCONF_SETUP_SFMIRROR)/tcl/$(TCL)$(TCL_SUFFIX)
+TCL_URL := $(call ptx/mirror, SF, tcl/$(TCL)$(TCL_SUFFIX))
TCL_SOURCE := $(SRCDIR)/$(TCL)$(TCL_SUFFIX)
TCL_DIR := $(BUILDDIR)/$(TCL)
diff --git a/rules/termcap.make b/rules/termcap.make
index ef810412a..422284034 100644
--- a/rules/termcap.make
+++ b/rules/termcap.make
@@ -20,7 +20,7 @@ TERMCAP_VERSION := 1.3.1
TERMCAP_MD5 := ffe6f86e63a3a29fa53ac645faaabdfa
TERMCAP := termcap-$(TERMCAP_VERSION)
TERMCAP_SUFFIX := tar.gz
-TERMCAP_URL := $(PTXCONF_SETUP_GNUMIRROR)/termcap/$(TERMCAP).$(TERMCAP_SUFFIX)
+TERMCAP_URL := $(call ptx/mirror, GNU, termcap/$(TERMCAP).$(TERMCAP_SUFFIX))
TERMCAP_SOURCE := $(SRCDIR)/$(TERMCAP).$(TERMCAP_SUFFIX)
TERMCAP_DIR := $(BUILDDIR)/$(TERMCAP)
TERMCAP_LICENSE := GPLv2
diff --git a/rules/tiobench.make b/rules/tiobench.make
index 11206064f..299c13d2a 100644
--- a/rules/tiobench.make
+++ b/rules/tiobench.make
@@ -20,7 +20,7 @@ TIOBENCH_VERSION := 0.3.3
TIOBENCH_MD5 := bf485bf820e693c79e6bd2a38702a128
TIOBENCH := tiobench-$(TIOBENCH_VERSION)
TIOBENCH_SUFFIX := tar.gz
-TIOBENCH_URL := $(PTXCONF_SETUP_SFMIRROR)/tiobench/$(TIOBENCH).$(TIOBENCH_SUFFIX)
+TIOBENCH_URL := $(call ptx/mirror, SF, tiobench/$(TIOBENCH).$(TIOBENCH_SUFFIX))
TIOBENCH_SOURCE := $(SRCDIR)/$(TIOBENCH).$(TIOBENCH_SUFFIX)
TIOBENCH_DIR := $(BUILDDIR)/$(TIOBENCH)
diff --git a/rules/tk.make b/rules/tk.make
index c81c43a58..51ce3e58d 100644
--- a/rules/tk.make
+++ b/rules/tk.make
@@ -24,7 +24,7 @@ TK_VERSION := $(TK_MAJOR).$(TK_MINOR).$(TK_PL)
TK_MD5 := 7da2e00adddc7eed6080df904579d94e
TK := tk$(TK_VERSION)
TK_SUFFIX := -src.tar.gz
-TK_URL := $(PTXCONF_SETUP_SFMIRROR)/tcl/$(TK)$(TK_SUFFIX)
+TK_URL := $(call ptx/mirror, SF, tcl/$(TK)$(TK_SUFFIX))
TK_SOURCE := $(SRCDIR)/$(TK)$(TK_SUFFIX)
TK_DIR := $(BUILDDIR)/$(TK)
diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index 698366eaa..1cc7618a2 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -20,7 +20,7 @@ TRACE_CMD_VERSION := 1.0.5
TRACE_CMD_MD5 := 251432a677c4498f2428654d9b6ec7fd
TRACE_CMD := trace-cmd-$(TRACE_CMD_VERSION)
TRACE_CMD_SUFFIX := tar.bz2
-TRACE_CMD_URL := $(PTXCONF_SETUP_KERNELMIRROR)/analysis/trace-cmd/$(TRACE_CMD).$(TRACE_CMD_SUFFIX)
+TRACE_CMD_URL := $(call ptx/mirror, KERNEL, analysis/trace-cmd/$(TRACE_CMD).$(TRACE_CMD_SUFFIX))
TRACE_CMD_SOURCE := $(SRCDIR)/$(TRACE_CMD).$(TRACE_CMD_SUFFIX)
TRACE_CMD_DIR := $(BUILDDIR)/$(TRACE_CMD)
TRACE_CMD_LICENSE := GPLv2
diff --git a/rules/udev.make b/rules/udev.make
index 44134acba..4f09ee3ed 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -29,7 +29,7 @@ UDEV_SOURCE := $(SRCDIR)/$(UDEV).$(UDEV_SUFFIX)
UDEV_DIR := $(BUILDDIR)/$(UDEV)
UDEV_URL := \
- $(PTXCONF_SETUP_KERNELMIRROR)/utils/kernel/hotplug/$(UDEV).$(UDEV_SUFFIX)
+ $(call ptx/mirror, KERNEL, utils/kernel/hotplug/$(UDEV).$(UDEV_SUFFIX))
# ----------------------------------------------------------------------------
# Get
diff --git a/rules/usbutils.make b/rules/usbutils.make
index be0dbb375..5ab875a42 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -21,7 +21,7 @@ USBUTILS_VERSION := 004
USBUTILS_MD5 := fc69cde51b2094aa4bbd804c0ba97e35
USBUTILS := usbutils-$(USBUTILS_VERSION)
USBUTILS_SUFFIX := tar.bz2
-USBUTILS_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)
+USBUTILS_URL := $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX))
USBUTILS_SOURCE := $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX)
USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS)
USBUTILS_LICENSE := GPLv2
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 59abef4ba..1df8c5f5c 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -21,7 +21,7 @@ UTIL_LINUX_NG_VERSION := 2.19.1
UTIL_LINUX_NG_MD5 := 3eab06f05163dfa65479c44e5231932c
UTIL_LINUX_NG := util-linux-$(UTIL_LINUX_NG_VERSION)
UTIL_LINUX_NG_SUFFIX := tar.bz2
-UTIL_LINUX_NG_URL := $(PTXCONF_SETUP_KERNELMIRROR)/utils/util-linux/v2.19/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
+UTIL_LINUX_NG_URL := $(call ptx/mirror, KERNEL, utils/util-linux/v2.19/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
UTIL_LINUX_NG_SOURCE := $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
UTIL_LINUX_NG_DIR := $(BUILDDIR)/$(UTIL_LINUX_NG)
UTIL_LINUX_NG_LICENSE := GPLv2+
diff --git a/rules/uttt.make b/rules/uttt.make
index 6255ceeb0..15082d38a 100644
--- a/rules/uttt.make
+++ b/rules/uttt.make
@@ -20,7 +20,7 @@ UTTT_VERSION := 0.11.0
UTTT_MD5 := c141c99bfe0327477055b5ecf91f6912
UTTT := uttt-$(UTTT_VERSION)
UTTT_SUFFIX := tar.gz
-UTTT_URL := $(PTXCONF_SETUP_SFMIRROR)/ttt/$(UTTT).$(UTTT_SUFFIX)
+UTTT_URL := $(call ptx/mirror, SF, ttt/$(UTTT).$(UTTT_SUFFIX))
UTTT_SOURCE := $(SRCDIR)/$(UTTT).$(UTTT_SUFFIX)
UTTT_DIR := $(BUILDDIR)/$(UTTT)
diff --git a/rules/watchdog.make b/rules/watchdog.make
index c60b37d5b..a8dbec972 100644
--- a/rules/watchdog.make
+++ b/rules/watchdog.make
@@ -20,7 +20,7 @@ WATCHDOG_VERSION := 5.7
WATCHDOG_MD5 := 31766450ecfc9aff70fe966c0b9df06d
WATCHDOG := watchdog-$(WATCHDOG_VERSION)
WATCHDOG_SUFFIX := tar.gz
-WATCHDOG_URL := $(PTXCONF_SETUP_SFMIRROR)/watchdog/$(WATCHDOG).$(WATCHDOG_SUFFIX)
+WATCHDOG_URL := $(call ptx/mirror, SF, watchdog/$(WATCHDOG).$(WATCHDOG_SUFFIX))
WATCHDOG_SOURCE := $(SRCDIR)/$(WATCHDOG).$(WATCHDOG_SUFFIX)
WATCHDOG_DIR := $(BUILDDIR)/$(WATCHDOG)
WATCHDOG_LICENSE := GPLv2
diff --git a/rules/wget.make b/rules/wget.make
index c3a797f6b..5c19bb28c 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -20,7 +20,7 @@ WGET_VERSION := 1.11.4
WGET_MD5 := 69e8a7296c0e12c53bd9ffd786462e87
WGET := wget-$(WGET_VERSION)
WGET_SUFFIX := tar.gz
-WGET_URL := $(PTXCONF_SETUP_GNUMIRROR)/wget/$(WGET).$(WGET_SUFFIX)
+WGET_URL := $(call ptx/mirror, GNU, wget/$(WGET).$(WGET_SUFFIX))
WGET_SOURCE := $(SRCDIR)/$(WGET).$(WGET_SUFFIX)
WGET_DIR := $(BUILDDIR)/$(WGET)
diff --git a/rules/wine.make b/rules/wine.make
index 2bc2087ee..764a8d963 100644
--- a/rules/wine.make
+++ b/rules/wine.make
@@ -20,7 +20,7 @@ WINE_VERSION := 1.0.1
WINE_MD5 :=
WINE := wine-$(WINE_VERSION)
WINE_SUFFIX := tar.bz2
-WINE_URL := $(PTXCONF_SETUP_SFMIRROR)/wine/$(WINE).$(WINE_SUFFIX)
+WINE_URL := $(call ptx/mirror, SF, wine/$(WINE).$(WINE_SUFFIX))
WINE_SOURCE := $(SRCDIR)/$(WINE).$(WINE_SUFFIX)
WINE_DIR := $(BUILDDIR)/$(WINE)
diff --git a/rules/wxwidgets.make b/rules/wxwidgets.make
index 72f34bd36..41640a356 100644
--- a/rules/wxwidgets.make
+++ b/rules/wxwidgets.make
@@ -20,7 +20,7 @@ WXWIDGETS_VERSION := 2.8.10
WXWIDGETS_MD5 := 88b867bc118a183af56efc67014bdf27
WXWIDGETS := wxGTK-$(WXWIDGETS_VERSION)
WXWIDGETS_SUFFIX := tar.bz2
-WXWIDGETS_URL := $(PTXCONF_SETUP_SFMIRROR)/wxwindows/$(WXWIDGETS).$(WXWIDGETS_SUFFIX)
+WXWIDGETS_URL := $(call ptx/mirror, SF, wxwindows/$(WXWIDGETS).$(WXWIDGETS_SUFFIX))
WXWIDGETS_SOURCE := $(SRCDIR)/$(WXWIDGETS).$(WXWIDGETS_SUFFIX)
WXWIDGETS_DIR := $(BUILDDIR)/$(WXWIDGETS)
WXWIDGETS_LICENSE := unknown
diff --git a/rules/xmlbench.make b/rules/xmlbench.make
index 241868104..27297c5b3 100644
--- a/rules/xmlbench.make
+++ b/rules/xmlbench.make
@@ -27,7 +27,7 @@ XMLBENCH_VERSION := 1.3.0
XMLBENCH_MD5 :=
XMLBENCH := xmlbench-$(XMLBENCH_VERSION)
XMLBENCH_SUFFIX := tar.bz2
-XMLBENCH_URL := $(PTXCONF_SETUP_SFMIRROR)/xmlbench/$(XMLBENCH).$(XMLBENCH_SUFFIX)
+XMLBENCH_URL := $(call ptx/mirror, SF, xmlbench/$(XMLBENCH).$(XMLBENCH_SUFFIX))
XMLBENCH_SOURCE := $(SRCDIR)/$(XMLBENCH).$(XMLBENCH_SUFFIX)
XMLBENCH_DIR := $(BUILDDIR)/$(XMLBENCH)
diff --git a/rules/xmlrpc-c.make b/rules/xmlrpc-c.make
index 7e36b7bd9..c7ecfe781 100644
--- a/rules/xmlrpc-c.make
+++ b/rules/xmlrpc-c.make
@@ -20,7 +20,7 @@ XMLRPC_C_VERSION := 1.06.41
XMLRPC_C_MD5 := 02c6b89b8ff911341b6b6d4a6c621ea9
XMLRPC_C := xmlrpc-c-$(XMLRPC_C_VERSION)
XMLRPC_C_SUFFIX := tgz
-XMLRPC_C_URL := $(PTXCONF_SETUP_SFMIRROR)/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(XMLRPC_C_VERSION)/$(XMLRPC_C).$(XMLRPC_C_SUFFIX)
+XMLRPC_C_URL := $(call ptx/mirror, SF, xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(XMLRPC_C_VERSION)/$(XMLRPC_C).$(XMLRPC_C_SUFFIX))
XMLRPC_C_SOURCE := $(SRCDIR)/$(XMLRPC_C).$(XMLRPC_C_SUFFIX)
XMLRPC_C_DIR := $(BUILDDIR)/$(XMLRPC_C)
XMLRPC_C_LICENSE := unknown
diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make
index c4511c229..b4b94dcc3 100644
--- a/rules/xmlstarlet.make
+++ b/rules/xmlstarlet.make
@@ -21,7 +21,7 @@ XMLSTARLET_VERSION := 1.0.1
XMLSTARLET_MD5 := 8deb71834bcdfb4443c258a1f0042fce
XMLSTARLET := xmlstarlet-$(XMLSTARLET_VERSION)
XMLSTARLET_SUFFIX := tar.gz
-XMLSTARLET_URL := $(PTXCONF_SETUP_SFMIRROR)/xmlstar/$(XMLSTARLET).$(XMLSTARLET_SUFFIX)
+XMLSTARLET_URL := $(call ptx/mirror, SF, xmlstar/$(XMLSTARLET).$(XMLSTARLET_SUFFIX))
XMLSTARLET_SOURCE := $(SRCDIR)/$(XMLSTARLET).$(XMLSTARLET_SUFFIX)
XMLSTARLET_DIR := $(BUILDDIR)/$(XMLSTARLET)
diff --git a/rules/xorg-app-iceauth.make b/rules/xorg-app-iceauth.make
index 0dc1d4cb4..19fe84a8d 100644
--- a/rules/xorg-app-iceauth.make
+++ b/rules/xorg-app-iceauth.make
@@ -21,7 +21,7 @@ XORG_APP_ICEAUTH_VERSION := 1.0.4
XORG_APP_ICEAUTH_MD5 := bb2e4d2611047f7c5a1a82ec956a9de4
XORG_APP_ICEAUTH := iceauth-$(XORG_APP_ICEAUTH_VERSION)
XORG_APP_ICEAUTH_SUFFIX := tar.bz2
-XORG_APP_ICEAUTH_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_ICEAUTH).$(XORG_APP_ICEAUTH_SUFFIX)
+XORG_APP_ICEAUTH_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_ICEAUTH).$(XORG_APP_ICEAUTH_SUFFIX))
XORG_APP_ICEAUTH_SOURCE := $(SRCDIR)/$(XORG_APP_ICEAUTH).$(XORG_APP_ICEAUTH_SUFFIX)
XORG_APP_ICEAUTH_DIR := $(BUILDDIR)/$(XORG_APP_ICEAUTH)
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make
index 936fa9956..913377375 100644
--- a/rules/xorg-app-mkfontdir.make
+++ b/rules/xorg-app-mkfontdir.make
@@ -21,7 +21,7 @@ XORG_APP_MKFONTDIR_VERSION := 1.0.6
XORG_APP_MKFONTDIR_MD5 := dc342dd8858416254bb5f71a9ddce589
XORG_APP_MKFONTDIR := mkfontdir-$(XORG_APP_MKFONTDIR_VERSION)
XORG_APP_MKFONTDIR_SUFFIX := tar.bz2
-XORG_APP_MKFONTDIR_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
+XORG_APP_MKFONTDIR_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX))
XORG_APP_MKFONTDIR_SOURCE := $(SRCDIR)/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
XORG_APP_MKFONTDIR_DIR := $(BUILDDIR)/$(XORG_APP_MKFONTDIR)
diff --git a/rules/xorg-app-mkfontscale.make b/rules/xorg-app-mkfontscale.make
index cf5048e34..44a9ee1f7 100644
--- a/rules/xorg-app-mkfontscale.make
+++ b/rules/xorg-app-mkfontscale.make
@@ -21,7 +21,7 @@ XORG_APP_MKFONTSCALE_VERSION := 1.0.8
XORG_APP_MKFONTSCALE_MD5 := 5210c9385c6cc4a00ce829d8dc9c819b
XORG_APP_MKFONTSCALE := mkfontscale-$(XORG_APP_MKFONTSCALE_VERSION)
XORG_APP_MKFONTSCALE_SUFFIX := tar.bz2
-XORG_APP_MKFONTSCALE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX)
+XORG_APP_MKFONTSCALE_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX))
XORG_APP_MKFONTSCALE_SOURCE := $(SRCDIR)/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX)
XORG_APP_MKFONTSCALE_DIR := $(BUILDDIR)/$(XORG_APP_MKFONTSCALE)
diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make
index 0d82122e4..e02c6da42 100644
--- a/rules/xorg-app-rgb.make
+++ b/rules/xorg-app-rgb.make
@@ -20,7 +20,7 @@ XORG_APP_RGB_VERSION := 1.0.4
XORG_APP_RGB_MD5 := 35c6cccbf25a872bdd62bfcb1a73d951
XORG_APP_RGB := rgb-$(XORG_APP_RGB_VERSION)
XORG_APP_RGB_SUFFIX := tar.bz2
-XORG_APP_RGB_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
+XORG_APP_RGB_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX))
XORG_APP_RGB_SOURCE := $(SRCDIR)/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
XORG_APP_RGB_DIR := $(BUILDDIR)/$(XORG_APP_RGB)
diff --git a/rules/xorg-app-setxkbmap.make b/rules/xorg-app-setxkbmap.make
index 018775203..916efecd4 100644
--- a/rules/xorg-app-setxkbmap.make
+++ b/rules/xorg-app-setxkbmap.make
@@ -20,7 +20,7 @@ XORG_APP_SETXKBMAP_VERSION := 1.2.0
XORG_APP_SETXKBMAP_MD5 := 2f6df89201eb9a2cbfb905d6b82a191e
XORG_APP_SETXKBMAP := setxkbmap-$(XORG_APP_SETXKBMAP_VERSION)
XORG_APP_SETXKBMAP_SUFFIX := tar.bz2
-XORG_APP_SETXKBMAP_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX)
+XORG_APP_SETXKBMAP_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX))
XORG_APP_SETXKBMAP_SOURCE := $(SRCDIR)/$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX)
XORG_APP_SETXKBMAP_DIR := $(BUILDDIR)/$(XORG_APP_SETXKBMAP)
diff --git a/rules/xorg-app-xauth.make b/rules/xorg-app-xauth.make
index b961a2833..7172a73e0 100644
--- a/rules/xorg-app-xauth.make
+++ b/rules/xorg-app-xauth.make
@@ -20,7 +20,7 @@ XORG_APP_XAUTH_VERSION := 1.0.5
XORG_APP_XAUTH_MD5 := 46fc44e5e947d3720f3be5054044ff0e
XORG_APP_XAUTH := xauth-$(XORG_APP_XAUTH_VERSION)
XORG_APP_XAUTH_SUFFIX := tar.bz2
-XORG_APP_XAUTH_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XAUTH).$(XORG_APP_XAUTH_SUFFIX)
+XORG_APP_XAUTH_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XAUTH).$(XORG_APP_XAUTH_SUFFIX))
XORG_APP_XAUTH_SOURCE := $(SRCDIR)/$(XORG_APP_XAUTH).$(XORG_APP_XAUTH_SUFFIX)
XORG_APP_XAUTH_DIR := $(BUILDDIR)/$(XORG_APP_XAUTH)
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make
index d142e2ecb..64f23f4ef 100644
--- a/rules/xorg-app-xdm.make
+++ b/rules/xorg-app-xdm.make
@@ -20,7 +20,7 @@ XORG_APP_XDM_VERSION := 1.1.10
XORG_APP_XDM_MD5 := 329383040cdbda5b5c8ce6c7e1120c97
XORG_APP_XDM := xdm-$(XORG_APP_XDM_VERSION)
XORG_APP_XDM_SUFFIX := tar.bz2
-XORG_APP_XDM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
+XORG_APP_XDM_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX))
XORG_APP_XDM_SOURCE := $(SRCDIR)/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
XORG_APP_XDM_DIR := $(BUILDDIR)/$(XORG_APP_XDM)
diff --git a/rules/xorg-app-xev.make b/rules/xorg-app-xev.make
index af8cffc0f..ffff72d99 100644
--- a/rules/xorg-app-xev.make
+++ b/rules/xorg-app-xev.make
@@ -20,7 +20,7 @@ XORG_APP_XEV_VERSION := 1.1.0
XORG_APP_XEV_MD5 := 515cfd1fe857b66abe43ec3343634954
XORG_APP_XEV := xev-$(XORG_APP_XEV_VERSION)
XORG_APP_XEV_SUFFIX := tar.bz2
-XORG_APP_XEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XEV).$(XORG_APP_XEV_SUFFIX)
+XORG_APP_XEV_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XEV).$(XORG_APP_XEV_SUFFIX))
XORG_APP_XEV_SOURCE := $(SRCDIR)/$(XORG_APP_XEV).$(XORG_APP_XEV_SUFFIX)
XORG_APP_XEV_DIR := $(BUILDDIR)/$(XORG_APP_XEV)
diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make
index be51ec09a..6a6d82743 100644
--- a/rules/xorg-app-xeyes.make
+++ b/rules/xorg-app-xeyes.make
@@ -20,7 +20,7 @@ XORG_APP_XEYES_VERSION := 1.1.1
XORG_APP_XEYES_MD5 := a3035dcecdbdb89e864177c080924981
XORG_APP_XEYES := xeyes-$(XORG_APP_XEYES_VERSION)
XORG_APP_XEYES_SUFFIX := tar.bz2
-XORG_APP_XEYES_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
+XORG_APP_XEYES_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX))
XORG_APP_XEYES_SOURCE := $(SRCDIR)/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
XORG_APP_XEYES_DIR := $(BUILDDIR)/$(XORG_APP_XEYES)
diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make
index 6f61df7a6..469cb6681 100644
--- a/rules/xorg-app-xhost.make
+++ b/rules/xorg-app-xhost.make
@@ -21,7 +21,7 @@ XORG_APP_XHOST_VERSION := 1.0.4
XORG_APP_XHOST_MD5 := 2be663a0afbcc0856c1591477d5bf32a
XORG_APP_XHOST := xhost-$(XORG_APP_XHOST_VERSION)
XORG_APP_XHOST_SUFFIX := tar.bz2
-XORG_APP_XHOST_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
+XORG_APP_XHOST_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX))
XORG_APP_XHOST_SOURCE := $(SRCDIR)/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
XORG_APP_XHOST_DIR := $(BUILDDIR)/$(XORG_APP_XHOST)
diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make
index ac5399441..9f5943eb3 100644
--- a/rules/xorg-app-xinit.make
+++ b/rules/xorg-app-xinit.make
@@ -21,7 +21,7 @@ XORG_APP_XINIT_VERSION := 1.2.1
XORG_APP_XINIT_MD5 := 56f2d202b3dc10fcd21931a67bb270f7
XORG_APP_XINIT := xinit-$(XORG_APP_XINIT_VERSION)
XORG_APP_XINIT_SUFFIX := tar.bz2
-XORG_APP_XINIT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
+XORG_APP_XINIT_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX))
XORG_APP_XINIT_SOURCE := $(SRCDIR)/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
XORG_APP_XINIT_DIR := $(BUILDDIR)/$(XORG_APP_XINIT)
diff --git a/rules/xorg-app-xinput.make b/rules/xorg-app-xinput.make
index 77595fd26..c5c41ee85 100644
--- a/rules/xorg-app-xinput.make
+++ b/rules/xorg-app-xinput.make
@@ -20,7 +20,7 @@ XORG_APP_XINPUT_VERSION := 1.5.3
XORG_APP_XINPUT_MD5 := 1e2f0ad4f3fa833b65c568907f171d28
XORG_APP_XINPUT := xinput-$(XORG_APP_XINPUT_VERSION)
XORG_APP_XINPUT_SUFFIX := tar.bz2
-XORG_APP_XINPUT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XINPUT).$(XORG_APP_XINPUT_SUFFIX)
+XORG_APP_XINPUT_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XINPUT).$(XORG_APP_XINPUT_SUFFIX))
XORG_APP_XINPUT_SOURCE := $(SRCDIR)/$(XORG_APP_XINPUT).$(XORG_APP_XINPUT_SUFFIX)
XORG_APP_XINPUT_DIR := $(BUILDDIR)/$(XORG_APP_XINPUT)
XORG_APP_XINPUT_LICENSE := unknown
diff --git a/rules/xorg-app-xkbcomp.make b/rules/xorg-app-xkbcomp.make
index 3bcec665d..85d32a728 100644
--- a/rules/xorg-app-xkbcomp.make
+++ b/rules/xorg-app-xkbcomp.make
@@ -20,7 +20,7 @@ XORG_APP_XKBCOMP_VERSION := 1.2.0
XORG_APP_XKBCOMP_MD5 := 0f55995cd8da9b2d88553e1a2e17cd0a
XORG_APP_XKBCOMP := xkbcomp-$(XORG_APP_XKBCOMP_VERSION)
XORG_APP_XKBCOMP_SUFFIX := tar.bz2
-XORG_APP_XKBCOMP_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX)
+XORG_APP_XKBCOMP_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX))
XORG_APP_XKBCOMP_SOURCE := $(SRCDIR)/$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX)
XORG_APP_XKBCOMP_DIR := $(BUILDDIR)/$(XORG_APP_XKBCOMP)
diff --git a/rules/xorg-app-xprop.make b/rules/xorg-app-xprop.make
index 9a5da49a1..78b36990d 100644
--- a/rules/xorg-app-xprop.make
+++ b/rules/xorg-app-xprop.make
@@ -21,7 +21,7 @@ XORG_APP_XPROP_VERSION := 1.2.0
XORG_APP_XPROP_MD5 := e6d0673a1e1e469f0a6220a6868fb94b
XORG_APP_XPROP := xprop-$(XORG_APP_XPROP_VERSION)
XORG_APP_XPROP_SUFFIX := tar.bz2
-XORG_APP_XPROP_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XPROP).$(XORG_APP_XPROP_SUFFIX)
+XORG_APP_XPROP_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XPROP).$(XORG_APP_XPROP_SUFFIX))
XORG_APP_XPROP_SOURCE := $(SRCDIR)/$(XORG_APP_XPROP).$(XORG_APP_XPROP_SUFFIX)
XORG_APP_XPROP_DIR := $(BUILDDIR)/$(XORG_APP_XPROP)
diff --git a/rules/xorg-app-xrandr.make b/rules/xorg-app-xrandr.make
index 416f7f191..30aef07ca 100644
--- a/rules/xorg-app-xrandr.make
+++ b/rules/xorg-app-xrandr.make
@@ -20,7 +20,7 @@ XORG_APP_XRANDR_VERSION := 1.3.4
XORG_APP_XRANDR_MD5 := d6d20038257eba5178b523e10239d51c
XORG_APP_XRANDR := xrandr-$(XORG_APP_XRANDR_VERSION)
XORG_APP_XRANDR_SUFFIX := tar.bz2
-XORG_APP_XRANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XRANDR).$(XORG_APP_XRANDR_SUFFIX)
+XORG_APP_XRANDR_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XRANDR).$(XORG_APP_XRANDR_SUFFIX))
XORG_APP_XRANDR_SOURCE := $(SRCDIR)/$(XORG_APP_XRANDR).$(XORG_APP_XRANDR_SUFFIX)
XORG_APP_XRANDR_DIR := $(BUILDDIR)/$(XORG_APP_XRANDR)
XORG_APP_XRANDR_LICENSE := unknown
diff --git a/rules/xorg-app-xrdb.make b/rules/xorg-app-xrdb.make
index 35083dd0d..cabb62f02 100644
--- a/rules/xorg-app-xrdb.make
+++ b/rules/xorg-app-xrdb.make
@@ -20,7 +20,7 @@ XORG_APP_XRDB_VERSION := 1.0.7
XORG_APP_XRDB_MD5 := 93f54f04e0b531b5fb77d3f051cbf22a
XORG_APP_XRDB := xrdb-$(XORG_APP_XRDB_VERSION)
XORG_APP_XRDB_SUFFIX := tar.bz2
-XORG_APP_XRDB_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX)
+XORG_APP_XRDB_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX))
XORG_APP_XRDB_SOURCE := $(SRCDIR)/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX)
XORG_APP_XRDB_DIR := $(BUILDDIR)/$(XORG_APP_XRDB)
diff --git a/rules/xorg-app-xset.make b/rules/xorg-app-xset.make
index bad92faf9..a89e61efa 100644
--- a/rules/xorg-app-xset.make
+++ b/rules/xorg-app-xset.make
@@ -20,7 +20,7 @@ XORG_APP_XSET_VERSION := 1.2.1
XORG_APP_XSET_MD5 := 4e0ce390394416c9e2c5cd4d7413ba87
XORG_APP_XSET := xset-$(XORG_APP_XSET_VERSION)
XORG_APP_XSET_SUFFIX := tar.bz2
-XORG_APP_XSET_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX)
+XORG_APP_XSET_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX))
XORG_APP_XSET_SOURCE := $(SRCDIR)/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX)
XORG_APP_XSET_DIR := $(BUILDDIR)/$(XORG_APP_XSET)
diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make
index b45ab8072..120a4b2b3 100644
--- a/rules/xorg-app-xsetroot.make
+++ b/rules/xorg-app-xsetroot.make
@@ -20,7 +20,7 @@ XORG_APP_XSETROOT_VERSION := 1.1.0
XORG_APP_XSETROOT_MD5 := b78a2da4cf128775031a5a3422fc0b78
XORG_APP_XSETROOT := xsetroot-$(XORG_APP_XSETROOT_VERSION)
XORG_APP_XSETROOT_SUFFIX := tar.bz2
-XORG_APP_XSETROOT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
+XORG_APP_XSETROOT_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX))
XORG_APP_XSETROOT_SOURCE := $(SRCDIR)/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
XORG_APP_XSETROOT_DIR := $(BUILDDIR)/$(XORG_APP_XSETROOT)
diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make
index 83628b9b6..f9138fe3a 100644
--- a/rules/xorg-app-xvinfo.make
+++ b/rules/xorg-app-xvinfo.make
@@ -21,7 +21,7 @@ XORG_APP_XVINFO_VERSION := 1.1.1
XORG_APP_XVINFO_MD5 := c88feb501083951a8f47a21aaeb1529d
XORG_APP_XVINFO := xvinfo-$(XORG_APP_XVINFO_VERSION)
XORG_APP_XVINFO_SUFFIX := tar.bz2
-XORG_APP_XVINFO_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX)
+XORG_APP_XVINFO_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX))
XORG_APP_XVINFO_SOURCE := $(SRCDIR)/$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX)
XORG_APP_XVINFO_DIR := $(BUILDDIR)/$(XORG_APP_XVINFO)
diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make
index edd52a7a4..7255da5d6 100644
--- a/rules/xorg-data-xbitmaps.make
+++ b/rules/xorg-data-xbitmaps.make
@@ -21,7 +21,7 @@ XORG_DATA_XBITMAPS_VERSION := 1.1.0
XORG_DATA_XBITMAPS_MD5 := f9ddd4e70a5375508b3acaf17be0d0ab
XORG_DATA_XBITMAPS := xbitmaps-$(XORG_DATA_XBITMAPS_VERSION)
XORG_DATA_XBITMAPS_SUFFIX := tar.bz2
-XORG_DATA_XBITMAPS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
+XORG_DATA_XBITMAPS_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX))
XORG_DATA_XBITMAPS_SOURCE := $(SRCDIR)/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
XORG_DATA_XBITMAPS_DIR := $(BUILDDIR)/$(XORG_DATA_XBITMAPS)
diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
index e933b4402..74e6c89f3 100644
--- a/rules/xorg-driver-input-evdev.make
+++ b/rules/xorg-driver-input-evdev.make
@@ -21,7 +21,7 @@ XORG_DRIVER_INPUT_EVDEV_VERSION := 2.5.0
XORG_DRIVER_INPUT_EVDEV_MD5 := eceb6dc517c0649b772f18708a1aade8
XORG_DRIVER_INPUT_EVDEV := xf86-input-evdev-$(XORG_DRIVER_INPUT_EVDEV_VERSION)
XORG_DRIVER_INPUT_EVDEV_SUFFIX := tar.bz2
-XORG_DRIVER_INPUT_EVDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
+XORG_DRIVER_INPUT_EVDEV_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX))
XORG_DRIVER_INPUT_EVDEV_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
XORG_DRIVER_INPUT_EVDEV_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_EVDEV)
diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make
index 36dcab204..f4d671ba9 100644
--- a/rules/xorg-driver-input-keyboard.make
+++ b/rules/xorg-driver-input-keyboard.make
@@ -21,7 +21,7 @@ XORG_DRIVER_INPUT_KEYBOARD_VERSION := 1.5.0
XORG_DRIVER_INPUT_KEYBOARD_MD5 := b74d7162db5ce7899c17927c6cfa9522
XORG_DRIVER_INPUT_KEYBOARD := xf86-input-keyboard-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION)
XORG_DRIVER_INPUT_KEYBOARD_SUFFIX := tar.bz2
-XORG_DRIVER_INPUT_KEYBOARD_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
+XORG_DRIVER_INPUT_KEYBOARD_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX))
XORG_DRIVER_INPUT_KEYBOARD_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
XORG_DRIVER_INPUT_KEYBOARD_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_KEYBOARD)
diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make
index 3316f70cf..43fd4e670 100644
--- a/rules/xorg-driver-input-mouse.make
+++ b/rules/xorg-driver-input-mouse.make
@@ -21,7 +21,7 @@ XORG_DRIVER_INPUT_MOUSE_VERSION := 1.6.0
XORG_DRIVER_INPUT_MOUSE_MD5 := cef849b1a2743d2e84de98422f372974
XORG_DRIVER_INPUT_MOUSE := xf86-input-mouse-$(XORG_DRIVER_INPUT_MOUSE_VERSION)
XORG_DRIVER_INPUT_MOUSE_SUFFIX := tar.bz2
-XORG_DRIVER_INPUT_MOUSE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
+XORG_DRIVER_INPUT_MOUSE_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX))
XORG_DRIVER_INPUT_MOUSE_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
XORG_DRIVER_INPUT_MOUSE_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_MOUSE)
diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make
index 7d49f910d..621512089 100644
--- a/rules/xorg-driver-input-void.make
+++ b/rules/xorg-driver-input-void.make
@@ -21,7 +21,7 @@ XORG_DRIVER_INPUT_VOID_VERSION := 1.3.1
XORG_DRIVER_INPUT_VOID_MD5 := 3056bc7c57db8c5d56039648c0530c45
XORG_DRIVER_INPUT_VOID := xf86-input-void-$(XORG_DRIVER_INPUT_VOID_VERSION)
XORG_DRIVER_INPUT_VOID_SUFFIX := tar.bz2
-XORG_DRIVER_INPUT_VOID_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
+XORG_DRIVER_INPUT_VOID_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX))
XORG_DRIVER_INPUT_VOID_SOURCE := $(SRCDIR)/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
XORG_DRIVER_INPUT_VOID_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_VOID)
diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make
index 211c38123..ec8998b4c 100644
--- a/rules/xorg-driver-video-apm.make
+++ b/rules/xorg-driver-video-apm.make
@@ -21,7 +21,7 @@ XORG_DRIVER_VIDEO_APM_VERSION := 1.2.3
XORG_DRIVER_VIDEO_APM_MD5 := a3743a971b3acb7de3d2eefc8b1a4834
XORG_DRIVER_VIDEO_APM := xf86-video-apm-$(XORG_DRIVER_VIDEO_APM_VERSION)
XORG_DRIVER_VIDEO_APM_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_APM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
+XORG_DRIVER_VIDEO_APM_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX))
XORG_DRIVER_VIDEO_APM_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
XORG_DRIVER_VIDEO_APM_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_APM)
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index 653525a53..c36e783ba 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -22,7 +22,7 @@ XORG_DRIVER_VIDEO_ATI_VERSION := 6.13.2
XORG_DRIVER_VIDEO_ATI_MD5 := a8f92fe3c458e511f4e2ead7f92c02b0
XORG_DRIVER_VIDEO_ATI := xf86-video-ati-$(XORG_DRIVER_VIDEO_ATI_VERSION)
XORG_DRIVER_VIDEO_ATI_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_ATI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
+XORG_DRIVER_VIDEO_ATI_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX))
XORG_DRIVER_VIDEO_ATI_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
XORG_DRIVER_VIDEO_ATI_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_ATI)
diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make
index c06d57ee1..f4d315b1e 100644
--- a/rules/xorg-driver-video-dummy.make
+++ b/rules/xorg-driver-video-dummy.make
@@ -21,7 +21,7 @@ XORG_DRIVER_VIDEO_DUMMY_VERSION := 0.3.4
XORG_DRIVER_VIDEO_DUMMY_MD5 := 1cf99415c998994f2e88575f942b364c
XORG_DRIVER_VIDEO_DUMMY := xf86-video-dummy-$(XORG_DRIVER_VIDEO_DUMMY_VERSION)
XORG_DRIVER_VIDEO_DUMMY_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_DUMMY_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
+XORG_DRIVER_VIDEO_DUMMY_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX))
XORG_DRIVER_VIDEO_DUMMY_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
XORG_DRIVER_VIDEO_DUMMY_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_DUMMY)
diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make
index 26aefc618..571c93129 100644
--- a/rules/xorg-driver-video-fbdev.make
+++ b/rules/xorg-driver-video-fbdev.make
@@ -21,7 +21,7 @@ XORG_DRIVER_VIDEO_FBDEV_VERSION := 0.4.2
XORG_DRIVER_VIDEO_FBDEV_MD5 := 53a533d9e0c2da50962282526bace074
XORG_DRIVER_VIDEO_FBDEV := xf86-video-fbdev-$(XORG_DRIVER_VIDEO_FBDEV_VERSION)
XORG_DRIVER_VIDEO_FBDEV_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_FBDEV_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
+XORG_DRIVER_VIDEO_FBDEV_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX))
XORG_DRIVER_VIDEO_FBDEV_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
XORG_DRIVER_VIDEO_FBDEV_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_FBDEV)
diff --git a/rules/xorg-driver-video-intel.make b/rules/xorg-driver-video-intel.make
index d9e8d1bc6..719d703b4 100644
--- a/rules/xorg-driver-video-intel.make
+++ b/rules/xorg-driver-video-intel.make
@@ -21,7 +21,7 @@ XORG_DRIVER_VIDEO_INTEL_VERSION := 2.14.0
XORG_DRIVER_VIDEO_INTEL_MD5 := 05f187582aeabda57fcd6f2782cfbf8e
XORG_DRIVER_VIDEO_INTEL := xf86-video-intel-$(XORG_DRIVER_VIDEO_INTEL_VERSION)
XORG_DRIVER_VIDEO_INTEL_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_INTEL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX)
+XORG_DRIVER_VIDEO_INTEL_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX))
XORG_DRIVER_VIDEO_INTEL_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX)
XORG_DRIVER_VIDEO_INTEL_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_INTEL)
diff --git a/rules/xorg-driver-video-v4l.make b/rules/xorg-driver-video-v4l.make
index 79062d4da..da56ab76b 100644
--- a/rules/xorg-driver-video-v4l.make
+++ b/rules/xorg-driver-video-v4l.make
@@ -20,7 +20,7 @@ XORG_DRIVER_VIDEO_V4L_VERSION := 0.2.0
XORG_DRIVER_VIDEO_V4L_MD5 := 2251ae2a0a905764941cd7b098e85ad1
XORG_DRIVER_VIDEO_V4L := xf86-video-v4l-$(XORG_DRIVER_VIDEO_V4L_VERSION)
XORG_DRIVER_VIDEO_V4L_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_V4L_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
+XORG_DRIVER_VIDEO_V4L_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX))
XORG_DRIVER_VIDEO_V4L_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
XORG_DRIVER_VIDEO_V4L_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_V4L)
diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make
index 2e6a8622e..cf8f8eadd 100644
--- a/rules/xorg-driver-video-vesa.make
+++ b/rules/xorg-driver-video-vesa.make
@@ -20,7 +20,7 @@ XORG_DRIVER_VIDEO_VESA_VERSION := 2.3.0
XORG_DRIVER_VIDEO_VESA_MD5 := 07fa32958aff9b463dd3af5481ef6626
XORG_DRIVER_VIDEO_VESA := xf86-video-vesa-$(XORG_DRIVER_VIDEO_VESA_VERSION)
XORG_DRIVER_VIDEO_VESA_SUFFIX := tar.bz2
-XORG_DRIVER_VIDEO_VESA_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
+XORG_DRIVER_VIDEO_VESA_URL := $(call ptx/mirror, XORG, individual/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX))
XORG_DRIVER_VIDEO_VESA_SOURCE := $(SRCDIR)/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
XORG_DRIVER_VIDEO_VESA_DIR := $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VESA)
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index 0a23f67f6..28bb9fbe9 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_ADOBE_100DPI_VERSION := 1.0.3
XORG_FONT_ADOBE_100DPI_MD5 := 1347c3031b74c9e91dc4dfa53b12f143
XORG_FONT_ADOBE_100DPI := font-adobe-100dpi-$(XORG_FONT_ADOBE_100DPI_VERSION)
XORG_FONT_ADOBE_100DPI_SUFFIX := tar.bz2
-XORG_FONT_ADOBE_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
+XORG_FONT_ADOBE_100DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX))
XORG_FONT_ADOBE_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
XORG_FONT_ADOBE_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_100DPI)
diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make
index c1df87c73..5de46af30 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_ADOBE_75DPI_VERSION := 1.0.3
XORG_FONT_ADOBE_75DPI_MD5 := 6c9f26c92393c0756f3e8d614713495b
XORG_FONT_ADOBE_75DPI := font-adobe-75dpi-$(XORG_FONT_ADOBE_75DPI_VERSION)
XORG_FONT_ADOBE_75DPI_SUFFIX := tar.bz2
-XORG_FONT_ADOBE_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
+XORG_FONT_ADOBE_75DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX))
XORG_FONT_ADOBE_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
XORG_FONT_ADOBE_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_75DPI)
diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make
index 0a8635734..de0d49461 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION := 1.0.4
XORG_FONT_ADOBE_UTOPIA_100DPI_MD5 := 66fb6de561648a6dce2755621d6aea17
XORG_FONT_ADOBE_UTOPIA_100DPI := font-adobe-utopia-100dpi-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION)
XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX := tar.bz2
-XORG_FONT_ADOBE_UTOPIA_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_100DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX))
XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
XORG_FONT_ADOBE_UTOPIA_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI)
diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make
index 89ce68d2e..1b081bbf1 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION := 1.0.3
XORG_FONT_ADOBE_UTOPIA_75DPI_MD5 := 0d694a5591e89d2315d841f414668344
XORG_FONT_ADOBE_UTOPIA_75DPI := font-adobe-utopia-75dpi-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION)
XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX := tar.bz2
-XORG_FONT_ADOBE_UTOPIA_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_75DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX))
XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
XORG_FONT_ADOBE_UTOPIA_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI)
diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make
index 3ac456e55..35ce8571b 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -21,7 +21,7 @@ XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION := 1.0.4
XORG_FONT_ADOBE_UTOPIA_TYPE1_MD5 := fcf24554c348df3c689b91596d7f9971
XORG_FONT_ADOBE_UTOPIA_TYPE1 := font-adobe-utopia-type1-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION)
XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX := tar.bz2
-XORG_FONT_ADOBE_UTOPIA_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_TYPE1_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX))
XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1)
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index edc61f2f6..f1b02ee6b 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -20,7 +20,7 @@ XORG_FONT_ALIAS_VERSION := 1.0.3
XORG_FONT_ALIAS_MD5 := 6d25f64796fef34b53b439c2e9efa562
XORG_FONT_ALIAS := font-alias-$(XORG_FONT_ALIAS_VERSION)
XORG_FONT_ALIAS_SUFFIX := tar.bz2
-XORG_FONT_ALIAS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
+XORG_FONT_ALIAS_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX))
XORG_FONT_ALIAS_SOURCE := $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
XORG_FONT_ALIAS_DIR := $(BUILDDIR)/$(XORG_FONT_ALIAS)
diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make
index 66f5246aa..f795d2dcb 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_ARABIC_MISC_VERSION := 1.0.3
XORG_FONT_ARABIC_MISC_MD5 := cc0726e4a277d6ed93b8e09c1f195470
XORG_FONT_ARABIC_MISC := font-arabic-misc-$(XORG_FONT_ARABIC_MISC_VERSION)
XORG_FONT_ARABIC_MISC_SUFFIX := tar.bz2
-XORG_FONT_ARABIC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
+XORG_FONT_ARABIC_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX))
XORG_FONT_ARABIC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
XORG_FONT_ARABIC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_ARABIC_MISC)
diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make
index b32ed1538..8f8622947 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_BH_100DPI_VERSION := 1.0.3
XORG_FONT_BH_100DPI_MD5 := 9f11ade089d689b9d59e0f47d26f39cd
XORG_FONT_BH_100DPI := font-bh-100dpi-$(XORG_FONT_BH_100DPI_VERSION)
XORG_FONT_BH_100DPI_SUFFIX := tar.bz2
-XORG_FONT_BH_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
+XORG_FONT_BH_100DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX))
XORG_FONT_BH_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
XORG_FONT_BH_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_100DPI)
diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make
index 80572c7cd..180d502a0 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_BH_75DPI_VERSION := 1.0.3
XORG_FONT_BH_75DPI_MD5 := 565494fc3b6ac08010201d79c677a7a7
XORG_FONT_BH_75DPI := font-bh-75dpi-$(XORG_FONT_BH_75DPI_VERSION)
XORG_FONT_BH_75DPI_SUFFIX := tar.bz2
-XORG_FONT_BH_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
+XORG_FONT_BH_75DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX))
XORG_FONT_BH_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
XORG_FONT_BH_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_75DPI)
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
index d13ba42c2..0bd965309 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -20,7 +20,7 @@ XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION := 1.0.3
XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_MD5 := c8b73a53dcefe3e8d3907d3500e484a9
XORG_FONT_BH_LUCIDATYPEWRITER_100DPI := font-bh-lucidatypewriter-100dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION)
XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX := tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX))
XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI)
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
index 48a76012e..fcce40ff7 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -20,7 +20,7 @@ XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION := 1.0.3
XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_MD5 := f6d65758ac9eb576ae49ab24c5e9019a
XORG_FONT_BH_LUCIDATYPEWRITER_75DPI := font-bh-lucidatypewriter-75dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION)
XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX := tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX))
XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 7f7090f76..bb7fe92e3 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -21,7 +21,7 @@ XORG_FONT_BH_TTF_VERSION := 1.0.3
XORG_FONT_BH_TTF_MD5 := e8ca58ea0d3726b94fe9f2c17344be60
XORG_FONT_BH_TTF := font-bh-ttf-$(XORG_FONT_BH_TTF_VERSION)
XORG_FONT_BH_TTF_SUFFIX := tar.bz2
-XORG_FONT_BH_TTF_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
+XORG_FONT_BH_TTF_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX))
XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF)
diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make
index b461369b0..062deea00 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_BITSTREAM_100DPI_VERSION := 1.0.3
XORG_FONT_BITSTREAM_100DPI_MD5 := 6b223a54b15ecbd5a1bc52312ad790d8
XORG_FONT_BITSTREAM_100DPI := font-bitstream-100dpi-$(XORG_FONT_BITSTREAM_100DPI_VERSION)
XORG_FONT_BITSTREAM_100DPI_SUFFIX := tar.bz2
-XORG_FONT_BITSTREAM_100DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
+XORG_FONT_BITSTREAM_100DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX))
XORG_FONT_BITSTREAM_100DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
XORG_FONT_BITSTREAM_100DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_100DPI)
diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make
index 3d68e380c..2cb771c5f 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -21,7 +21,7 @@ XORG_FONT_BITSTREAM_75DPI_VERSION := 1.0.3
XORG_FONT_BITSTREAM_75DPI_MD5 := d7c0588c26fac055c0dd683fdd65ac34
XORG_FONT_BITSTREAM_75DPI := font-bitstream-75dpi-$(XORG_FONT_BITSTREAM_75DPI_VERSION)
XORG_FONT_BITSTREAM_75DPI_SUFFIX := tar.bz2
-XORG_FONT_BITSTREAM_75DPI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
+XORG_FONT_BITSTREAM_75DPI_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX))
XORG_FONT_BITSTREAM_75DPI_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
XORG_FONT_BITSTREAM_75DPI_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_75DPI)
diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make
index 9e12735d0..16945c56e 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -21,7 +21,7 @@ XORG_FONT_BITSTREAM_SPEEDO_VERSION := 1.0.2
XORG_FONT_BITSTREAM_SPEEDO_MD5 := 13f6f107be164cfbf6be40d35ecf0c0f
XORG_FONT_BITSTREAM_SPEEDO := font-bitstream-speedo-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION)
XORG_FONT_BITSTREAM_SPEEDO_SUFFIX := tar.bz2
-XORG_FONT_BITSTREAM_SPEEDO_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
+XORG_FONT_BITSTREAM_SPEEDO_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX))
XORG_FONT_BITSTREAM_SPEEDO_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
XORG_FONT_BITSTREAM_SPEEDO_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_SPEEDO)
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make
index 97e1fe84c..57caf16bf 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -21,7 +21,7 @@ XORG_FONT_BITSTREAM_TYPE1_VERSION := 1.0.3
XORG_FONT_BITSTREAM_TYPE1_MD5 := 5e0c9895d69d2632e2170114f8283c11
XORG_FONT_BITSTREAM_TYPE1 := font-bitstream-type1-$(XORG_FONT_BITSTREAM_TYPE1_VERSION)
XORG_FONT_BITSTREAM_TYPE1_SUFFIX := tar.bz2
-XORG_FONT_BITSTREAM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
+XORG_FONT_BITSTREAM_TYPE1_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX))
XORG_FONT_BITSTREAM_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
XORG_FONT_BITSTREAM_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_BITSTREAM_TYPE1)
diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make
index 795c7bbd5..3161f2fb0 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -21,7 +21,7 @@ XORG_FONT_CRONYX_CYRILLIC_VERSION := 1.0.3
XORG_FONT_CRONYX_CYRILLIC_MD5 := e452b94b59b9cfd49110bb49b6267fba
XORG_FONT_CRONYX_CYRILLIC := font-cronyx-cyrillic-$(XORG_FONT_CRONYX_CYRILLIC_VERSION)
XORG_FONT_CRONYX_CYRILLIC_SUFFIX := tar.bz2
-XORG_FONT_CRONYX_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
+XORG_FONT_CRONYX_CYRILLIC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX))
XORG_FONT_CRONYX_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
XORG_FONT_CRONYX_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_CRONYX_CYRILLIC)
diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make
index 06fb9895a..7791a70d1 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_CURSOR_MISC_VERSION := 1.0.3
XORG_FONT_CURSOR_MISC_MD5 := 3e0069d4f178a399cffe56daa95c2b63
XORG_FONT_CURSOR_MISC := font-cursor-misc-$(XORG_FONT_CURSOR_MISC_VERSION)
XORG_FONT_CURSOR_MISC_SUFFIX := tar.bz2
-XORG_FONT_CURSOR_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
+XORG_FONT_CURSOR_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX))
XORG_FONT_CURSOR_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
XORG_FONT_CURSOR_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_CURSOR_MISC)
diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make
index a0ba0a818..8d23c0ac7 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_DAEWOO_MISC_VERSION := 1.0.3
XORG_FONT_DAEWOO_MISC_MD5 := 0571bf77f8fab465a5454569d9989506
XORG_FONT_DAEWOO_MISC := font-daewoo-misc-$(XORG_FONT_DAEWOO_MISC_VERSION)
XORG_FONT_DAEWOO_MISC_SUFFIX := tar.bz2
-XORG_FONT_DAEWOO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
+XORG_FONT_DAEWOO_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX))
XORG_FONT_DAEWOO_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
XORG_FONT_DAEWOO_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_DAEWOO_MISC)
diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make
index d1e51462b..08f1277c9 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_DEC_MISC_VERSION := 1.0.3
XORG_FONT_DEC_MISC_MD5 := 6e7c5108f1b16d7a1c7b2c9760edd6e5
XORG_FONT_DEC_MISC := font-dec-misc-$(XORG_FONT_DEC_MISC_VERSION)
XORG_FONT_DEC_MISC_SUFFIX := tar.bz2
-XORG_FONT_DEC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
+XORG_FONT_DEC_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX))
XORG_FONT_DEC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
XORG_FONT_DEC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_DEC_MISC)
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make
index 081cf8d44..3130059f6 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -20,7 +20,7 @@ XORG_FONT_ENCODINGS_VERSION := 1.0.4
XORG_FONT_ENCODINGS_MD5 := 0f2d6546d514c5cc4ecf78a60657a5c1
XORG_FONT_ENCODINGS := encodings-$(XORG_FONT_ENCODINGS_VERSION)
XORG_FONT_ENCODINGS_SUFFIX := tar.bz2
-XORG_FONT_ENCODINGS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
+XORG_FONT_ENCODINGS_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX))
XORG_FONT_ENCODINGS_SOURCE := $(SRCDIR)/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
XORG_FONT_ENCODINGS_DIR := $(BUILDDIR)/$(XORG_FONT_ENCODINGS)
diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make
index 69e3e5ca0..d218840ca 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -21,7 +21,7 @@ XORG_FONT_IBM_TYPE1_VERSION := 1.0.3
XORG_FONT_IBM_TYPE1_MD5 := bfb2593d2102585f45daa960f43cb3c4
XORG_FONT_IBM_TYPE1 := font-ibm-type1-$(XORG_FONT_IBM_TYPE1_VERSION)
XORG_FONT_IBM_TYPE1_SUFFIX := tar.bz2
-XORG_FONT_IBM_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
+XORG_FONT_IBM_TYPE1_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX))
XORG_FONT_IBM_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
XORG_FONT_IBM_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_IBM_TYPE1)
diff --git a/rules/xorg-font-intl.make b/rules/xorg-font-intl.make
index 732e265f7..4f79500ba 100644
--- a/rules/xorg-font-intl.make
+++ b/rules/xorg-font-intl.make
@@ -20,7 +20,7 @@ XORG_FONT_INTL_VERSION := 1.2.1
XORG_FONT_INTL_MD5 := d77e9c4ec066a985687e5c67992677e4
XORG_FONT_INTL := intlfonts-$(XORG_FONT_INTL_VERSION)
XORG_FONT_INTL_SUFFIX := tar.gz
-XORG_FONT_INTL_URL := $(PTXCONF_SETUP_GNUMIRROR)/intlfonts/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
+XORG_FONT_INTL_URL := $(call ptx/mirror, GNU, intlfonts/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX))
XORG_FONT_INTL_SOURCE := $(SRCDIR)/$(XORG_FONT_INTL).$(XORG_FONT_INTL_SUFFIX)
XORG_FONT_INTL_DIR := $(BUILDDIR)/$(XORG_FONT_INTL)
diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make
index 59d185f18..3bded4c01 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_ISAS_MISC_VERSION := 1.0.3
XORG_FONT_ISAS_MISC_MD5 := a2401caccbdcf5698e001784dbd43f1a
XORG_FONT_ISAS_MISC := font-isas-misc-$(XORG_FONT_ISAS_MISC_VERSION)
XORG_FONT_ISAS_MISC_SUFFIX := tar.bz2
-XORG_FONT_ISAS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
+XORG_FONT_ISAS_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX))
XORG_FONT_ISAS_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
XORG_FONT_ISAS_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_ISAS_MISC)
diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make
index 158c1db9a..6e967a82e 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_JIS_MISC_VERSION := 1.0.3
XORG_FONT_JIS_MISC_MD5 := cb7b57d7800fd9e28ec35d85761ed278
XORG_FONT_JIS_MISC := font-jis-misc-$(XORG_FONT_JIS_MISC_VERSION)
XORG_FONT_JIS_MISC_SUFFIX := tar.bz2
-XORG_FONT_JIS_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
+XORG_FONT_JIS_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX))
XORG_FONT_JIS_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
XORG_FONT_JIS_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_JIS_MISC)
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make
index 9340fe585..3c860189e 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_MICRO_MISC_VERSION := 1.0.3
XORG_FONT_MICRO_MISC_MD5 := 143c228286fe9c920ab60e47c1b60b67
XORG_FONT_MICRO_MISC := font-micro-misc-$(XORG_FONT_MICRO_MISC_VERSION)
XORG_FONT_MICRO_MISC_SUFFIX := tar.bz2
-XORG_FONT_MICRO_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
+XORG_FONT_MICRO_MISC_URL := $(call ptx/mirror, XORG, individual/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX))
XORG_FONT_MICRO_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
XORG_FONT_MICRO_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MICRO_MISC)
diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make
index 34af5e434..c3328453f 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -21,7 +21,7 @@ XORG_FONT_MISC_CYRILLIC_VERSION := 1.0.3
XORG_FONT_MISC_CYRILLIC_MD5 := 96109d0890ad2b6b0e948525ebb0aba8
XORG_FONT_MISC_CYRILLIC := font-misc-cyrillic-$(XORG_FONT_MISC_CYRILLIC_VERSION)
XORG_FONT_MISC_CYRILLIC_SUFFIX := tar.bz2
-XORG_FONT_MISC_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
+XORG_FONT_MISC_CYRILLIC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX))
XORG_FONT_MISC_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
XORG_FONT_MISC_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_CYRILLIC)
diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make
index 5a197f9d8..2b8b0ce9b 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -21,7 +21,7 @@ XORG_FONT_MISC_ETHIOPIC_VERSION := 1.0.3
XORG_FONT_MISC_ETHIOPIC_MD5 := 6306c808f7d7e7d660dfb3859f9091d2
XORG_FONT_MISC_ETHIOPIC := font-misc-ethiopic-$(XORG_FONT_MISC_ETHIOPIC_VERSION)
XORG_FONT_MISC_ETHIOPIC_SUFFIX := tar.bz2
-XORG_FONT_MISC_ETHIOPIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
+XORG_FONT_MISC_ETHIOPIC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX))
XORG_FONT_MISC_ETHIOPIC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
XORG_FONT_MISC_ETHIOPIC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_ETHIOPIC)
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index 87e24ae9e..9bb17bdc0 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -21,7 +21,7 @@ XORG_FONT_MISC_MELTHO_VERSION := 1.0.3
XORG_FONT_MISC_MELTHO_MD5 := e3e7b0fda650adc7eb6964ff3c486b1c
XORG_FONT_MISC_MELTHO := font-misc-meltho-$(XORG_FONT_MISC_MELTHO_VERSION)
XORG_FONT_MISC_MELTHO_SUFFIX := tar.bz2
-XORG_FONT_MISC_MELTHO_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
+XORG_FONT_MISC_MELTHO_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX))
XORG_FONT_MISC_MELTHO_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
XORG_FONT_MISC_MELTHO_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_MELTHO)
diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make
index 22f25736b..01d1be204 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_MISC_MISC_VERSION := 1.1.2
XORG_FONT_MISC_MISC_MD5 := c88eb44b3b903d79fb44b860a213e623
XORG_FONT_MISC_MISC := font-misc-misc-$(XORG_FONT_MISC_MISC_VERSION)
XORG_FONT_MISC_MISC_SUFFIX := tar.bz2
-XORG_FONT_MISC_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
+XORG_FONT_MISC_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX))
XORG_FONT_MISC_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
XORG_FONT_MISC_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MISC_MISC)
diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make
index fa5ef02b1..dccf98672 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_MUTT_MISC_VERSION := 1.0.3
XORG_FONT_MUTT_MISC_MD5 := 56b0296e8862fc1df5cdbb4efe604e86
XORG_FONT_MUTT_MISC := font-mutt-misc-$(XORG_FONT_MUTT_MISC_VERSION)
XORG_FONT_MUTT_MISC_SUFFIX := tar.bz2
-XORG_FONT_MUTT_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
+XORG_FONT_MUTT_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX))
XORG_FONT_MUTT_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
XORG_FONT_MUTT_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_MUTT_MISC)
diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make
index 027b4730f..c0cb83046 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_SCHUMACHER_MISC_VERSION := 1.1.2
XORG_FONT_SCHUMACHER_MISC_MD5 := e805feb7c4f20e6bfb1118d19d972219
XORG_FONT_SCHUMACHER_MISC := font-schumacher-misc-$(XORG_FONT_SCHUMACHER_MISC_VERSION)
XORG_FONT_SCHUMACHER_MISC_SUFFIX := tar.bz2
-XORG_FONT_SCHUMACHER_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
+XORG_FONT_SCHUMACHER_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX))
XORG_FONT_SCHUMACHER_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
XORG_FONT_SCHUMACHER_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SCHUMACHER_MISC)
diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make
index 995c55a31..fb2e9aae6 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -21,7 +21,7 @@ XORG_FONT_SCREEN_CYRILLIC_VERSION := 1.0.4
XORG_FONT_SCREEN_CYRILLIC_MD5 := 6f3fdcf2454bf08128a651914b7948ca
XORG_FONT_SCREEN_CYRILLIC := font-screen-cyrillic-$(XORG_FONT_SCREEN_CYRILLIC_VERSION)
XORG_FONT_SCREEN_CYRILLIC_SUFFIX := tar.bz2
-XORG_FONT_SCREEN_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
+XORG_FONT_SCREEN_CYRILLIC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX))
XORG_FONT_SCREEN_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
XORG_FONT_SCREEN_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_SCREEN_CYRILLIC)
diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make
index ec62024eb..90b95fac1 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_SONY_MISC_VERSION := 1.0.3
XORG_FONT_SONY_MISC_MD5 := beef61a9b0762aba8af7b736bb961f86
XORG_FONT_SONY_MISC := font-sony-misc-$(XORG_FONT_SONY_MISC_VERSION)
XORG_FONT_SONY_MISC_SUFFIX := tar.bz2
-XORG_FONT_SONY_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
+XORG_FONT_SONY_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX))
XORG_FONT_SONY_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
XORG_FONT_SONY_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SONY_MISC)
diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make
index 235c0c6ae..7fafa39fc 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -21,7 +21,7 @@ XORG_FONT_SUN_MISC_VERSION := 1.0.3
XORG_FONT_SUN_MISC_MD5 := 948f2e07810b4f31195185921470f68d
XORG_FONT_SUN_MISC := font-sun-misc-$(XORG_FONT_SUN_MISC_VERSION)
XORG_FONT_SUN_MISC_SUFFIX := tar.bz2
-XORG_FONT_SUN_MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
+XORG_FONT_SUN_MISC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX))
XORG_FONT_SUN_MISC_SOURCE := $(SRCDIR)/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
XORG_FONT_SUN_MISC_DIR := $(BUILDDIR)/$(XORG_FONT_SUN_MISC)
diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make
index 8c964d792..997ca9623 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -22,7 +22,7 @@ XORG_FONT_UTIL_VERSION := 1.2.0
XORG_FONT_UTIL_MD5 := 1bdd8ed070e02b2165d7b0f0ed93280b
XORG_FONT_UTIL := font-util-$(XORG_FONT_UTIL_VERSION)
XORG_FONT_UTIL_SUFFIX := tar.bz2
-XORG_FONT_UTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
+XORG_FONT_UTIL_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX))
XORG_FONT_UTIL_SOURCE := $(SRCDIR)/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
XORG_FONT_UTIL_DIR := $(BUILDDIR)/$(XORG_FONT_UTIL)
diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make
index c738dc731..a52596f99 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -21,7 +21,7 @@ XORG_FONT_WINITZKI_CYRILLIC_VERSION := 1.0.3
XORG_FONT_WINITZKI_CYRILLIC_MD5 := 829a3159389b7f96f629e5388bfee67b
XORG_FONT_WINITZKI_CYRILLIC := font-winitzki-cyrillic-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION)
XORG_FONT_WINITZKI_CYRILLIC_SUFFIX := tar.bz2
-XORG_FONT_WINITZKI_CYRILLIC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
+XORG_FONT_WINITZKI_CYRILLIC_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX))
XORG_FONT_WINITZKI_CYRILLIC_SOURCE := $(SRCDIR)/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
XORG_FONT_WINITZKI_CYRILLIC_DIR := $(BUILDDIR)/$(XORG_FONT_WINITZKI_CYRILLIC)
diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make
index df668746a..3be25c223 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -21,7 +21,7 @@ XORG_FONT_XFREE86_TYPE1_VERSION := 1.0.4
XORG_FONT_XFREE86_TYPE1_MD5 := 3eeb3fb44690b477d510bbd8f86cf5aa
XORG_FONT_XFREE86_TYPE1 := font-xfree86-type1-$(XORG_FONT_XFREE86_TYPE1_VERSION)
XORG_FONT_XFREE86_TYPE1_SUFFIX := tar.bz2
-XORG_FONT_XFREE86_TYPE1_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
+XORG_FONT_XFREE86_TYPE1_URL := $(call ptx/mirror, XORG, individual/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX))
XORG_FONT_XFREE86_TYPE1_SOURCE := $(SRCDIR)/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
XORG_FONT_XFREE86_TYPE1_DIR := $(BUILDDIR)/$(XORG_FONT_XFREE86_TYPE1)
diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make
index f7c2f7e63..eb47073dc 100644
--- a/rules/xorg-lib-FS.make
+++ b/rules/xorg-lib-FS.make
@@ -20,7 +20,7 @@ XORG_LIB_FS_VERSION := 1.0.3
XORG_LIB_FS_MD5 := 8e68a3a6f3cac936042b240b20d1fb7d
XORG_LIB_FS := libFS-$(XORG_LIB_FS_VERSION)
XORG_LIB_FS_SUFFIX := tar.bz2
-XORG_LIB_FS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
+XORG_LIB_FS_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX))
XORG_LIB_FS_SOURCE := $(SRCDIR)/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
XORG_LIB_FS_DIR := $(BUILDDIR)/$(XORG_LIB_FS)
diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make
index 5e5601600..f5c6894f2 100644
--- a/rules/xorg-lib-ICE.make
+++ b/rules/xorg-lib-ICE.make
@@ -20,7 +20,7 @@ XORG_LIB_ICE_VERSION := 1.0.7
XORG_LIB_ICE_MD5 := bb72a732b15e9dc25c3036559387eed5
XORG_LIB_ICE := libICE-$(XORG_LIB_ICE_VERSION)
XORG_LIB_ICE_SUFFIX := tar.bz2
-XORG_LIB_ICE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
+XORG_LIB_ICE_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX))
XORG_LIB_ICE_SOURCE := $(SRCDIR)/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
XORG_LIB_ICE_DIR := $(BUILDDIR)/$(XORG_LIB_ICE)
diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make
index 0d651fdf6..d14bc1d2f 100644
--- a/rules/xorg-lib-SM.make
+++ b/rules/xorg-lib-SM.make
@@ -20,7 +20,7 @@ XORG_LIB_SM_VERSION := 1.2.0
XORG_LIB_SM_MD5 := e78c447bf1790552b644eca81b542742
XORG_LIB_SM := libSM-$(XORG_LIB_SM_VERSION)
XORG_LIB_SM_SUFFIX := tar.bz2
-XORG_LIB_SM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
+XORG_LIB_SM_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX))
XORG_LIB_SM_SOURCE := $(SRCDIR)/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
XORG_LIB_SM_DIR := $(BUILDDIR)/$(XORG_LIB_SM)
diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make
index 33b892112..2a54c4eef 100644
--- a/rules/xorg-lib-WindowsWM.make
+++ b/rules/xorg-lib-WindowsWM.make
@@ -21,7 +21,7 @@ XORG_LIB_WINDOWSWM_VERSION := 1.0.1
XORG_LIB_WINDOWSWM_MD5 := 274b2b5620a524fd7bb739edb97317f5
XORG_LIB_WINDOWSWM := libWindowsWM-$(XORG_LIB_WINDOWSWM_VERSION)
XORG_LIB_WINDOWSWM_SUFFIX := tar.bz2
-XORG_LIB_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
+XORG_LIB_WINDOWSWM_URL := $(call ptx/mirror, XORG, individual/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX))
XORG_LIB_WINDOWSWM_SOURCE := $(SRCDIR)/$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
XORG_LIB_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_LIB_WINDOWSWM)
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index c26286bb3..2c567fb86 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -20,7 +20,7 @@ XORG_LIB_X11_VERSION := 1.4.0
XORG_LIB_X11_MD5 := b63d9f7493a61df51d0c0be04ac435e4
XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION)
XORG_LIB_X11_SUFFIX := tar.bz2
-XORG_LIB_X11_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
+XORG_LIB_X11_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX))
XORG_LIB_X11_SOURCE := $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
XORG_LIB_X11_DIR := $(BUILDDIR)/$(XORG_LIB_X11)
diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make
index 1b3ecc1c0..1f72f19c3 100644
--- a/rules/xorg-lib-XScrnSaver.make
+++ b/rules/xorg-lib-XScrnSaver.make
@@ -20,7 +20,7 @@ XORG_LIB_XSCRNSAVER_VERSION := 1.2.1
XORG_LIB_XSCRNSAVER_MD5 := 898794bf6812fc9be9bf1bb7aa4d2b08
XORG_LIB_XSCRNSAVER := libXScrnSaver-$(XORG_LIB_XSCRNSAVER_VERSION)
XORG_LIB_XSCRNSAVER_SUFFIX := tar.bz2
-XORG_LIB_XSCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
+XORG_LIB_XSCRNSAVER_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX))
XORG_LIB_XSCRNSAVER_SOURCE := $(SRCDIR)/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
XORG_LIB_XSCRNSAVER_DIR := $(BUILDDIR)/$(XORG_LIB_XSCRNSAVER)
diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make
index dbcc9c6f4..ff0f277d7 100644
--- a/rules/xorg-lib-Xau.make
+++ b/rules/xorg-lib-Xau.make
@@ -20,7 +20,7 @@ XORG_LIB_XAU_VERSION := 1.0.6
XORG_LIB_XAU_MD5 := 4a2cbd83727682f9ee1c1e719bac6adb
XORG_LIB_XAU := libXau-$(XORG_LIB_XAU_VERSION)
XORG_LIB_XAU_SUFFIX := tar.bz2
-XORG_LIB_XAU_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
+XORG_LIB_XAU_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX))
XORG_LIB_XAU_SOURCE := $(SRCDIR)/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
XORG_LIB_XAU_DIR := $(BUILDDIR)/$(XORG_LIB_XAU)
diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make
index 39b706acd..7681b5ff8 100644
--- a/rules/xorg-lib-Xaw.make
+++ b/rules/xorg-lib-Xaw.make
@@ -20,7 +20,7 @@ XORG_LIB_XAW_VERSION := 1.0.8
XORG_LIB_XAW_MD5 := 030fced589e9128c3cf57564d4a2e1ab
XORG_LIB_XAW := libXaw-$(XORG_LIB_XAW_VERSION)
XORG_LIB_XAW_SUFFIX := tar.bz2
-XORG_LIB_XAW_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
+XORG_LIB_XAW_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX))
XORG_LIB_XAW_SOURCE := $(SRCDIR)/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
XORG_LIB_XAW_DIR := $(BUILDDIR)/$(XORG_LIB_XAW)
diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make
index 08c724db0..b64022ff7 100644
--- a/rules/xorg-lib-Xcomposite.make
+++ b/rules/xorg-lib-Xcomposite.make
@@ -20,7 +20,7 @@ XORG_LIB_XCOMPOSITE_VERSION := 0.4.3
XORG_LIB_XCOMPOSITE_MD5 := a60e0b5c276d0aa9e2d3b982c98f61c8
XORG_LIB_XCOMPOSITE := libXcomposite-$(XORG_LIB_XCOMPOSITE_VERSION)
XORG_LIB_XCOMPOSITE_SUFFIX := tar.bz2
-XORG_LIB_XCOMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
+XORG_LIB_XCOMPOSITE_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX))
XORG_LIB_XCOMPOSITE_SOURCE := $(SRCDIR)/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
XORG_LIB_XCOMPOSITE_DIR := $(BUILDDIR)/$(XORG_LIB_XCOMPOSITE)
diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make
index 1f43a7c58..1d8199a2e 100644
--- a/rules/xorg-lib-Xcursor.make
+++ b/rules/xorg-lib-Xcursor.make
@@ -20,7 +20,7 @@ XORG_LIB_XCURSOR_VERSION := 1.1.11
XORG_LIB_XCURSOR_MD5 := 866ed46f7e0d85b8c0003cebbb78a4af
XORG_LIB_XCURSOR := libXcursor-$(XORG_LIB_XCURSOR_VERSION)
XORG_LIB_XCURSOR_SUFFIX := tar.bz2
-XORG_LIB_XCURSOR_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
+XORG_LIB_XCURSOR_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX))
XORG_LIB_XCURSOR_SOURCE := $(SRCDIR)/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
XORG_LIB_XCURSOR_DIR := $(BUILDDIR)/$(XORG_LIB_XCURSOR)
diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make
index 36554c780..ff9f941bf 100644
--- a/rules/xorg-lib-Xdamage.make
+++ b/rules/xorg-lib-Xdamage.make
@@ -20,7 +20,7 @@ XORG_LIB_XDAMAGE_VERSION := 1.1.3
XORG_LIB_XDAMAGE_MD5 := 44774e1a065158b52f1a0da5100cebec
XORG_LIB_XDAMAGE := libXdamage-$(XORG_LIB_XDAMAGE_VERSION)
XORG_LIB_XDAMAGE_SUFFIX := tar.bz2
-XORG_LIB_XDAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
+XORG_LIB_XDAMAGE_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX))
XORG_LIB_XDAMAGE_SOURCE := $(SRCDIR)/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
XORG_LIB_XDAMAGE_DIR := $(BUILDDIR)/$(XORG_LIB_XDAMAGE)
diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make
index a9aad5b0d..2e85f2a48 100644
--- a/rules/xorg-lib-Xdmcp.make
+++ b/rules/xorg-lib-Xdmcp.make
@@ -21,7 +21,7 @@ XORG_LIB_XDMCP_VERSION := 1.1.0
XORG_LIB_XDMCP_MD5 := 762b6bbaff7b7d0831ddb4f072f939a5
XORG_LIB_XDMCP := libXdmcp-$(XORG_LIB_XDMCP_VERSION)
XORG_LIB_XDMCP_SUFFIX := tar.bz2
-XORG_LIB_XDMCP_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
+XORG_LIB_XDMCP_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX))
XORG_LIB_XDMCP_SOURCE := $(SRCDIR)/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
XORG_LIB_XDMCP_DIR := $(BUILDDIR)/$(XORG_LIB_XDMCP)
diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make
index 29ca99cee..84f94e2af 100644
--- a/rules/xorg-lib-Xevie.make
+++ b/rules/xorg-lib-Xevie.make
@@ -21,7 +21,7 @@ XORG_LIB_XEVIE_VERSION := 1.0.3
XORG_LIB_XEVIE_MD5 := ffa3f82595211609140440505b0e6301
XORG_LIB_XEVIE := libXevie-$(XORG_LIB_XEVIE_VERSION)
XORG_LIB_XEVIE_SUFFIX := tar.bz2
-XORG_LIB_XEVIE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
+XORG_LIB_XEVIE_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX))
XORG_LIB_XEVIE_SOURCE := $(SRCDIR)/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
XORG_LIB_XEVIE_DIR := $(BUILDDIR)/$(XORG_LIB_XEVIE)
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index c687f569b..70f94fe66 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -20,7 +20,7 @@ XORG_LIB_XEXT_VERSION := 1.2.0
XORG_LIB_XEXT_MD5 := 9bb236ff0193e9fc1c1fb504dd840331
XORG_LIB_XEXT := libXext-$(XORG_LIB_XEXT_VERSION)
XORG_LIB_XEXT_SUFFIX := tar.bz2
-XORG_LIB_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
+XORG_LIB_XEXT_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX))
XORG_LIB_XEXT_SOURCE := $(SRCDIR)/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
XORG_LIB_XEXT_DIR := $(BUILDDIR)/$(XORG_LIB_XEXT)
diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make
index 70ed44b8b..3ac832818 100644
--- a/rules/xorg-lib-Xfixes.make
+++ b/rules/xorg-lib-Xfixes.make
@@ -20,7 +20,7 @@ XORG_LIB_XFIXES_VERSION := 4.0.5
XORG_LIB_XFIXES_MD5 := 1b4b8386bd5d1751b2c7177223ad4629
XORG_LIB_XFIXES := libXfixes-$(XORG_LIB_XFIXES_VERSION)
XORG_LIB_XFIXES_SUFFIX := tar.bz2
-XORG_LIB_XFIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
+XORG_LIB_XFIXES_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX))
XORG_LIB_XFIXES_SOURCE := $(SRCDIR)/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
XORG_LIB_XFIXES_DIR := $(BUILDDIR)/$(XORG_LIB_XFIXES)
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index ce979399a..6d218ecd7 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -20,7 +20,7 @@ XORG_LIB_XFONT_VERSION := 1.4.3
XORG_LIB_XFONT_MD5 := 6fb689cfe13d8d9460f4abb5bd88588d
XORG_LIB_XFONT := libXfont-$(XORG_LIB_XFONT_VERSION)
XORG_LIB_XFONT_SUFFIX := tar.bz2
-XORG_LIB_XFONT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
+XORG_LIB_XFONT_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX))
XORG_LIB_XFONT_SOURCE := $(SRCDIR)/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
XORG_LIB_XFONT_DIR := $(BUILDDIR)/$(XORG_LIB_XFONT)
diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make
index 4a4479d43..052148673 100644
--- a/rules/xorg-lib-Xft.make
+++ b/rules/xorg-lib-Xft.make
@@ -20,7 +20,7 @@ XORG_LIB_XFT_VERSION := 2.2.0
XORG_LIB_XFT_MD5 := cce3c327258116493b753f157e0360c7
XORG_LIB_XFT := libXft-$(XORG_LIB_XFT_VERSION)
XORG_LIB_XFT_SUFFIX := tar.bz2
-XORG_LIB_XFT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
+XORG_LIB_XFT_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX))
XORG_LIB_XFT_SOURCE := $(SRCDIR)/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
XORG_LIB_XFT_DIR := $(BUILDDIR)/$(XORG_LIB_XFT)
diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make
index ed67fa7ce..7742878bd 100644
--- a/rules/xorg-lib-Xi.make
+++ b/rules/xorg-lib-Xi.make
@@ -21,7 +21,7 @@ XORG_LIB_XI_VERSION := 1.4.0
XORG_LIB_XI_MD5 := 4ccdfe866f94c99b9190d16ffcfb3bdc
XORG_LIB_XI := libXi-$(XORG_LIB_XI_VERSION)
XORG_LIB_XI_SUFFIX := tar.bz2
-XORG_LIB_XI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
+XORG_LIB_XI_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX))
XORG_LIB_XI_SOURCE := $(SRCDIR)/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
XORG_LIB_XI_DIR := $(BUILDDIR)/$(XORG_LIB_XI)
diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make
index a8a78b9cc..732ea2cc3 100644
--- a/rules/xorg-lib-Xinerama.make
+++ b/rules/xorg-lib-Xinerama.make
@@ -20,7 +20,7 @@ XORG_LIB_XINERAMA_VERSION := 1.1.1
XORG_LIB_XINERAMA_MD5 := ecd4839ad01f6f637c6fb5327207f89b
XORG_LIB_XINERAMA := libXinerama-$(XORG_LIB_XINERAMA_VERSION)
XORG_LIB_XINERAMA_SUFFIX := tar.bz2
-XORG_LIB_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
+XORG_LIB_XINERAMA_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX))
XORG_LIB_XINERAMA_SOURCE := $(SRCDIR)/$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
XORG_LIB_XINERAMA_DIR := $(BUILDDIR)/$(XORG_LIB_XINERAMA)
diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make
index c771e44d6..1694bf4c0 100644
--- a/rules/xorg-lib-Xmu.make
+++ b/rules/xorg-lib-Xmu.make
@@ -20,7 +20,7 @@ XORG_LIB_XMU_VERSION := 1.1.0
XORG_LIB_XMU_MD5 := 6836883a0120e8346cf7f58dc42e465a
XORG_LIB_XMU := libXmu-$(XORG_LIB_XMU_VERSION)
XORG_LIB_XMU_SUFFIX := tar.bz2
-XORG_LIB_XMU_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
+XORG_LIB_XMU_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX))
XORG_LIB_XMU_SOURCE := $(SRCDIR)/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
XORG_LIB_XMU_DIR := $(BUILDDIR)/$(XORG_LIB_XMU)
diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make
index 3c1a093d6..cb45941f1 100644
--- a/rules/xorg-lib-Xp.make
+++ b/rules/xorg-lib-Xp.make
@@ -20,7 +20,7 @@ XORG_LIB_XP_VERSION := 1.0.0
XORG_LIB_XP_MD5 := 0f4ac39108c1ae8c443cdfac259b58fa
XORG_LIB_XP := libXp-$(XORG_LIB_XP_VERSION)
XORG_LIB_XP_SUFFIX := tar.bz2
-XORG_LIB_XP_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
+XORG_LIB_XP_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX))
XORG_LIB_XP_SOURCE := $(SRCDIR)/$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
XORG_LIB_XP_DIR := $(BUILDDIR)/$(XORG_LIB_XP)
diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make
index 2c0f5f4f9..f8851402a 100644
--- a/rules/xorg-lib-Xpm.make
+++ b/rules/xorg-lib-Xpm.make
@@ -20,7 +20,7 @@ XORG_LIB_XPM_VERSION := 3.5.9
XORG_LIB_XPM_MD5 := 2de3a1b9541f4b3a6f9d84b69d25530e
XORG_LIB_XPM := libXpm-$(XORG_LIB_XPM_VERSION)
XORG_LIB_XPM_SUFFIX := tar.bz2
-XORG_LIB_XPM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
+XORG_LIB_XPM_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX))
XORG_LIB_XPM_SOURCE := $(SRCDIR)/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
XORG_LIB_XPM_DIR := $(BUILDDIR)/$(XORG_LIB_XPM)
diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make
index 027a28690..e9775500d 100644
--- a/rules/xorg-lib-XprintAppUtil.make
+++ b/rules/xorg-lib-XprintAppUtil.make
@@ -20,7 +20,7 @@ XORG_LIB_XPRINTAPPUTIL_VERSION := 1.0.1
XORG_LIB_XPRINTAPPUTIL_MD5 := d2de510570aa6714681109b2ba178365
XORG_LIB_XPRINTAPPUTIL := libXprintAppUtil-$(XORG_LIB_XPRINTAPPUTIL_VERSION)
XORG_LIB_XPRINTAPPUTIL_SUFFIX := tar.bz2
-XORG_LIB_XPRINTAPPUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
+XORG_LIB_XPRINTAPPUTIL_URL := $(call ptx/mirror, XORG, individual/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX))
XORG_LIB_XPRINTAPPUTIL_SOURCE := $(SRCDIR)/$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
XORG_LIB_XPRINTAPPUTIL_DIR := $(BUILDDIR)/$(XORG_LIB_XPRINTAPPUTIL)
diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make
index c0f06bc2d..1fadcfb11 100644
--- a/rules/xorg-lib-XprintUtil.make
+++ b/rules/xorg-lib-XprintUtil.make
@@ -20,7 +20,7 @@ XORG_LIB_XPRINTUTIL_VERSION := 1.0.1
XORG_LIB_XPRINTUTIL_MD5 := 22584f1aab1deba253949b562d1f0f45
XORG_LIB_XPRINTUTIL := libXprintUtil-$(XORG_LIB_XPRINTUTIL_VERSION)
XORG_LIB_XPRINTUTIL_SUFFIX := tar.bz2
-XORG_LIB_XPRINTUTIL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
+XORG_LIB_XPRINTUTIL_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX))
XORG_LIB_XPRINTUTIL_SOURCE := $(SRCDIR)/$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
XORG_LIB_XPRINTUTIL_DIR := $(BUILDDIR)/$(XORG_LIB_XPRINTUTIL)
diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make
index f70c8e32c..72f66ebc3 100644
--- a/rules/xorg-lib-Xrandr.make
+++ b/rules/xorg-lib-Xrandr.make
@@ -20,7 +20,7 @@ XORG_LIB_XRANDR_VERSION := 1.3.1
XORG_LIB_XRANDR_MD5 := 7785c3f7cff2735c94657e8f87ed8ad3
XORG_LIB_XRANDR := libXrandr-$(XORG_LIB_XRANDR_VERSION)
XORG_LIB_XRANDR_SUFFIX := tar.bz2
-XORG_LIB_XRANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
+XORG_LIB_XRANDR_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX))
XORG_LIB_XRANDR_SOURCE := $(SRCDIR)/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
XORG_LIB_XRANDR_DIR := $(BUILDDIR)/$(XORG_LIB_XRANDR)
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index 4cd8b458a..73eb52140 100644
--- a/rules/xorg-lib-Xrender.make
+++ b/rules/xorg-lib-Xrender.make
@@ -20,7 +20,7 @@ XORG_LIB_XRENDER_VERSION := 0.9.6
XORG_LIB_XRENDER_MD5 := 3b3b7d076c2384b6c600c0b5f4ba971f
XORG_LIB_XRENDER := libXrender-$(XORG_LIB_XRENDER_VERSION)
XORG_LIB_XRENDER_SUFFIX := tar.bz2
-XORG_LIB_XRENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
+XORG_LIB_XRENDER_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX))
XORG_LIB_XRENDER_SOURCE := $(SRCDIR)/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
XORG_LIB_XRENDER_DIR := $(BUILDDIR)/$(XORG_LIB_XRENDER)
diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make
index 55e28a685..2b05bc301 100644
--- a/rules/xorg-lib-Xres.make
+++ b/rules/xorg-lib-Xres.make
@@ -20,7 +20,7 @@ XORG_LIB_XRES_VERSION := 1.0.5
XORG_LIB_XRES_MD5 := d08f0b6df3f96c051637d37009f4e55a
XORG_LIB_XRES := libXres-$(XORG_LIB_XRES_VERSION)
XORG_LIB_XRES_SUFFIX := tar.bz2
-XORG_LIB_XRES_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
+XORG_LIB_XRES_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX))
XORG_LIB_XRES_SOURCE := $(SRCDIR)/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
XORG_LIB_XRES_DIR := $(BUILDDIR)/$(XORG_LIB_XRES)
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 5ab091de9..a9394a322 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -20,7 +20,7 @@ XORG_LIB_XT_VERSION := 1.0.9
XORG_LIB_XT_MD5 := 8a414f8f2327aaa616ca2dcac1f5d8c3
XORG_LIB_XT := libXt-$(XORG_LIB_XT_VERSION)
XORG_LIB_XT_SUFFIX := tar.bz2
-XORG_LIB_XT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
+XORG_LIB_XT_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX))
XORG_LIB_XT_SOURCE := $(SRCDIR)/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
XORG_LIB_XT_DIR := $(BUILDDIR)/$(XORG_LIB_XT)
diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make
index bdffad3d4..5a0f371da 100644
--- a/rules/xorg-lib-Xtst.make
+++ b/rules/xorg-lib-Xtst.make
@@ -21,7 +21,7 @@ XORG_LIB_XTST_VERSION := 1.2.0
XORG_LIB_XTST_MD5 := 7c592c72da6676f8b0aeec9133b81686
XORG_LIB_XTST := libXtst-$(XORG_LIB_XTST_VERSION)
XORG_LIB_XTST_SUFFIX := tar.bz2
-XORG_LIB_XTST_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
+XORG_LIB_XTST_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX))
XORG_LIB_XTST_SOURCE := $(SRCDIR)/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
XORG_LIB_XTST_DIR := $(BUILDDIR)/$(XORG_LIB_XTST)
diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make
index 2c9abc01d..61314103b 100644
--- a/rules/xorg-lib-Xv.make
+++ b/rules/xorg-lib-Xv.make
@@ -20,7 +20,7 @@ XORG_LIB_XV_VERSION := 1.0.6
XORG_LIB_XV_MD5 := e292445a64b63e918bbc8b6aae6391dd
XORG_LIB_XV := libXv-$(XORG_LIB_XV_VERSION)
XORG_LIB_XV_SUFFIX := tar.bz2
-XORG_LIB_XV_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
+XORG_LIB_XV_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX))
XORG_LIB_XV_SOURCE := $(SRCDIR)/$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
XORG_LIB_XV_DIR := $(BUILDDIR)/$(XORG_LIB_XV)
diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make
index 85a5758a4..2f8bc30b8 100644
--- a/rules/xorg-lib-XvMC.make
+++ b/rules/xorg-lib-XvMC.make
@@ -21,7 +21,7 @@ XORG_LIB_XVMC_VERSION := 1.0.6
XORG_LIB_XVMC_MD5 := bfc7524646f890dfc30dea1d676004a3
XORG_LIB_XVMC := libXvMC-$(XORG_LIB_XVMC_VERSION)
XORG_LIB_XVMC_SUFFIX := tar.bz2
-XORG_LIB_XVMC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
+XORG_LIB_XVMC_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX))
XORG_LIB_XVMC_SOURCE := $(SRCDIR)/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
XORG_LIB_XVMC_DIR := $(BUILDDIR)/$(XORG_LIB_XVMC)
diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make
index c6d7eb48c..c921542d1 100644
--- a/rules/xorg-lib-Xxf86dga.make
+++ b/rules/xorg-lib-Xxf86dga.make
@@ -20,7 +20,7 @@ XORG_LIB_XXF86DGA_VERSION := 1.1.2
XORG_LIB_XXF86DGA_MD5 := bbd5fdf63d4c107c8cb710d4df2012b4
XORG_LIB_XXF86DGA := libXxf86dga-$(XORG_LIB_XXF86DGA_VERSION)
XORG_LIB_XXF86DGA_SUFFIX := tar.bz2
-XORG_LIB_XXF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
+XORG_LIB_XXF86DGA_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX))
XORG_LIB_XXF86DGA_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
XORG_LIB_XXF86DGA_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86DGA)
diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make
index 8a9318f5a..9cd3e050e 100644
--- a/rules/xorg-lib-Xxf86misc.make
+++ b/rules/xorg-lib-Xxf86misc.make
@@ -21,7 +21,7 @@ XORG_LIB_XXF86MISC_VERSION := 1.0.3
XORG_LIB_XXF86MISC_MD5 := 6bc0bf78909fd71021c466c793d4385c
XORG_LIB_XXF86MISC := libXxf86misc-$(XORG_LIB_XXF86MISC_VERSION)
XORG_LIB_XXF86MISC_SUFFIX := tar.bz2
-XORG_LIB_XXF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
+XORG_LIB_XXF86MISC_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX))
XORG_LIB_XXF86MISC_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
XORG_LIB_XXF86MISC_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86MISC)
diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make
index 5005cf57e..67fbea7cb 100644
--- a/rules/xorg-lib-Xxf86vm.make
+++ b/rules/xorg-lib-Xxf86vm.make
@@ -20,7 +20,7 @@ XORG_LIB_XXF86VM_VERSION := 1.1.1
XORG_LIB_XXF86VM_MD5 := 34dc3df888c164378da89a7deeb245a0
XORG_LIB_XXF86VM := libXxf86vm-$(XORG_LIB_XXF86VM_VERSION)
XORG_LIB_XXF86VM_SUFFIX := tar.bz2
-XORG_LIB_XXF86VM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
+XORG_LIB_XXF86VM_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX))
XORG_LIB_XXF86VM_SOURCE := $(SRCDIR)/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
XORG_LIB_XXF86VM_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86VM)
diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make
index bd2f683d1..78b3300fe 100644
--- a/rules/xorg-lib-dmx.make
+++ b/rules/xorg-lib-dmx.make
@@ -21,7 +21,7 @@ XORG_LIB_DMX_VERSION := 1.1.1
XORG_LIB_DMX_MD5 := 75fd328fab3bd4a55cccaa6d5dfff749
XORG_LIB_DMX := libdmx-$(XORG_LIB_DMX_VERSION)
XORG_LIB_DMX_SUFFIX := tar.bz2
-XORG_LIB_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
+XORG_LIB_DMX_URL := $(call ptx/mirror, XORG, individual/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX))
XORG_LIB_DMX_SOURCE := $(SRCDIR)/$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
XORG_LIB_DMX_DIR := $(BUILDDIR)/$(XORG_LIB_DMX)
diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make
index 582b4bd04..add835bb4 100644
--- a/rules/xorg-lib-fontenc.make
+++ b/rules/xorg-lib-fontenc.make
@@ -20,7 +20,7 @@ XORG_LIB_FONTENC_VERSION := 1.1.0
XORG_LIB_FONTENC_MD5 := 11d3c292f05a90f6f67840a9e9c3d9b8
XORG_LIB_FONTENC := libfontenc-$(XORG_LIB_FONTENC_VERSION)
XORG_LIB_FONTENC_SUFFIX := tar.bz2
-XORG_LIB_FONTENC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
+XORG_LIB_FONTENC_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX))
XORG_LIB_FONTENC_SOURCE := $(SRCDIR)/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
XORG_LIB_FONTENC_DIR := $(BUILDDIR)/$(XORG_LIB_FONTENC)
diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make
index 76b0adbac..fe64a4b6a 100644
--- a/rules/xorg-lib-oldX.make
+++ b/rules/xorg-lib-oldX.make
@@ -21,7 +21,7 @@ XORG_LIB_OLDX_VERSION := 1.0.1
XORG_LIB_OLDX_MD5 := 6b81ffe486d76c380d08f92285758d84
XORG_LIB_OLDX := liboldX-$(XORG_LIB_OLDX_VERSION)
XORG_LIB_OLDX_SUFFIX := tar.bz2
-XORG_LIB_OLDX_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
+XORG_LIB_OLDX_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX))
XORG_LIB_OLDX_SOURCE := $(SRCDIR)/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
XORG_LIB_OLDX_DIR := $(BUILDDIR)/$(XORG_LIB_OLDX)
diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make
index 1c01ec50f..837f47406 100644
--- a/rules/xorg-lib-xkbfile.make
+++ b/rules/xorg-lib-xkbfile.make
@@ -20,7 +20,7 @@ XORG_LIB_XKBFILE_VERSION := 1.0.7
XORG_LIB_XKBFILE_MD5 := 59b4fe0bdf8d9b05e45b59e8fe9e7516
XORG_LIB_XKBFILE := libxkbfile-$(XORG_LIB_XKBFILE_VERSION)
XORG_LIB_XKBFILE_SUFFIX := tar.bz2
-XORG_LIB_XKBFILE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
+XORG_LIB_XKBFILE_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX))
XORG_LIB_XKBFILE_SOURCE := $(SRCDIR)/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
XORG_LIB_XKBFILE_DIR := $(BUILDDIR)/$(XORG_LIB_XKBFILE)
diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make
index 6286d4868..681712e3c 100644
--- a/rules/xorg-lib-xkbui.make
+++ b/rules/xorg-lib-xkbui.make
@@ -21,7 +21,7 @@ XORG_LIB_XKBUI_VERSION := 1.0.2
XORG_LIB_XKBUI_MD5 := 1143e456f7429e18e88f2eadb2f2b6b1
XORG_LIB_XKBUI := libxkbui-$(XORG_LIB_XKBUI_VERSION)
XORG_LIB_XKBUI_SUFFIX := tar.bz2
-XORG_LIB_XKBUI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
+XORG_LIB_XKBUI_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX))
XORG_LIB_XKBUI_SOURCE := $(SRCDIR)/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
XORG_LIB_XKBUI_DIR := $(BUILDDIR)/$(XORG_LIB_XKBUI)
diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make
index b48e4887b..1e266a210 100644
--- a/rules/xorg-lib-xtrans.make
+++ b/rules/xorg-lib-xtrans.make
@@ -21,7 +21,7 @@ XORG_LIB_XTRANS_VERSION := 1.2.6
XORG_LIB_XTRANS_MD5 := c66f9ffd2da4fb012220c6c40ebc7609
XORG_LIB_XTRANS := xtrans-$(XORG_LIB_XTRANS_VERSION)
XORG_LIB_XTRANS_SUFFIX := tar.bz2
-XORG_LIB_XTRANS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
+XORG_LIB_XTRANS_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX))
XORG_LIB_XTRANS_SOURCE := $(SRCDIR)/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
XORG_LIB_XTRANS_DIR := $(BUILDDIR)/$(XORG_LIB_XTRANS)
diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make
index 08400f716..fbc05e296 100644
--- a/rules/xorg-proto-bigreqs.make
+++ b/rules/xorg-proto-bigreqs.make
@@ -22,7 +22,7 @@ XORG_PROTO_BIGREQS_VERSION := 1.1.1
XORG_PROTO_BIGREQS_MD5 := 6f6c24436c2b3ab235eb14a85b9aaacf
XORG_PROTO_BIGREQS := bigreqsproto-$(XORG_PROTO_BIGREQS_VERSION)
XORG_PROTO_BIGREQS_SUFFIX := tar.bz2
-XORG_PROTO_BIGREQS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
+XORG_PROTO_BIGREQS_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX))
XORG_PROTO_BIGREQS_SOURCE := $(SRCDIR)/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
XORG_PROTO_BIGREQS_DIR := $(BUILDDIR)/$(XORG_PROTO_BIGREQS)
diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make
index f6b7dea22..819b78c49 100644
--- a/rules/xorg-proto-composite.make
+++ b/rules/xorg-proto-composite.make
@@ -22,7 +22,7 @@ XORG_PROTO_COMPOSITE_VERSION := 0.4.2
XORG_PROTO_COMPOSITE_MD5 := 98482f65ba1e74a08bf5b056a4031ef0
XORG_PROTO_COMPOSITE := compositeproto-$(XORG_PROTO_COMPOSITE_VERSION)
XORG_PROTO_COMPOSITE_SUFFIX := tar.bz2
-XORG_PROTO_COMPOSITE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
+XORG_PROTO_COMPOSITE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX))
XORG_PROTO_COMPOSITE_SOURCE := $(SRCDIR)/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
XORG_PROTO_COMPOSITE_DIR := $(BUILDDIR)/$(XORG_PROTO_COMPOSITE)
diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make
index 32fdb2a61..338bcfd2a 100644
--- a/rules/xorg-proto-damage.make
+++ b/rules/xorg-proto-damage.make
@@ -22,7 +22,7 @@ XORG_PROTO_DAMAGE_VERSION := 1.2.1
XORG_PROTO_DAMAGE_MD5 := 998e5904764b82642cc63d97b4ba9e95
XORG_PROTO_DAMAGE := damageproto-$(XORG_PROTO_DAMAGE_VERSION)
XORG_PROTO_DAMAGE_SUFFIX := tar.bz2
-XORG_PROTO_DAMAGE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
+XORG_PROTO_DAMAGE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX))
XORG_PROTO_DAMAGE_SOURCE := $(SRCDIR)/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
XORG_PROTO_DAMAGE_DIR := $(BUILDDIR)/$(XORG_PROTO_DAMAGE)
diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make
index 5ab5a160c..a788c9a6f 100644
--- a/rules/xorg-proto-dmx.make
+++ b/rules/xorg-proto-dmx.make
@@ -22,7 +22,7 @@ XORG_PROTO_DMX_VERSION := 2.3
XORG_PROTO_DMX_MD5 := 880a41720b2937e2660dcdc0d34a8791
XORG_PROTO_DMX := dmxproto-$(XORG_PROTO_DMX_VERSION)
XORG_PROTO_DMX_SUFFIX := tar.bz2
-XORG_PROTO_DMX_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
+XORG_PROTO_DMX_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX))
XORG_PROTO_DMX_SOURCE := $(SRCDIR)/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
XORG_PROTO_DMX_DIR := $(BUILDDIR)/$(XORG_PROTO_DMX)
diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make
index 380c93461..7b880257d 100644
--- a/rules/xorg-proto-evieext.make
+++ b/rules/xorg-proto-evieext.make
@@ -22,7 +22,7 @@ XORG_PROTO_EVIEEXT_VERSION := 1.1.0
XORG_PROTO_EVIEEXT_MD5 := 5c74f61d6f77b2e6a083b2b31000be42
XORG_PROTO_EVIEEXT := evieext-$(XORG_PROTO_EVIEEXT_VERSION)
XORG_PROTO_EVIEEXT_SUFFIX := tar.bz2
-XORG_PROTO_EVIEEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
+XORG_PROTO_EVIEEXT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX))
XORG_PROTO_EVIEEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
XORG_PROTO_EVIEEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_EVIEEXT)
diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make
index 7b80442a2..a18c29237 100644
--- a/rules/xorg-proto-fixes.make
+++ b/rules/xorg-proto-fixes.make
@@ -22,7 +22,7 @@ XORG_PROTO_FIXES_VERSION := 4.1.2
XORG_PROTO_FIXES_MD5 := bdb58ecc313b509247036d5c11fa99df
XORG_PROTO_FIXES := fixesproto-$(XORG_PROTO_FIXES_VERSION)
XORG_PROTO_FIXES_SUFFIX := tar.bz2
-XORG_PROTO_FIXES_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
+XORG_PROTO_FIXES_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX))
XORG_PROTO_FIXES_SOURCE := $(SRCDIR)/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
XORG_PROTO_FIXES_DIR := $(BUILDDIR)/$(XORG_PROTO_FIXES)
diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make
index ad52024a9..250bd1c3f 100644
--- a/rules/xorg-proto-fonts.make
+++ b/rules/xorg-proto-fonts.make
@@ -22,7 +22,7 @@ XORG_PROTO_FONTS_VERSION := 2.1.1
XORG_PROTO_FONTS_MD5 := 37102ffcaa73f77d700acd6f7a25d8f0
XORG_PROTO_FONTS := fontsproto-$(XORG_PROTO_FONTS_VERSION)
XORG_PROTO_FONTS_SUFFIX := tar.bz2
-XORG_PROTO_FONTS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
+XORG_PROTO_FONTS_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX))
XORG_PROTO_FONTS_SOURCE := $(SRCDIR)/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
XORG_PROTO_FONTS_DIR := $(BUILDDIR)/$(XORG_PROTO_FONTS)
diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make
index 711a1562a..c6727a59b 100644
--- a/rules/xorg-proto-gl.make
+++ b/rules/xorg-proto-gl.make
@@ -22,7 +22,7 @@ XORG_PROTO_GL_VERSION := 1.4.12
XORG_PROTO_GL_MD5 := 55edc5ff2efb734215c868f72f7cf27e
XORG_PROTO_GL := glproto-$(XORG_PROTO_GL_VERSION)
XORG_PROTO_GL_SUFFIX := tar.bz2
-XORG_PROTO_GL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
+XORG_PROTO_GL_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX))
XORG_PROTO_GL_SOURCE := $(SRCDIR)/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
XORG_PROTO_GL_DIR := $(BUILDDIR)/$(XORG_PROTO_GL)
diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make
index 21c575455..d3098443a 100644
--- a/rules/xorg-proto-input.make
+++ b/rules/xorg-proto-input.make
@@ -22,7 +22,7 @@ XORG_PROTO_INPUT_VERSION:= 2.0.1
XORG_PROTO_INPUT_MD5 := da9bf9e5d174163f597d2d72757d9038
XORG_PROTO_INPUT := inputproto-$(XORG_PROTO_INPUT_VERSION)
XORG_PROTO_INPUT_SUFFIX := tar.bz2
-XORG_PROTO_INPUT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
+XORG_PROTO_INPUT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX))
XORG_PROTO_INPUT_SOURCE := $(SRCDIR)/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
XORG_PROTO_INPUT_DIR := $(BUILDDIR)/$(XORG_PROTO_INPUT)
diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make
index f2367d5a4..4ef93d068 100644
--- a/rules/xorg-proto-kb.make
+++ b/rules/xorg-proto-kb.make
@@ -22,7 +22,7 @@ XORG_PROTO_KB_VERSION := 1.0.5
XORG_PROTO_KB_MD5 := e7edb59a3f54af15f749e8f3e314ee62
XORG_PROTO_KB := kbproto-$(XORG_PROTO_KB_VERSION)
XORG_PROTO_KB_SUFFIX := tar.bz2
-XORG_PROTO_KB_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
+XORG_PROTO_KB_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX))
XORG_PROTO_KB_SOURCE := $(SRCDIR)/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
XORG_PROTO_KB_DIR := $(BUILDDIR)/$(XORG_PROTO_KB)
diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make
index 111ba14d1..5f1dc3285 100644
--- a/rules/xorg-proto-print.make
+++ b/rules/xorg-proto-print.make
@@ -22,7 +22,7 @@ XORG_PROTO_PRINT_VERSION:= 1.0.4
XORG_PROTO_PRINT_MD5 := 7321847a60748b4d2f1fa16db4b6ede8
XORG_PROTO_PRINT := printproto-$(XORG_PROTO_PRINT_VERSION)
XORG_PROTO_PRINT_SUFFIX := tar.bz2
-XORG_PROTO_PRINT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
+XORG_PROTO_PRINT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX))
XORG_PROTO_PRINT_SOURCE := $(SRCDIR)/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
XORG_PROTO_PRINT_DIR := $(BUILDDIR)/$(XORG_PROTO_PRINT)
diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make
index 8aced5fb4..9efd04e44 100644
--- a/rules/xorg-proto-randr.make
+++ b/rules/xorg-proto-randr.make
@@ -22,7 +22,7 @@ XORG_PROTO_RANDR_VERSION:= 1.3.2
XORG_PROTO_RANDR_MD5 := 597491c0d8055e2a66f11350c4985775
XORG_PROTO_RANDR := randrproto-$(XORG_PROTO_RANDR_VERSION)
XORG_PROTO_RANDR_SUFFIX := tar.bz2
-XORG_PROTO_RANDR_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
+XORG_PROTO_RANDR_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX))
XORG_PROTO_RANDR_SOURCE := $(SRCDIR)/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
XORG_PROTO_RANDR_DIR := $(BUILDDIR)/$(XORG_PROTO_RANDR)
diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make
index f7ef9f577..2f8075af0 100644
--- a/rules/xorg-proto-record.make
+++ b/rules/xorg-proto-record.make
@@ -22,7 +22,7 @@ XORG_PROTO_RECORD_VERSION := 1.14.1
XORG_PROTO_RECORD_MD5 := 24541a30b399213def35f48efd926c63
XORG_PROTO_RECORD := recordproto-$(XORG_PROTO_RECORD_VERSION)
XORG_PROTO_RECORD_SUFFIX := tar.bz2
-XORG_PROTO_RECORD_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
+XORG_PROTO_RECORD_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX))
XORG_PROTO_RECORD_SOURCE := $(SRCDIR)/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
XORG_PROTO_RECORD_DIR := $(BUILDDIR)/$(XORG_PROTO_RECORD)
diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make
index bf54b2874..4c81e7816 100644
--- a/rules/xorg-proto-render.make
+++ b/rules/xorg-proto-render.make
@@ -22,7 +22,7 @@ XORG_PROTO_RENDER_VERSION := 0.11.1
XORG_PROTO_RENDER_MD5 := a914ccc1de66ddeb4b611c6b0686e274
XORG_PROTO_RENDER := renderproto-$(XORG_PROTO_RENDER_VERSION)
XORG_PROTO_RENDER_SUFFIX := tar.bz2
-XORG_PROTO_RENDER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
+XORG_PROTO_RENDER_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX))
XORG_PROTO_RENDER_SOURCE := $(SRCDIR)/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
XORG_PROTO_RENDER_DIR := $(BUILDDIR)/$(XORG_PROTO_RENDER)
diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make
index cec744455..9fa0a8dd4 100644
--- a/rules/xorg-proto-resource.make
+++ b/rules/xorg-proto-resource.make
@@ -22,7 +22,7 @@ XORG_PROTO_RESOURCE_VERSION := 1.1.1
XORG_PROTO_RESOURCE_MD5 := 8ff0525ae7502b48597b78d00bc22284
XORG_PROTO_RESOURCE := resourceproto-$(XORG_PROTO_RESOURCE_VERSION)
XORG_PROTO_RESOURCE_SUFFIX := tar.bz2
-XORG_PROTO_RESOURCE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
+XORG_PROTO_RESOURCE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX))
XORG_PROTO_RESOURCE_SOURCE := $(SRCDIR)/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
XORG_PROTO_RESOURCE_DIR := $(BUILDDIR)/$(XORG_PROTO_RESOURCE)
diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make
index 3066b90ad..e0b36222b 100644
--- a/rules/xorg-proto-scrnsaver.make
+++ b/rules/xorg-proto-scrnsaver.make
@@ -22,7 +22,7 @@ XORG_PROTO_SCRNSAVER_VERSION := 1.2.1
XORG_PROTO_SCRNSAVER_MD5 := 6af0f2e3369f5f74e69345e214f5fd0d
XORG_PROTO_SCRNSAVER := scrnsaverproto-$(XORG_PROTO_SCRNSAVER_VERSION)
XORG_PROTO_SCRNSAVER_SUFFIX := tar.bz2
-XORG_PROTO_SCRNSAVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
+XORG_PROTO_SCRNSAVER_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX))
XORG_PROTO_SCRNSAVER_SOURCE := $(SRCDIR)/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
XORG_PROTO_SCRNSAVER_DIR := $(BUILDDIR)/$(XORG_PROTO_SCRNSAVER)
diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make
index ca5df1633..f49598ff5 100644
--- a/rules/xorg-proto-video.make
+++ b/rules/xorg-proto-video.make
@@ -22,7 +22,7 @@ XORG_PROTO_VIDEO_VERSION:= 2.3.1
XORG_PROTO_VIDEO_MD5 := c3b348c6e2031b72b11ae63fc7f805c2
XORG_PROTO_VIDEO := videoproto-$(XORG_PROTO_VIDEO_VERSION)
XORG_PROTO_VIDEO_SUFFIX := tar.bz2
-XORG_PROTO_VIDEO_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
+XORG_PROTO_VIDEO_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX))
XORG_PROTO_VIDEO_SOURCE := $(SRCDIR)/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
XORG_PROTO_VIDEO_DIR := $(BUILDDIR)/$(XORG_PROTO_VIDEO)
diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make
index c851a2383..1d5282550 100644
--- a/rules/xorg-proto-windowswm.make
+++ b/rules/xorg-proto-windowswm.make
@@ -22,7 +22,7 @@ XORG_PROTO_WINDOWSWM_VERSION := 1.0.4
XORG_PROTO_WINDOWSWM_MD5 := e74b2ff3172a6117f2a62b655ef99064
XORG_PROTO_WINDOWSWM := windowswmproto-$(XORG_PROTO_WINDOWSWM_VERSION)
XORG_PROTO_WINDOWSWM_SUFFIX := tar.bz2
-XORG_PROTO_WINDOWSWM_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
+XORG_PROTO_WINDOWSWM_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX))
XORG_PROTO_WINDOWSWM_SOURCE := $(SRCDIR)/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
XORG_PROTO_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_PROTO_WINDOWSWM)
diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make
index 1b7bc45e5..c547bea65 100644
--- a/rules/xorg-proto-x.make
+++ b/rules/xorg-proto-x.make
@@ -21,7 +21,7 @@ XORG_PROTO_X_VERSION := 7.0.20
XORG_PROTO_X_MD5 := 65633168e5315c19defb4652cd3d83c1
XORG_PROTO_X := xproto-$(XORG_PROTO_X_VERSION)
XORG_PROTO_X_SUFFIX := tar.bz2
-XORG_PROTO_X_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
+XORG_PROTO_X_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX))
XORG_PROTO_X_SOURCE := $(SRCDIR)/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
XORG_PROTO_X_DIR := $(BUILDDIR)/$(XORG_PROTO_X)
diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make
index 436ba3cdc..a1910ada9 100644
--- a/rules/xorg-proto-xcmisc.make
+++ b/rules/xorg-proto-xcmisc.make
@@ -22,7 +22,7 @@ XORG_PROTO_XCMISC_VERSION := 1.2.1
XORG_PROTO_XCMISC_MD5 := cd7372cd827bfd7ca7e9238f2ce274b1
XORG_PROTO_XCMISC := xcmiscproto-$(XORG_PROTO_XCMISC_VERSION)
XORG_PROTO_XCMISC_SUFFIX := tar.bz2
-XORG_PROTO_XCMISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
+XORG_PROTO_XCMISC_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX))
XORG_PROTO_XCMISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
XORG_PROTO_XCMISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XCMISC)
diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make
index 92eb3dd44..60af1da60 100644
--- a/rules/xorg-proto-xext.make
+++ b/rules/xorg-proto-xext.make
@@ -21,7 +21,7 @@ XORG_PROTO_XEXT_VERSION := 7.1.2
XORG_PROTO_XEXT_MD5 := 263ae968b223c23b2986603d84e5c30e
XORG_PROTO_XEXT := xextproto-$(XORG_PROTO_XEXT_VERSION)
XORG_PROTO_XEXT_SUFFIX := tar.bz2
-XORG_PROTO_XEXT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
+XORG_PROTO_XEXT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX))
XORG_PROTO_XEXT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
XORG_PROTO_XEXT_DIR := $(BUILDDIR)/$(XORG_PROTO_XEXT)
diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make
index dbbbeb14a..d4f12e061 100644
--- a/rules/xorg-proto-xf86bigfont.make
+++ b/rules/xorg-proto-xf86bigfont.make
@@ -22,7 +22,7 @@ XORG_PROTO_XF86BIGFONT_VERSION := 1.2.0
XORG_PROTO_XF86BIGFONT_MD5 := 120e226ede5a4687b25dd357cc9b8efe
XORG_PROTO_XF86BIGFONT := xf86bigfontproto-$(XORG_PROTO_XF86BIGFONT_VERSION)
XORG_PROTO_XF86BIGFONT_SUFFIX := tar.bz2
-XORG_PROTO_XF86BIGFONT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
+XORG_PROTO_XF86BIGFONT_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX))
XORG_PROTO_XF86BIGFONT_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
XORG_PROTO_XF86BIGFONT_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86BIGFONT)
diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make
index 71e1d5fd6..e202787a8 100644
--- a/rules/xorg-proto-xf86dga.make
+++ b/rules/xorg-proto-xf86dga.make
@@ -22,7 +22,7 @@ XORG_PROTO_XF86DGA_VERSION := 2.1
XORG_PROTO_XF86DGA_MD5 := a036dc2fcbf052ec10621fd48b68dbb1
XORG_PROTO_XF86DGA := xf86dgaproto-$(XORG_PROTO_XF86DGA_VERSION)
XORG_PROTO_XF86DGA_SUFFIX := tar.bz2
-XORG_PROTO_XF86DGA_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
+XORG_PROTO_XF86DGA_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX))
XORG_PROTO_XF86DGA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
XORG_PROTO_XF86DGA_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DGA)
diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make
index 23912288c..792b9d4ea 100644
--- a/rules/xorg-proto-xf86dri.make
+++ b/rules/xorg-proto-xf86dri.make
@@ -22,7 +22,7 @@ XORG_PROTO_XF86DRI_VERSION := 2.1.0
XORG_PROTO_XF86DRI_MD5 := 309d552732666c3333d7dc63e80d042f
XORG_PROTO_XF86DRI := xf86driproto-$(XORG_PROTO_XF86DRI_VERSION)
XORG_PROTO_XF86DRI_SUFFIX := tar.bz2
-XORG_PROTO_XF86DRI_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
+XORG_PROTO_XF86DRI_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX))
XORG_PROTO_XF86DRI_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
XORG_PROTO_XF86DRI_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86DRI)
diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make
index 5b2b805fc..90a610eee 100644
--- a/rules/xorg-proto-xf86misc.make
+++ b/rules/xorg-proto-xf86misc.make
@@ -22,7 +22,7 @@ XORG_PROTO_XF86MISC_VERSION := 0.9.3
XORG_PROTO_XF86MISC_MD5 := ca63bbb31cf5b7f37b2237e923ff257a
XORG_PROTO_XF86MISC := xf86miscproto-$(XORG_PROTO_XF86MISC_VERSION)
XORG_PROTO_XF86MISC_SUFFIX := tar.bz2
-XORG_PROTO_XF86MISC_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
+XORG_PROTO_XF86MISC_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX))
XORG_PROTO_XF86MISC_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
XORG_PROTO_XF86MISC_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86MISC)
diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make
index d722cc9cf..5ba47f1d9 100644
--- a/rules/xorg-proto-xf86vidmode.make
+++ b/rules/xorg-proto-xf86vidmode.make
@@ -22,7 +22,7 @@ XORG_PROTO_XF86VIDMODE_VERSION := 2.3
XORG_PROTO_XF86VIDMODE_MD5 := 4434894fc7d4eeb4a22e6b876d56fdaa
XORG_PROTO_XF86VIDMODE := xf86vidmodeproto-$(XORG_PROTO_XF86VIDMODE_VERSION)
XORG_PROTO_XF86VIDMODE_SUFFIX := tar.bz2
-XORG_PROTO_XF86VIDMODE_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
+XORG_PROTO_XF86VIDMODE_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX))
XORG_PROTO_XF86VIDMODE_SOURCE := $(SRCDIR)/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
XORG_PROTO_XF86VIDMODE_DIR := $(BUILDDIR)/$(XORG_PROTO_XF86VIDMODE)
diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make
index d3076f867..f454600b4 100644
--- a/rules/xorg-proto-xinerama.make
+++ b/rules/xorg-proto-xinerama.make
@@ -22,7 +22,7 @@ XORG_PROTO_XINERAMA_VERSION := 1.2
XORG_PROTO_XINERAMA_MD5 := a8aadcb281b9c11a91303e24cdea45f5
XORG_PROTO_XINERAMA := xineramaproto-$(XORG_PROTO_XINERAMA_VERSION)
XORG_PROTO_XINERAMA_SUFFIX := tar.bz2
-XORG_PROTO_XINERAMA_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
+XORG_PROTO_XINERAMA_URL := $(call ptx/mirror, XORG, individual/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX))
XORG_PROTO_XINERAMA_SOURCE := $(SRCDIR)/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
XORG_PROTO_XINERAMA_DIR := $(BUILDDIR)/$(XORG_PROTO_XINERAMA)
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 6002e47dd..5a20e3d73 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -20,7 +20,7 @@ XORG_SERVER_VERSION := 1.9.3
XORG_SERVER_MD5 := 5bef6839a76d029204ab31aa2fcb5201
XORG_SERVER := xorg-server-$(XORG_SERVER_VERSION)
XORG_SERVER_SUFFIX := tar.bz2
-XORG_SERVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
+XORG_SERVER_URL := $(call ptx/mirror, XORG, individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX))
XORG_SERVER_SOURCE := $(SRCDIR)/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
XORG_SERVER_DIR := $(BUILDDIR)/$(XORG_SERVER)