package/: convert to DOWNLOAD helper

package/acpid/acpid.mk

@@ -9,7 +9,7 @@ ACPID_SOURCE=acpid_$(ACPID_VERSION).orig.tar.gz
 ACPID_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
 
 $(DL_DIR)/$(ACPID_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ACPID_SITE)/$(ACPID_SOURCE)
+	$(call DOWNLOAD,$(ACPID_SITE),$(ACPID_SOURCE))
 
 $(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -

package/argus/argus.mk

@@ -13,10 +13,10 @@ ARGUS_BINARY:=bin/argus
 ARGUS_TARGET_BINARY:=usr/sbin/argus
 
 $(DL_DIR)/$(ARGUS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_SOURCE)
+	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_SOURCE))
 
 $(DL_DIR)/$(ARGUS_PATCH):
-	$(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_PATCH)
+	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_PATCH))
 
 argus-source: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
 

package/at/at.mk

@@ -12,7 +12,7 @@ AT_TARGET_SCRIPT:=etc/init.d/S99at
 AT_BINARY:=at
 
 $(DL_DIR)/$(AT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AT_SITE)/$(AT_SOURCE)
+	 $(call DOWNLOAD,$(AT_SITE),$(AT_SOURCE))
 
 at-source: $(DL_DIR)/$(AT_SOURCE)
 

package/autoconf/autoconf.mk

@@ -18,7 +18,7 @@ AUTOCONF:=$(STAGING_DIR)/usr/bin/autoconf
 AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
 
 $(DL_DIR)/$(AUTOCONF_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AUTOCONF_SITE)/$(AUTOCONF_SOURCE)
+	 $(call DOWNLOAD,$(AUTOCONF_SITE),$(AUTOCONF_SOURCE))
 
 autoconf-source: $(DL_DIR)/$(AUTOCONF_SOURCE)
 

package/automake/automake.mk

@@ -19,7 +19,7 @@ ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL = aclocal -I $(ACLOCAL_DIR)
 
 $(DL_DIR)/$(AUTOMAKE_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AUTOMAKE_SITE)/$(AUTOMAKE_SOURCE)
+	 $(call DOWNLOAD,$(AUTOMAKE_SITE),$(AUTOMAKE_SOURCE))
 
 automake-source: $(DL_DIR)/$(AUTOMAKE_SOURCE)
 

package/avahi/avahi.mk

@@ -43,7 +43,7 @@ AVAHI_DISABLE_DBUS:=--disable-dbus
 endif
 
 $(DL_DIR)/$(AVAHI_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE)
+	 $(call DOWNLOAD,$(AVAHI_SITE),$(AVAHI_SOURCE))
 
 avahi-source: $(DL_DIR)/$(AVAHI_SOURCE)
 

package/axel/axel.mk

@@ -12,7 +12,7 @@ AXEL_BINARY:=axel
 AXEL_TARGET_BINARY:=usr/bin/axel
 
 $(DL_DIR)/$(AXEL_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AXEL_SITE)/$(AXEL_SOURCE)
+	 $(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE))
 
 axel-source: $(DL_DIR)/$(AXEL_SOURCE)
 

package/bash/bash.mk

@@ -12,7 +12,7 @@ BASH_BINARY:=bash
 BASH_TARGET_BINARY:=bin/bash
 
 $(DL_DIR)/$(BASH_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BASH_SITE)/$(BASH_SOURCE)
+	 $(call DOWNLOAD,$(BASH_SITE),$(BASH_SOURCE))
 
 bash-source: $(DL_DIR)/$(BASH_SOURCE)
 

package/berkeleydb/berkeleydb.mk

@@ -11,7 +11,7 @@ DB_DIR:=$(BUILD_DIR)/db-$(DB_VERSION).NC
 DB_SHARLIB:=libdb-$(DB_SO_VERSION).so
 
 $(DL_DIR)/$(DB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
+	$(call DOWNLOAD,$(DB_SITE),$(DB_SOURCE))
 
 berkeleydb-source: $(DL_DIR)/$(DB_SOURCE)
 

package/bind/bind.mk

@@ -13,7 +13,7 @@ BIND_BINARY:=bin/named/named
 BIND_TARGET_BINARY:=usr/sbin/named
 
 $(DL_DIR)/$(BIND_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BIND_SITE)/$(BIND_SOURCE)
+	 $(call DOWNLOAD,$(BIND_SITE),$(BIND_SOURCE))
 
 bind-source: $(DL_DIR)/$(BIND_SOURCE)
 

package/bison/bison.mk

@@ -12,7 +12,7 @@ BISON_BINARY:=src/bison
 BISON_TARGET_BINARY:=usr/bin/bison
 
 $(DL_DIR)/$(BISON_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BISON_SITE)/$(BISON_SOURCE)
+	 $(call DOWNLOAD,$(BISON_SITE),$(BISON_SOURCE))
 
 bison-source: $(DL_DIR)/$(BISON_SOURCE)
 

package/boa/boa.mk

@@ -16,7 +16,7 @@ BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
 BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
 
 $(DL_DIR)/$(BOA_SOURCE):
-	$(WGET) -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE)
+	$(call DOWNLOAD,$(BOA_SITE),$(BOA_SOURCE))
 
 $(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE)
 	$(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/bsdiff/bsdiff.mk

@@ -12,7 +12,7 @@ BSDIFF_TARGET_BINARY:=usr/bin/bsdiff
 BSDIFF_ZCAT=$(ZCAT)
 
 $(DL_DIR)/$(BSDIFF_SOURCE):
-	$(WGET) -P $(DL_DIR) $(BSDIFF_SITE)/$(BSDIFF_SOURCE)
+	$(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE))
 
 $(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE)
 	$(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/busybox/busybox.mk

@@ -26,7 +26,7 @@ BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
 endif
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
+	$(call DOWNLOAD,$(BUSYBOX_SITE),$(BUSYBOX_SOURCE))
 
 $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
 	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -

package/bzip2/bzip2.mk

@@ -12,7 +12,7 @@ BZIP2_BINARY:=$(BZIP2_DIR)/bzip2
 BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore
 
 $(DL_DIR)/$(BZIP2_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BZIP2_SITE)/$(BZIP2_SOURCE)
+	 $(call DOWNLOAD,$(BZIP2_SITE),$(BZIP2_SOURCE))
 
 bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
 

package/coreutils/coreutils.mk

@@ -15,7 +15,7 @@ BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \
 	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true uname
 
 $(DL_DIR)/$(COREUTILS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
+	 $(call DOWNLOAD,$(COREUTILS_SITE),$(COREUTILS_SOURCE))
 
 coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE)
 

package/cups/cups.mk

@@ -23,7 +23,7 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y)
 endif
 
 $(DL_DIR)/$(CUPS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(CUPS_SITE)/$(CUPS_SOURCE)
+	 $(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE))
 
 $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
 	$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/cvs/cvs.mk

