package/: convert to DOWNLOAD helper

13 files changed, 26 insertions, 26 deletions

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index a92995043..b87062646 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -28,7 +28,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 endif
 
 $(DL_DIR)/$(ALSA_LIB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE)
+	$(call DOWNLOAD,$(ALSA_LIB_SITE),$(ALSA_LIB_SOURCE))
 
 $(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 	$(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 6e99d041a..da04363f3 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -12,7 +12,7 @@ ALSA_UTILS_BINARY:=alsactl/alsactl
 ALSA_UTILS_TARGET_BINARY:=usr/sbin/alsactl
 
 $(DL_DIR)/$(ALSA_UTILS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ALSA_UTILS_SITE)/$(ALSA_UTILS_SOURCE)
+	$(call DOWNLOAD,$(ALSA_UTILS_SITE),$(ALSA_UTILS_SOURCE))
 
 $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
 	$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk
index ef5c14c37..9d50f2433 100644
--- a/package/multimedia/asterisk/asterisk.mk
+++ b/package/multimedia/asterisk/asterisk.mk
@@ -11,7 +11,7 @@ ASTERISK_BINARY:=asterisk
 ASTERISK_TARGET_BINARY:=usr/sbin/asterisk
 
 $(DL_DIR)/$(ASTERISK_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)
+	$(call DOWNLOAD,$(ASTERISK_SITE),$(ASTERISK_SOURCE))
 
 $(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index a324658cf..d6f5fbd38 100644
--- a/package/multimedia/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
@@ -11,7 +11,7 @@ AUMIX_DIR=$(BUILD_DIR)/aumix-$(AUMIX_VERSION)
 AUMIX_CAT:=$(BZCAT)
 
 $(DL_DIR)/$(AUMIX_SOURCE):
-	$(WGET) -P $(DL_DIR) $(AUMIX_SITE)/$(AUMIX_SOURCE)
+	$(call DOWNLOAD,$(AUMIX_SITE),$(AUMIX_SOURCE))
 
 $(AUMIX_DIR)/.unpacked: $(DL_DIR)/$(AUMIX_SOURCE)
 	$(AUMIX_CAT) $(DL_DIR)/$(AUMIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk
index e9a651dd8..80d37d595 100644
--- a/package/multimedia/festival/lexicons/festlex.mk
+++ b/package/multimedia/festival/lexicons/festlex.mk
@@ -12,13 +12,13 @@ FESTLEX_INSTALL_DIR = $(TARGET_DIR)/usr/share
 $(FESTLEX_STATUS_DIR)/.downloaded:
 	mkdir -p $(FESTLEX_STATUS_DIR)
 ifeq ($(BR2_PACKAGE_FESTLEX_CMU),y)
-	$(Q)test -e $(DL_DIR)/$(LEX1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX1)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX1))
 endif
 ifeq ($(BR2_PACKAGE_FESTLEX_OALD),y)
-	$(Q)test -e $(DL_DIR)/$(LEX2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX2)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX2))
 endif
 ifeq ($(BR2_PACKAGE_FESTLEX_POS),y)
-	$(Q)test -e $(DL_DIR)/$(LEX3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX3))
 endif
 	touch $@
 
diff --git a/package/multimedia/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk
index d44493c83..a2ee169f3 100644
--- a/package/multimedia/festival/voices/festvox.mk
+++ b/package/multimedia/festival/voices/festvox.mk
@@ -21,35 +21,35 @@ FESTVOX_INSTALL_DIR = $(TARGET_DIR)/usr/share
 $(FESTVOX_STATUS_DIR)/.downloaded:
 	mkdir -p $(FESTVOX_STATUS_DIR)
 ifeq ($(BR2_PACKAGE_FESTVOX_AWB),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE1)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE1))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_BDL),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE2)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE2))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_JMK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE3))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_SLT),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE4) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE4)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE4))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_AWB_MULTISYN),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE5) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE5)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE5))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_JMK_MULTISYN),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE6) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE6)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE6))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KAL_SIXTEENK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE7) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE7)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE7))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KED_EIGHTK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE8) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE8)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE8))
 endif
 ifeq ($(BR2_PACKAGE_FESTVOX_KED_SIXTEENK),y)