@@ -23,12 +23,12 @@ CVS_CONFIGURE_ARGS+=--with-external-zlib
 endif
 
 $(DL_DIR)/$(CVS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(CVS_SITE)/$(CVS_SOURCE)
+	$(call DOWNLOAD,$(CVS_SITE),$(CVS_SOURCE))
 
 ifneq ($(CVS_PATCH),)
 CVS_PATCH_FILE=$(DL_DIR)/$(CVS_PATCH)
 $(CVS_PATCH_FILE):
-	$(WGET) -P $(DL_DIR) $(CVS_SITE)/$(CVS_PATCH)
+	$(call DOWNLOAD,$(CVS_SITE),$(CVS_PATCH))
 endif
 cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE)
 

package/dash/dash.mk

@@ -13,10 +13,10 @@ DASH_BINARY:=src/dash
 DASH_TARGET_BINARY:=bin/dash
 
 $(DL_DIR)/$(DASH_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DASH_SITE)/$(DASH_SOURCE)
+	$(call DOWNLOAD,$(DASH_SITE),$(DASH_SOURCE))
 
 $(DL_DIR)/$(DASH_PATCH1):
-	$(WGET) -P $(DL_DIR) $(DASH_SITE)/$(DASH_PATCH1)
+	$(call DOWNLOAD,$(DASH_SITE),$(DASH_PATCH1))
 
 dash-source: $(DL_DIR)/$(DASH_SOURCE) $(DL_DIR)/$(DASH_PATCH1)
 

package/database/sqlite/sqlite.mk

@@ -11,7 +11,7 @@ SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
 SQLITE_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(SQLITE_SOURCE):
-	$(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE)
+	$(call DOWNLOAD,$(SQLITE_SITE),$(SQLITE_SOURCE))
 
 $(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE)
 	$(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/dbus-glib/dbus-glib.mk

@@ -12,7 +12,7 @@ DBUS_GLIB_BINARY:=dbus/.libs/dbus-binding-tool
 DBUS_GLIB_TARGET_BINARY:=usr/bin/dbus-binding-tool
 
 $(DL_DIR)/$(DBUS_GLIB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DBUS_GLIB_SITE)/$(DBUS_GLIB_SOURCE)
+	$(call DOWNLOAD,$(DBUS_GLIB_SITE),$(DBUS_GLIB_SOURCE))
 
 dbus-glib-source: $(DL_DIR)/$(DBUS_GLIB_SOURCE)
 

package/dbus/dbus.mk

@@ -24,7 +24,7 @@ DBUS_XML_DEP:=libxml2-install-staging
 endif
 
 $(DL_DIR)/$(DBUS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DBUS_SITE)/$(DBUS_SOURCE)
+	$(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE))
 
 dbus-source: $(DL_DIR)/$(DBUS_SOURCE)
 

package/devmem2/devmem2.mk

@@ -10,7 +10,7 @@ DEVMEM2_BINARY:=devmem2
 DEVMEM2_DIR:=$(BUILD_DIR)/devmem2
 
 $(DL_DIR)/$(DEVMEM2_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DEVMEM2_SITE)/$(DEVMEM2_SOURCE)
+	$(call DOWNLOAD,$(DEVMEM2_SITE),$(DEVMEM2_SOURCE))
 
 $(DEVMEM2_DIR)/$(DEVMEM2_SOURCE): $(DL_DIR)/$(DEVMEM2_SOURCE)
 	mkdir -p $(@D)

package/dhcp/dhcp.mk

@@ -19,7 +19,7 @@ BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
 	VARDB=/var/lib/dhcp
 
 $(DL_DIR)/$(DHCP_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DHCP_SITE)/$(DHCP_SOURCE)
+	 $(call DOWNLOAD,$(DHCP_SITE),$(DHCP_SOURCE))
 
 dhcp-source: $(DL_DIR)/$(DHCP_SOURCE)
 

package/dialog/dialog.mk

@@ -11,7 +11,7 @@ DIALOG_BINARY:=dialog
 DIALOG_TARGET_BINARY:=usr/bin/dialog
 
 $(DL_DIR)/$(DIALOG_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DIALOG_SITE)/$(DIALOG_SOURCE)
+	$(call DOWNLOAD,$(DIALOG_SITE),$(DIALOG_SOURCE))
 
 $(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(DIALOG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/diffutils/diffutils.mk

@@ -12,7 +12,7 @@ DIFFUTILS_BINARY:=src/diff
 DIFFUTILS_TARGET_BINARY:=usr/bin/diff
 
 $(DL_DIR)/$(DIFFUTILS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DIFFUTILS_SITE)/$(DIFFUTILS_SOURCE)
+	 $(call DOWNLOAD,$(DIFFUTILS_SITE),$(DIFFUTILS_SOURCE))
 
 diffutils-source: $(DL_DIR)/$(DIFFUTILS_SOURCE)
 

package/dillo/dillo.mk

@@ -11,7 +11,7 @@ DILLO_DIR=$(BUILD_DIR)/dillo-$(DILLO_VERSION)
 DILLO_CAT:=$(BZCAT)
 
 $(DL_DIR)/$(DILLO_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DILLO_SITE)/$(DILLO_SOURCE)
+	$(call DOWNLOAD,$(DILLO_SITE),$(DILLO_SOURCE))
 
 $(DILLO_DIR)/.unpacked: $(DL_DIR)/$(DILLO_SOURCE)
 	$(DILLO_CAT) $(DL_DIR)/$(DILLO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/directfb/directfb.mk

@@ -106,7 +106,7 @@ DIRECTFB_JPEG:=--disable-jpeg
 endif
 
 $(DL_DIR)/$(DIRECTFB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DIRECTFB_SITE)/$(DIRECTFB_SOURCE)
+	$(call DOWNLOAD,$(DIRECTFB_SITE),$(DIRECTFB_SOURCE))
 
 directfb-source: $(DL_DIR)/$(DIRECTFB_SOURCE)
 

package/distcc/distcc.mk

@@ -12,7 +12,7 @@ DISTCC_BINARY:=distcc
 DISTCC_TARGET_BINARY:=usr/bin/distcc
 
 $(DL_DIR)/$(DISTCC_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DISTCC_SITE)/$(DISTCC_SOURCE)
+	$(call DOWNLOAD,$(DISTCC_SITE),$(DISTCC_SOURCE))
 
 distcc-source: $(DL_DIR)/$(CVS_SOURCE)
 

package/dm/dm.mk

@@ -38,8 +38,8 @@ DM_TARGET_LIBRARY:=$(TARGET_DIR)/usr/lib/libdevmapper.so
 DM_TARGET_HEADER:=$(TARGET_DIR)/usr/include/libdevmapper.h
 
 $(DL_DIR)/$(DM_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DM_SITE)/$(DM_SOURCE) || \
-		$(WGET) -P $(DL_DIR) $(DM_SITE_OLD)/$(DM_SOURCE)
+	$(call DOWNLOAD,$(DM_SITE),$(DM_SOURCE) || \)
+		$(call DOWNLOAD,$(DM_SITE_OLD),$(DM_SOURCE))
 
 dm-source: $(DL_DIR)/$(DM_SOURCE)
 

package/dmalloc/dmalloc.mk

@@ -12,7 +12,7 @@ DMALLOC_BINARY:=dmalloc
 DMALLOC_TARGET_BINARY:=usr/bin/dmalloc
 
 $(DL_DIR)/$(DMALLOC_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DMALLOC_SITE)/$(DMALLOC_SOURCE)
+	 $(call DOWNLOAD,$(DMALLOC_SITE),$(DMALLOC_SOURCE))
 
 dmalloc-source: $(DL_DIR)/$(DMALLOC_SOURCE)
 

package/dmraid/dmraid.mk

@@ -14,7 +14,7 @@ DMRAID_STAGING_BINARY:=$(DMRAID_DIR)/STAGING_DIR)/tools/$(DMRAID_BINARY)
 DMRAID_TARGET_BINARY:=$(TARGET_DIR)/sbin/$(DMRAID_BINARY)
 
 $(DL_DIR)/$(DMRAID_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DMRAID_SITE)/$(DMRAID_SOURCE)
+	 $(call DOWNLOAD,$(DMRAID_SITE),$(DMRAID_SOURCE))
 
 dmraid-source: $(DL_DIR)/$(DMRAID_SOURCE)
 

package/dnsmasq/dnsmasq.mk

@@ -32,7 +32,7 @@ DNSMASQ_DBUS:=
 endif
 
 $(DL_DIR)/$(DNSMASQ_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DNSMASQ_SITE)/$(DNSMASQ_SOURCE)
+	$(call DOWNLOAD,$(DNSMASQ_SITE),$(DNSMASQ_SOURCE))
 
 $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/dropbear/dropbear.mk

@@ -12,7 +12,7 @@ DROPBEAR_BINARY:=dropbearmulti
 DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear
 
 $(DL_DIR)/$(DROPBEAR_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
+	 $(call DOWNLOAD,$(DROPBEAR_SITE),$(DROPBEAR_SOURCE))
 
 dropbear-source: $(DL_DIR)/$(DROPBEAR_SOURCE)
 

package/dummy/dummy.mk

@@ -21,7 +21,7 @@ DUMMY_TARGET_BINARY:=usr/bin/$(DUMMY_BINARY)
 
 # The download rule. Main purpose is to download the source package.
 $(DL_DIR)/$(DUMMY_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DUMMY_SITE)/$(DUMMY_SOURCE)
+	$(call DOWNLOAD,$(DUMMY_SITE),$(DUMMY_SOURCE))
 
 # The unpacking rule. Main purpose is to extract the source package, apply any
 # patches and update config.guess and config.sub.

package/e2fsprogs/e2fsprogs.mk

@@ -16,7 +16,7 @@ E2FSPROGS_MISC_STRIP:= \
 	lsattr mke2fs mklost+found tune2fs uuidgen
 
 $(DL_DIR)/$(E2FSPROGS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE)
+	 $(call DOWNLOAD,$(E2FSPROGS_SITE),$(E2FSPROGS_SOURCE))
 
 e2fsprogs-source: $(DL_DIR)/$(E2FSPROGS_SOURCE)
 

package/editors/nano/nano.mk

@@ -12,7 +12,7 @@ NANO_BINARY:=src/nano
 NANO_TARGET_BINARY:=usr/bin/nano
 
 $(DL_DIR)/$(NANO_SOURCE):
-	$(WGET) -P $(DL_DIR) $(NANO_SITE)/$(NANO_SOURCE)
+	$(call DOWNLOAD,$(NANO_SITE),$(NANO_SOURCE))
 
 nano-source: $(DL_DIR)/$(NANO_SOURCE)
 

package/editors/uemacs/uemacs.mk

@@ -12,7 +12,7 @@ UEMACS_BINARY:=em
 UEMACS_TARGET_BINARY:=usr/bin/emacs
 
 $(DL_DIR)/$(UEMACS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(UEMACS_SITE)/$(UEMACS_SOURCE)
+	 $(call DOWNLOAD,$(UEMACS_SITE),$(UEMACS_SOURCE))
 
 uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
 

package/editors/vim/vim.mk

@@ -14,10 +14,10 @@ VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
 
 $(DL_DIR)/$(VIM_SOURCE):
-	$(WGET) -P $(DL_DIR) $(VIM_SOURCE_SITE)/$(VIM_SOURCE)
+	$(call DOWNLOAD,$(VIM_SOURCE_SITE),$(VIM_SOURCE))
 
 $(DL_DIR)/vim/%:
-	$(WGET) -P $(DL_DIR)/vim/ $(VIM_PATCH_SITE)/$*
+	$(call DOWNLOAD,$(VIM_PATCH_SITE),$*)
 
 vim-source: $(DL_DIR)/$(VIM_SOURCE) $(VIM_PATCHES)
 

package/eeprog/eeprog.mk

@@ -11,7 +11,7 @@ EEPROG_BINARY:=eeprog
 EEPROG_TARGET_BINARY:=usr/sbin/eeprog
 
 $(DL_DIR)/$(EEPROG_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(EEPROG_SITE)/$(EEPROG_SOURCE)
+	 $(call DOWNLOAD,$(EEPROG_SITE),$(EEPROG_SOURCE))
 
 eeprog-source: $(DL_DIR)/$(EEPROG_SOURCE)
 

package/expat/expat.mk

@@ -14,7 +14,7 @@ EXPAT_BINARY:=.libs/libexpat.a
 EXPAT_TARGET_BINARY:=usr/lib/libexpat.so.1
 
 $(DL_DIR)/$(EXPAT_SOURCE):
-	$(WGET) -P $(DL_DIR) $(EXPAT_SITE)/$(EXPAT_SOURCE)
+	$(call DOWNLOAD,$(EXPAT_SITE),$(EXPAT_SOURCE))
 
 expat-source: $(DL_DIR)/$(EXPAT_SOURCE)
 

package/ezxml/ezxml.mk

@@ -10,7 +10,7 @@ EZXML_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxm
 EZXML_DIR:=$(BUILD_DIR)/ezxml
 
 $(DL_DIR)/$(EZXML_SOURCE):
-	$(WGET) -P $(DL_DIR) $(EZXML_SITE)/$(EZXML_SOURCE)
+	$(call DOWNLOAD,$(EZXML_SITE),$(EZXML_SOURCE))
 
 $(EZXML_DIR)/.unpacked: $(DL_DIR)/$(EZXML_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(EZXML_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/fakeroot/fakeroot.mk

@@ -12,7 +12,7 @@ FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
 FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
 
 $(DL_DIR)/$(FAKEROOT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FAKEROOT_SITE)/$(FAKEROOT_SOURCE)
+	 $(call DOWNLOAD,$(FAKEROOT_SITE),$(FAKEROOT_SOURCE))
 
 fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
 

package/fbset/fbset.mk

@@ -12,7 +12,7 @@ FBSET_BINARY:=fbset
 FBSET_TARGET_BINARY:=usr/sbin/$(FBSET_BINARY)
 
 $(DL_DIR)/$(FBSET_SOURCE):
-	$(WGET) -P $(DL_DIR) $(FBSET_SITE)/$(FBSET_SOURCE)
+	$(call DOWNLOAD,$(FBSET_SITE),$(FBSET_SOURCE))
 
 $(FBSET_DIR)/.unpacked: $(DL_DIR)/$(FBSET_SOURCE)
 	$(FBSET_CAT) $(DL_DIR)/$(FBSET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/fbv/fbv.mk

@@ -12,7 +12,7 @@ FBV_BINARY:=fbv
 FBV_TARGET_BINARY:=usr/bin/$(FBV_BINARY)
 
 $(DL_DIR)/$(FBV_SOURCE):
-	$(WGET) -P $(DL_DIR) $(FBV_SITE)/$(FBV_SOURCE)
+	$(call DOWNLOAD,$(FBV_SITE),$(FBV_SOURCE))
 
 fbv-source: $(DL_DIR)/$(FBV_SOURCE)
 

package/fconfig/fconfig.mk

@@ -12,7 +12,7 @@ FCONFIG_BINARY:=fconfig
 FCONFIG_TARGET_BINARY:=sbin/fconfig
 
 $(DL_DIR)/$(FCONFIG_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FCONFIG_SITE)/$(FCONFIG_SOURCE)
+	 $(call DOWNLOAD,$(FCONFIG_SITE),$(FCONFIG_SOURCE))
 
 fconfig-source: $(DL_DIR)/$(FCONFIG_SOURCE)
 

package/file/file.mk

@@ -14,7 +14,7 @@ FILE_BINARY:=src/file
 FILE_TARGET_BINARY:=usr/bin/file
 
 $(DL_DIR)/$(FILE_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FILE_SITE)/$(FILE_SOURCE)
+	 $(call DOWNLOAD,$(FILE_SITE),$(FILE_SOURCE))
 
 file-source: $(DL_DIR)/$(FILE_SOURCE)
 

package/findutils/findutils.mk

@@ -13,7 +13,7 @@ FINDUTILS_BINARY:=find/find
 FINDUTILS_TARGET_BINARY:=usr/bin/find
 
 $(DL_DIR)/$(FINDUTILS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FINDUTILS_SITE)/$(FINDUTILS_SOURCE)
+	 $(call DOWNLOAD,$(FINDUTILS_SITE),$(FINDUTILS_SOURCE))
 
 findutils-source: $(DL_DIR)/$(FINDUTILS_SOURCE)
 

package/fis/fis.mk

@@ -11,7 +11,7 @@ FIS_BINARY:=fis
 FIS_TARGET_BINARY:=sbin/fis
 
 $(DL_DIR)/$(FIS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FIS_SITE)/$(FIS_SOURCE)
+	 $(call DOWNLOAD,$(FIS_SITE),$(FIS_SOURCE))
 
 fis-source: $(DL_DIR)/$(FIS_SOURCE)
 

package/flex/flex.mk

@@ -14,10 +14,10 @@ FLEX_BINARY:=flex
 FLEX_TARGET_BINARY:=usr/bin/flex
 
 $(DL_DIR)/$(FLEX_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_SOURCE)
+	 $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_SOURCE))
 
 $(DL_DIR)/$(FLEX_PATCH):
-	 $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_PATCH)
+	 $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_PATCH))
 
 flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
 

package/fuse/libfuse.mk

@@ -9,7 +9,7 @@ LIBFUSE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fu
 LIBFUSE_DIR:=$(BUILD_DIR)/fuse-$(LIBFUSE_VERSION)
 LIBFUSE_BINARY:=libfuse
 $(DL_DIR)/$(LIBFUSE_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE)
+	$(call DOWNLOAD,$(LIBFUSE_SITE),$(LIBFUSE_SOURCE))
 
 $(LIBFUSE_DIR)/.source: $(DL_DIR)/$(LIBFUSE_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBFUSE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/gadgetfs-test/gadgetfs-test.mk

@@ -14,7 +14,7 @@ GADGETFS_TEST_MAKEOPTS+=USE_AIO=y
 endif
 
 $(DL_DIR)/$(GADGETFS_TEST_SOURCE):
-	$(WGET) -P $(DL_DIR) $(GADGETFS_TEST_SITE)/$(GADGETFS_TEST_SOURCE)
+	$(call DOWNLOAD,$(GADGETFS_TEST_SITE),$(GADGETFS_TEST_SOURCE))
 
 $(GADGETFS_TEST_DIR)/.unpacked: $(DL_DIR)/$(GADGETFS_TEST_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(GADGETFS_TEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/games/doom-wad/doom-wads.mk

@@ -10,7 +10,7 @@ DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/
 DOOM_WAD_DIR=$(BUILD_DIR)/doom-wad-$(DOOM_WAD_VERSION)
 
 $(DL_DIR)/$(DOOM_WAD_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(DOOM_WAD_SITE)/$(DOOM_WAD_SOURCE)
+	 $(call DOWNLOAD,$(DOOM_WAD_SITE),$(DOOM_WAD_SOURCE))
 
 doom-wad-source: $(DL_DIR)/$(DOOM_WAD_SOURCE)
 

package/gawk/gawk.mk

@@ -12,7 +12,7 @@ GAWK_BINARY:=gawk
 GAWK_TARGET_BINARY:=usr/bin/gawk
 
 $(DL_DIR)/$(GAWK_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(GAWK_SITE)/$(GAWK_SOURCE)
+	 $(call DOWNLOAD,$(GAWK_SITE),$(GAWK_SOURCE))
 
 gawk-source: $(DL_DIR)/$(GAWK_SOURCE)
 

package/gettext/gettext.mk

@@ -18,7 +18,7 @@ LIBINTL_TARGET_BINARY:=usr/lib/libintl.so
 endif
 
 $(DL_DIR)/$(GETTEXT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
+	 $(call DOWNLOAD,$(GETTEXT_SITE),$(GETTEXT_SOURCE))
 
 gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
 

package/gmp/gmp.mk

@@ -20,7 +20,7 @@ GMP_CPP_FLAGS:=CPPFLAGS=-DDLL_EXPORT
 endif
 
 $(DL_DIR)/$(GMP_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(GMP_SITE)/$(GMP_SOURCE)
+	 $(call DOWNLOAD,$(GMP_SITE),$(GMP_SOURCE))
 
 libgmp-source: $(DL_DIR)/$(GMP_SOURCE)
 

package/gtk2-engines/gtk2-engines.mk

@@ -74,7 +74,7 @@ GTK2_ENGINES_BUILD_ENV= \
 
 
 $(DL_DIR)/$(GTK2_ENGINES_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(GTK2_ENGINES_SITE)/$(GTK2_ENGINES_SOURCE)
+	 $(call DOWNLOAD,$(GTK2_ENGINES_SITE),$(GTK2_ENGINES_SOURCE))
 
 gtk2-engines-source: $(DL_DIR)/$(GTK2_ENGINES_SOURCE)
 

package/gzip/gzip.mk

@@ -12,7 +12,7 @@ GZIP_BINARY:=$(GZIP_DIR)/gzip
 GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore
 
 $(DL_DIR)/$(GZIP_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(GZIP_SITE)/$(GZIP_SOURCE)
+	 $(call DOWNLOAD,$(GZIP_SITE),$(GZIP_SOURCE))
 
 gzip-source: $(DL_DIR)/$(GZIP_SOURCE)
 

package/hal/hal.mk

@@ -20,7 +20,7 @@ GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \
 DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so
 
 $(DL_DIR)/$(HAL_SOURCE):
-	$(WGET) -P $(DL_DIR) $(HAL_SITE)/$(HAL_SOURCE)
+	$(call DOWNLOAD,$(HAL_SITE),$(HAL_SOURCE))
 
 hal-source: $(DL_DIR)/$(HAL_SOURCE)
 

package/hdparm/hdparm.mk

@@ -12,7 +12,7 @@ HDPARM_BINARY:=hdparm
 HDPARM_TARGET_BINARY:=sbin/hdparm
 
 $(DL_DIR)/$(HDPARM_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(HDPARM_SITE)/$(HDPARM_SOURCE)
+	 $(call DOWNLOAD,$(HDPARM_SITE),$(HDPARM_SOURCE))
 
 hdparm-source: $(DL_DIR)/$(HDPARM_SOURCE)
 

package/hostap/hostap.mk

@@ -15,7 +15,7 @@ HOSTAP_SITE=http://hostap.epitest.fi/releases
 HOSTAP_DIR=$(BUILD_DIR)/hostapd-$(HOSTAP_VERSION)
 
 $(DL_DIR)/$(HOSTAP_SOURCE):
-	$(WGET) -P $(DL_DIR) $(HOSTAP_SITE)/$(HOSTAP_SOURCE)
+	$(call DOWNLOAD,$(HOSTAP_SITE),$(HOSTAP_SOURCE))
 
 hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE)
 

package/hwdata/hwdata.mk

@@ -13,10 +13,10 @@ HWDATA_BINARY:=pci.ids
 HWDATA_TARGET_BINARY:=usr/share/hwdata/pci.ids
 
 $(DL_DIR)/$(HWDATA_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(HWDATA_SITE)/$(HWDATA_SOURCE)
+	 $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_SOURCE))
 
 $(DL_DIR)/$(HWDATA_PATCH):
-	 $(WGET) -P $(DL_DIR) $(HWDATA_SITE)/$(HWDATA_PATCH)
+	 $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_PATCH))
 
 hwdata-source: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH)
 

package/i2c-tools/i2c-tools.mk

@@ -11,7 +11,7 @@ I2C_TOOLS_BINARY:=tools/i2cdetect
 I2C_TOOLS_TARGET_BINARY:=usr/bin/i2cdetect
 
 $(DL_DIR)/$(I2C_TOOLS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(I2C_TOOLS_SITE)/$(I2C_TOOLS_SOURCE)
+	$(call DOWNLOAD,$(I2C_TOOLS_SITE),$(I2C_TOOLS_SOURCE))
 
 $(I2C_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(I2C_TOOLS_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(I2C_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/icu/icu.mk

@@ -12,7 +12,7 @@ ICU_DIR:=$(BUILD_DIR)/icu/source
 ICU_HOST_DIR:=$(BUILD_DIR)/icu-host/source
 
 $(DL_DIR)/$(ICU_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(ICU_SITE)/$(ICU_SOURCE)
+	 $(call DOWNLOAD,$(ICU_SITE),$(ICU_SOURCE))
 
 icu-source: $(DL_DIR)/$(ICU_SOURCE)
 

package/imagemagick/imagemagick.mk

@@ -24,7 +24,7 @@ IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/convert
 
 IMAGEMAGICK_COPY:=cp -df --preserve=mode,ownership
 $(DL_DIR)/$(IMAGEMAGICK_SOURCE):
-	$(WGET) -P $(DL_DIR) $(IMAGEMAGICK_SITE)/$(IMAGEMAGICK_SOURCE)
+	$(call DOWNLOAD,$(IMAGEMAGICK_SITE),$(IMAGEMAGICK_SOURCE))
 
 $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
 	$(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/input-tools/input-tools.mk

@@ -23,10 +23,10 @@ INPUT_TOOLS_SOURCES := $(addprefix $(INPUT_TOOLS_DIR)/utils/, \
 	$(addsuffix .c, $(INPUT_TOOLS_TARGETS-y)))
 
 $(DL_DIR)/$(INPUT_TOOLS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(INPUT_TOOLS_SITE)/$(@F)
+	$(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
 
 $(DL_DIR)/$(INPUT_TOOLS_PATCH):
-	$(WGET) -P $(DL_DIR) $(INPUT_TOOLS_SITE)/$(@F)
+	$(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
 
 $(INPUT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH)
 	$(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/iostat/iostat.mk

@@ -11,7 +11,7 @@ IOSTAT_BINARY:=iostat
 IOSTAT_TARGET_BINARY:=usr/bin/iostat
 
 $(DL_DIR)/$(IOSTAT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(IOSTAT_SITE)/$(IOSTAT_SOURCE)
+	 $(call DOWNLOAD,$(IOSTAT_SITE),$(IOSTAT_SOURCE))
 
 iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE)
 

package/iproute2/iproute2.mk

@@ -13,7 +13,7 @@ IPROUTE2_BINARY:=tc/tc
 IPROUTE2_TARGET_BINARY:=sbin/tc
 
 $(DL_DIR)/$(IPROUTE2_SOURCE):
-	$(WGET) -P $(DL_DIR) $(IPROUTE2_SITE)$(IPROUTE2_SOURCE)
+	$(call DOWNLOAD,$(IPROUTE2_SITE)$(IPROUTE2_SOURCE))
 
 iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE)
 

package/ipsec-tools/ipsec-tools.mk

@@ -59,7 +59,7 @@ IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline
 endif
 
 $(DL_DIR)/$(IPSEC_TOOLS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(IPSEC_TOOLS_SITE)/$(IPSEC_TOOLS_SOURCE)
+	$(call DOWNLOAD,$(IPSEC_TOOLS_SITE),$(IPSEC_TOOLS_SOURCE))
 
 $(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
 	$(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/java/concierge/concierge.mk

@@ -11,10 +11,10 @@ CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/
 
 $(DL_DIR)/concierge:
 	 mkdir -p $(DL_DIR)/concierge/
-	 $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
-	 $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
-	 $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
-	 $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
+	 $(call DOWNLOAD,$(CONCIERGE_SITE),concierge-$(CONCIERGE_VERSION).jar)
+	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar)
+	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar)
+	 $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar)
 
 $(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
 	mkdir -p $(TARGET_DIR)/usr/lib

package/jpeg/jpeg.mk

@@ -27,7 +27,7 @@ JPEG_SOURCE=jpegsrc.v$(JPEG_VERSION).tar.gz
 JPEG_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(JPEG_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(JPEG_SITE)/$(JPEG_SOURCE)
+	 $(call DOWNLOAD,$(JPEG_SITE),$(JPEG_SOURCE))
 
 jpeg-source: $(DL_DIR)/$(JPEG_SOURCE)
 

package/kexec/kexec.mk

@@ -24,10 +24,10 @@ KEXEC_CONFIG_OPTS += --without-zlib
 endif
 
 $(DL_DIR)/$(KEXEC_SOURCE):
-	$(WGET) -P $(DL_DIR) $(KEXEC_SITE)/$(KEXEC_SOURCE)
+	$(call DOWNLOAD,$(KEXEC_SITE),$(KEXEC_SOURCE))
 
 $(DL_DIR)/$(KEXEC_PATCH):
-	$(WGET) -P $(DL_DIR) $(KEXEC_SITE)/$(KEXEC_PATCH)
+	$(call DOWNLOAD,$(KEXEC_SITE),$(KEXEC_PATCH))
 
 kexec-source: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH)
 

package/kismet/kismet.mk

@@ -12,7 +12,7 @@ KISMET_BINARY:=kismet
 KISMET_TARGET_DIRECTORY=usr/bin/
 
 $(DL_DIR)/$(KISMET_SOURCE):
-	$(WGET) -P $(DL_DIR) $(KISMET_SITE)/$(KISMET_SOURCE)
+	$(call DOWNLOAD,$(KISMET_SITE),$(KISMET_SOURCE))
 
 kismet-source: $(DL_DIR)/$(KISMET_SOURCE)
 

package/l2tp/l2tp.mk

@@ -13,10 +13,10 @@ L2TP_BINARY:=l2tpd
 L2TP_TARGET_BINARY:=usr/sbin/l2tpd
 
 $(DL_DIR)/$(L2TP_SOURCE):
-	$(WGET) -P $(DL_DIR) $(L2TP_SITE)/$(L2TP_SOURCE)
+	$(call DOWNLOAD,$(L2TP_SITE),$(L2TP_SOURCE))
 
 $(DL_DIR)/$(L2TP_PATCH):
-	$(WGET) -P $(DL_DIR) $(L2TP_SITE)/$(L2TP_PATCH)
+	$(call DOWNLOAD,$(L2TP_SITE),$(L2TP_PATCH))
 
 l2tp-source: $(DL_DIR)/$(L2TP_SOURCE) $(DL_DIR)/$(L2TP_PATCH)
 

package/less/less.mk

@@ -11,7 +11,7 @@ LESS_BINARY:=less
 LESS_TARGET_BINARY:=usr/bin/less
 
 $(DL_DIR)/$(LESS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LESS_SITE)/$(LESS_SOURCE)
+	$(call DOWNLOAD,$(LESS_SITE),$(LESS_SOURCE))
 
 $(LESS_DIR)/.source: $(DL_DIR)/$(LESS_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LESS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libaio/libaio.mk

@@ -13,7 +13,7 @@ LIBAIO_ARCH:=$(ARCH)
 LIBAIO_MAKEOPTS:= $(TARGET_CONFIGURE_OPTS) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -nostdlib -nostartfiles -I. -fPIC" LDFLAGS="$(TARGET_LDFLAGS)"
 
 $(DL_DIR)/$(LIBAIO_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBAIO_SITE)/$(LIBAIO_SOURCE)
+	$(call DOWNLOAD,$(LIBAIO_SITE),$(LIBAIO_SOURCE))
 
 $(LIBAIO_DIR)/.unpacked: $(DL_DIR)/$(LIBAIO_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(LIBAIO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libcgi/libcgi.mk

@@ -12,7 +12,7 @@ LIBCGI_DESTDIR:=usr/lib
 LIBCGI_TARGET_LIBRARY=$(LIBCGI_DESTDIR)/libcgi.so
 
 $(DL_DIR)/$(LIBCGI_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBCGI_SITE)/$(LIBCGI_SOURCE)
+	$(call DOWNLOAD,$(LIBCGI_SITE),$(LIBCGI_SOURCE))
 
 $(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBCGI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libcgicc/libcgicc.mk

@@ -11,7 +11,7 @@ LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
 LIBCGICC_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBCGICC_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBCGICC_SITE)/$(LIBCGICC_SOURCE)
+	$(call DOWNLOAD,$(LIBCGICC_SITE),$(LIBCGICC_SOURCE))
 
 libcgicc-source: $(DL_DIR)/$(LIBCGICC_SOURCE)
 

package/libdrm/libdrm.mk

@@ -10,7 +10,7 @@ LIBDRM_CAT:=$(BZCAT)
 LIBDRM_DIR:=$(BUILD_DIR)/libdrm-$(LIBDRM_VERSION)
 
 $(DL_DIR)/$(LIBDRM_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBDRM_SITE)/$(LIBDRM_SOURCE)
+	$(call DOWNLOAD,$(LIBDRM_SITE),$(LIBDRM_SOURCE))
 
 libdrm-source: $(DL_DIR)/$(LIBDRM_SOURCE)
 

package/libeXosip2/libeXosip2.mk

@@ -11,7 +11,7 @@ LIBEXOSIP2_DIR=$(BUILD_DIR)/libeXosip2-$(LIBEXOSIP2_VERSION)
 LIBEXOSIP2_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBEXOSIP2_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBEXOSIP2_SITE)/$(LIBEXOSIP2_SOURCE)
+	$(call DOWNLOAD,$(LIBEXOSIP2_SITE),$(LIBEXOSIP2_SOURCE))
 
 $(LIBEXOSIP2_DIR)/.unpacked: $(DL_DIR)/$(LIBEXOSIP2_SOURCE)
 	$(LIBEXOSIP2_CAT) $(DL_DIR)/$(LIBEXOSIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libelf/libelf.mk

@@ -18,7 +18,7 @@ LIBELF_CONFIG:=--enable-elf64
 endif
 
 $(DL_DIR)/$(LIBELF_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBELF_SITE)/$(LIBELF_SOURCE)
+	$(call DOWNLOAD,$(LIBELF_SITE),$(LIBELF_SOURCE))
 
 $(LIBELF_DIR)/.unpacked: $(DL_DIR)/$(LIBELF_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBELF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/liberation/liberation.mk

@@ -10,7 +10,7 @@ LIBERATION_DIR = $(BUILD_DIR)/liberation-fonts-$(LIBERATION_VERSION)
 LIBERATION_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBERATION_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBERATION_SITE)/$(LIBERATION_SOURCE)
+	$(call DOWNLOAD,$(LIBERATION_SITE),$(LIBERATION_SOURCE))
 
 liberation-source: $(DL_DIR)/$(LIBERATION_SOURCE)
 

package/libevent/libevent.mk

@@ -12,7 +12,7 @@ LIBEVENT_BINARY:=libevent.la
 LIBEVENT_TARGET_BINARY:=usr/lib/libevent.so
 
 $(DL_DIR)/$(LIBEVENT_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBEVENT_SITE)/$(LIBEVENT_SOURCE)
+	$(call DOWNLOAD,$(LIBEVENT_SITE),$(LIBEVENT_SOURCE))
 
 libevent-source: $(DL_DIR)/$(LIBEVENT_SOURCE)
 

package/libfloat/libfloat.mk

@@ -19,10 +19,10 @@ endif
 endif
 
 $(DL_DIR)/$(LIBFLOAT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBFLOAT_SITE)/$(LIBFLOAT_SOURCE)
+	 $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_SOURCE))
 
 $(DL_DIR)/$(LIBFLOAT_PATCH):
-	 $(WGET) -P $(DL_DIR) $(LIBFLOAT_SITE)/$(LIBFLOAT_PATCH)
+	 $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_PATCH))
 
 libfloat-source: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH)
 

package/libgcrypt/libgcrypt.mk

@@ -12,7 +12,7 @@ LIBGCRYPT_DESTDIR:=usr/lib
 LIBGCRYPT_TARGET_LIBRARY=$(LIBGCRYPT_DESTDIR)/libgcrypt.so
 
 $(DL_DIR)/$(LIBGCRYPT_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE)
+	$(call DOWNLOAD,$(LIBGCRYPT_SITE),$(LIBGCRYPT_SOURCE))
 
 $(LIBGCRYPT_DIR)/.source: $(DL_DIR)/$(LIBGCRYPT_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libglib12/libglib12.mk

@@ -11,7 +11,7 @@ LIBGLIB12_DIR:=$(BUILD_DIR)/glib-$(LIBGLIB12_VERSION)
 LIBGLIB12_BINARY:=libglib.a
 
 $(DL_DIR)/$(LIBGLIB12_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE)
+	 $(call DOWNLOAD,$(LIBGLIB12_SITE),$(LIBGLIB12_SOURCE))
 
 $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
 	$(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libgpg-error/libgpg-error.mk

@@ -12,7 +12,7 @@ LIBGPG_ERROR_DESTDIR:=usr/lib
 LIBGPG_ERROR_TARGET_LIBRARY=$(LIBGPG_ERROR_DESTDIR)/libgpg-error.so
 
 $(DL_DIR)/$(LIBGPG_ERROR_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE)
+	$(call DOWNLOAD,$(LIBGPG_ERROR_SITE),$(LIBGPG_ERROR_SOURCE))
 
 $(LIBGPG_ERROR_DIR)/.source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libgtk12/libgtk12.mk

@@ -12,7 +12,7 @@ LIBGTK12_BINARY:=libgtk.a
 
 
 $(DL_DIR)/$(LIBGTK12_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBGTK12_SITE)/$(LIBGTK12_SOURCE)
+	 $(call DOWNLOAD,$(LIBGTK12_SITE),$(LIBGTK12_SOURCE))
 
 libgtk12-source: $(DL_DIR)/$(LIBGTK12_SOURCE)
 

package/liblockfile/liblockfile.mk

@@ -11,7 +11,7 @@ LIBLOCKFILE_DIR:=$(BUILD_DIR)/liblockfile-$(LIBLOCKFILE_VERSION)
 LIBLOCKFILE_BINARY:=liblockfile.so.1.0
 
 $(DL_DIR)/$(LIBLOCKFILE_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBLOCKFILE_SITE)/$(LIBLOCKFILE_SOURCE)
+	 $(call DOWNLOAD,$(LIBLOCKFILE_SITE),$(LIBLOCKFILE_SOURCE))
 
 liblockfile-source: $(DL_DIR)/$(LIBLOCKFILE_SOURCE)
 

package/libosip2/libosip2.mk

@@ -11,7 +11,7 @@ LIBOSIP2_DIR=$(BUILD_DIR)/libosip2-$(LIBOSIP2_VERSION)
 LIBOSIP2_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBOSIP2_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBOSIP2_SITE)/$(LIBOSIP2_SOURCE)
+	$(call DOWNLOAD,$(LIBOSIP2_SITE),$(LIBOSIP2_SOURCE))
 
 $(LIBOSIP2_DIR)/.unpacked: $(DL_DIR)/$(LIBOSIP2_SOURCE)
 	$(LIBOSIP2_CAT) $(DL_DIR)/$(LIBOSIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libpcap/libpcap.mk

@@ -28,7 +28,7 @@ LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
 LIBPCAP_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBPCAP_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBPCAP_SITE)/$(LIBPCAP_SOURCE)
+	 $(call DOWNLOAD,$(LIBPCAP_SITE),$(LIBPCAP_SOURCE))
 
 libpcap-source: $(DL_DIR)/$(LIBPCAP_SOURCE)
 

package/libraw1394/libraw1394.mk

@@ -10,7 +10,7 @@ LIBRAW1394_SITE:=http://www.linux1394.org/dl
 LIBRAW1394_DIR:=$(BUILD_DIR)/libraw1394-$(LIBRAW1394_VERSION)
 
 $(DL_DIR)/$(LIBRAW1394_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBRAW1394_SITE)/$(LIBRAW1394_SOURCE)
+	$(call DOWNLOAD,$(LIBRAW1394_SITE),$(LIBRAW1394_SOURCE))
 
 $(LIBRAW1394_DIR)/.unpacked: $(DL_DIR)/$(LIBRAW1394_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBRAW1394_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/libsysfs/libsysfs.mk

@@ -28,7 +28,7 @@ LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz
 LIBSYSFS_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBSYSFS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBSYSFS_SITE)/$(LIBSYSFS_SOURCE)
+	 $(call DOWNLOAD,$(LIBSYSFS_SITE),$(LIBSYSFS_SOURCE))
 
 libsysfs-source: $(DL_DIR)/$(LIBSYSFS_SOURCE)
 

package/libtool/libtool.mk

@@ -15,7 +15,7 @@ LIBTOOL_TARGET_BINARY:=usr/bin/libtool
 LIBTOOL:=$(STAGING_DIR)/usr/bin/libtool
 
 $(DL_DIR)/$(LIBTOOL_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBTOOL_SITE)/$(LIBTOOL_SOURCE)
+	 $(call DOWNLOAD,$(LIBTOOL_SITE),$(LIBTOOL_SOURCE))
 
 libtool-source: $(DL_DIR)/$(LIBTOOL_SOURCE)
 

package/libungif/libungif.mk

@@ -12,7 +12,7 @@ LIBUNGIF_BINARY:=libungif.so.$(LIBUNGIF_VERSION)
 LIBUNGIF_TARGET_BINARY:=usr/lib/libungif.so
 
 $(DL_DIR)/$(LIBUNGIF_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBUNGIF_SITE)/$(LIBUNGIF_SOURCE)
+	$(call DOWNLOAD,$(LIBUNGIF_SITE),$(LIBUNGIF_SOURCE))
 
 libungif-source: $(DL_DIR)/$(LIBUNGIF_SOURCE)
 

package/libusb/libusb.mk

@@ -14,10 +14,10 @@ LIBUSB_BINARY:=usr/lib/libusb.so
 ifneq ($(LIBUSB_PATCH_FILE),)
 LIBUSB_PATCH=$(DL_DIR)/$(LIBUSB_PATCH_FILE)
 $(LIBUSB_PATCH):
-	$(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_PATCH_FILE)
+	$(call DOWNLOAD,$(LIBUSB_SITE),$(LIBUSB_PATCH_FILE))
 endif
 $(DL_DIR)/$(LIBUSB_SOURCE): $(LIBUSB_PATCH)
-	$(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_SOURCE)
+	$(call DOWNLOAD,$(LIBUSB_SITE),$(LIBUSB_SOURCE))
 	touch -c $@
 
 libusb-source: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_PATCH)

package/links/links.mk

@@ -9,7 +9,7 @@ LINKS_SOURCE:=links-$(LINKS_VERSION).tar.gz
 LINKS_DIR:=$(BUILD_DIR)/links-$(LINKS_VERSION)
 
 $(DL_DIR)/$(LINKS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LINKS_SITE)/$(LINKS_SOURCE)
+	$(call DOWNLOAD,$(LINKS_SITE),$(LINKS_SOURCE))
 
 links-source: $(DL_DIR)/$(LINKS_SOURCE)
 

package/linux-fusion/linux-fusion.mk

@@ -39,7 +39,7 @@ LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR)
 #LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION)
 
 $(DL_DIR)/$(LINUX_FUSION_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LINUX_FUSION_SITE)/$(LINUX_FUSION_SOURCE)
+	$(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE))
 
 $(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE)
 	$(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/lm-sensors/lm-sensors.mk

@@ -12,7 +12,7 @@ LM_SENSORS_BINARY:=prog/sensors/sensors
 LM_SENSORS_TARGET_BINARY:=usr/bin/sensors
 
 $(DL_DIR)/$(LM_SENSORS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_SOURCE)
+	$(call DOWNLOAD,$(LM_SENSORS_SITE),$(LM_SENSORS_SOURCE))
 
 $(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE)
 	$(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/lockfile-progs/lockfile-progs.mk

@@ -11,7 +11,7 @@ LOCKFILE_PROGS_DIR:=$(BUILD_DIR)/lockfile-progs-0.1.11
 LOCKFILE_PROGS_BINARY:=usr/bin/lockfile-create
 
 $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LOCKFILE_PROGS_SITE)/$(LOCKFILE_PROGS_SOURCE)
+	 $(call DOWNLOAD,$(LOCKFILE_PROGS_SITE),$(LOCKFILE_PROGS_SOURCE))
 
 lockfile-progs-source: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)