-	$(Q)test -e $(DL_DIR)/$(VOICE9) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE9)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE9))
 endif
-	$(Q)test -e $(DL_DIR)/$(FRONTEND1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND1)
-	$(Q)test -e $(DL_DIR)/$(FRONTEND2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND2)
-	$(Q)test -e $(DL_DIR)/$(FRONTEND3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND3)
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND1))
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND2))
+	$(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND3))
 
 	touch $@
 
diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk
index 26f35c879..0308f0229 100644
--- a/package/multimedia/libid3tag/libid3tag.mk
+++ b/package/multimedia/libid3tag/libid3tag.mk
@@ -13,7 +13,7 @@ LIBID3TAG_BIN:=libid3tag.so.0.3.0
 LIBID3TAG_TARGET_BIN:=usr/lib/$(LIBID3TAG_BIN)
 
 $(DL_DIR)/$(LIBID3TAG_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE)
+	$(call DOWNLOAD,$(LIBID3TAG_SITE),$(LIBID3TAG_SOURCE))
 
 $(LIBID3TAG_DIR)/.unpacked: $(DL_DIR)/$(LIBID3TAG_SOURCE)
 	$(LIBID3TAG_CAT) $(DL_DIR)/$(LIBID3TAG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk
index 85754545f..4d9200dc0 100644
--- a/package/multimedia/libmad/libmad.mk
+++ b/package/multimedia/libmad/libmad.mk
@@ -11,7 +11,7 @@ LIBMAD_DIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
 LIBMAD_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBMAD_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
+	$(call DOWNLOAD,$(LIBMAD_SITE),$(LIBMAD_SOURCE))
 
 $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
 	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk
index a9584424b..b20852906 100644
--- a/package/multimedia/libsndfile/libsndfile.mk
+++ b/package/multimedia/libsndfile/libsndfile.mk
@@ -11,7 +11,7 @@ LIBSNDFILE_BINARY:=src/.libs/libsndfile.so
 LIBSNDFILE_TARGET_BINARY:=usr/lib/libsndfile.so
 
 $(DL_DIR)/$(LIBSNDFILE_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBSNDFILE_SITE)/$(LIBSNDFILE_SOURCE)
+	$(call DOWNLOAD,$(LIBSNDFILE_SITE),$(LIBSNDFILE_SOURCE))
 
 $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index b99d68a32..09cee54c1 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -12,7 +12,7 @@ LIBVORBIS_TARGET_BINARY:=usr/bin/libvorbis
 LIBVORBIS_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(LIBVORBIS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE)
+	$(call DOWNLOAD,$(LIBVORBIS_SITE),$(LIBVORBIS_SOURCE))
 
 $(LIBVORBIS_DIR)/.source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
 	$(LIBVORBIS_CAT) $(DL_DIR)/$(LIBVORBIS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 266232581..d8219b727 100644
--- a/package/multimedia/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -19,7 +19,7 @@ MADPLAY_ALSA_DEP:=alsa-lib
 endif
 
 $(DL_DIR)/$(MADPLAY_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(MADPLAY_SITE)/$(MADPLAY_SOURCE)
+	 $(call DOWNLOAD,$(MADPLAY_SITE),$(MADPLAY_SOURCE))
 
 $(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE)
 	$(MADPLAY_CAT) $(DL_DIR)/$(MADPLAY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index caf979714..b32681c40 100644
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -19,7 +19,7 @@ MPG123_ALSA_DEP:=alsa-lib
 endif
 
 $(DL_DIR)/$(MPG123_SOURCE):
-	$(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE)
+	$(call DOWNLOAD,$(MPG123_SITE),$(MPG123_SOURCE))
 
 $(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
 	$(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 7d7c83032..7b3dc5f5d 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -18,7 +18,7 @@ MPLAYER_ENDIAN:=--disable-big-endian
 endif
 
 $(DL_DIR)/$(MPLAYER_SOURCE):
-	$(WGET) -P $(DL_DIR) $(MPLAYER_SITE)/$(MPLAYER_SOURCE)
+	$(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
 
 $(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE)
 	$(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -