diff options
369 files changed, 732 insertions, 728 deletions
diff --git a/rules/Rules.make b/rules/Rules.make index f4ded2756..2dcd011a5 100644 --- a/rules/Rules.make +++ b/rules/Rules.make @@ -433,11 +433,11 @@ touch = \ # # Extract a source archive into a directory. # -# $1: filename to extract +# $1: Packet label; we extract $1_SOURCE # $2: dir to extract into; if $2 is not given we extract to $(BUILDDIR) # extract = \ - PACKET="$(strip $(1))"; \ + PACKET="$($(strip $(1))_SOURCE)"; \ if [ "$$PACKET" = "" ]; then \ echo; \ echo Error: empty parameter to \"extract\(\)\"; \ @@ -481,11 +481,11 @@ extract = \ # to handle different URLs; as wget is not able to transfer # file URLs this case is being handed over to cp. # -# $1: URL of the packet +# $1: Packet Label; this macro gets $1_URL # $2: source directory # get = \ - URL="$(strip $(1))"; \ + URL="$($(strip $(1))_URL)"; \ if [ "$$URL" = "" ]; then \ echo; \ echo Error: empty parameter to \"get\(\)\"; \ diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index b8a5db99c..7d0c39f59 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -38,7 +38,7 @@ $(STATEDIR)/alsa-lib.get: $(alsa-lib_get_deps_default) $(ALSA_LIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ALSA_LIB_URL)) + @$(call get, ALSA_LIB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ alsa-lib_extract: $(STATEDIR)/alsa-lib.extract $(STATEDIR)/alsa-lib.extract: $(alsa-lib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ALSA_LIB_DIR)) - @$(call extract, $(ALSA_LIB_SOURCE)) + @$(call extract, ALSA_LIB) @$(call patchin, $(ALSA_LIB)) @$(call touch, $@) diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index 574141bea..4df65856a 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -38,7 +38,7 @@ $(STATEDIR)/alsa-utils.get: $(alsa-utils_get_deps_default) $(ALSA_UTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ALSA_UTILS_URL)) + @$(call get, ALSA_UTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ alsa-utils_extract: $(STATEDIR)/alsa-utils.extract $(STATEDIR)/alsa-utils.extract: $(alsa-utils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ALSA_UTILS_DIR)) - @$(call extract, $(ALSA_UTILS_SOURCE)) + @$(call extract, ALSA_UTILS) @$(call patchin, $(ALSA_UTILS)) @$(call touch, $@) diff --git a/rules/apache.make b/rules/apache.make index 5ece74e49..1a8fe4a7a 100644 --- a/rules/apache.make +++ b/rules/apache.make @@ -39,7 +39,7 @@ $(STATEDIR)/apache.get: $(apache_get_deps_default) $(APACHE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(APACHE_URL)) + @$(call get, APACHE) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ apache_extract: $(STATEDIR)/apache.extract $(STATEDIR)/apache.extract: $(apache_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(APACHE_DIR)) - @$(call extract, $(APACHE_SOURCE)) + @$(call extract, APACHE) @$(call patchin, $(APACHE)) @$(call touch, $@) diff --git a/rules/apache2.make b/rules/apache2.make index 70ea8f9a4..e3dcb2ce8 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -38,7 +38,7 @@ $(STATEDIR)/apache2.get: $(apache2_get_deps_default) $(APACHE2_SOURCE): @$(call targetinfo, $@) - @$(call get, $(APACHE2_URL)) + @$(call get, APACHE2) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ apache2_extract: $(STATEDIR)/apache2.extract $(STATEDIR)/apache2.extract: $(apache2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(APACHE2_DIR)) - @$(call extract, $(APACHE2_SOURCE)) + @$(call extract, APACHE2) @$(call patchin, $(APACHE2)) @$(call touch, $@) diff --git a/rules/at-spi.make b/rules/at-spi.make index e102a5ac1..84da88a8f 100644 --- a/rules/at-spi.make +++ b/rules/at-spi.make @@ -38,7 +38,7 @@ $(STATEDIR)/at-spi.get: $(at-spi_get_deps_deps) $(AT_SPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(AT_SPI_URL)) + @$(call get, AT_SPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ at-spi_extract: $(STATEDIR)/at-spi.extract $(STATEDIR)/at-spi.extract: $(at-spi_extract_deps_deps) @$(call targetinfo, $@) @$(call clean, $(AT_SPI_DIR)) - @$(call extract, $(AT_SPI_SOURCE)) + @$(call extract, AT_SPI) @$(call patchin, $(AT_SPI)) @$(call touch, $@) diff --git a/rules/atk.make b/rules/atk.make index da0b6a649..ac78680dc 100644 --- a/rules/atk.make +++ b/rules/atk.make @@ -40,7 +40,7 @@ $(STATEDIR)/atk.get: $(atk_get_deps_default) $(ATK_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ATK_URL)) + @$(call get, ATK) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ atk_extract: $(STATEDIR)/atk.extract $(STATEDIR)/atk.extract: $(atk_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ATK_DIR)) - @$(call extract, $(ATK_SOURCE)) + @$(call extract, ATK) @$(call patchin, $(ATK)) @$(call touch, $@) diff --git a/rules/bash.make b/rules/bash.make index 58dd29925..8e2ee1a1e 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -36,7 +36,7 @@ $(STATEDIR)/bash.get: $(bash_get_deps_default) $(BASH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BASH_URL)) + @$(call get, BASH) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ bash_extract: $(STATEDIR)/bash.extract $(STATEDIR)/bash.extract: $(bash_extract_deps_default) @$(call targetinfo, $@) @$(call clean $(BASH_DIR)) - @$(call extract, $(BASH_SOURCE)) + @$(call extract, BASH) @$(call patchin, $(BASH)) @$(call touch, $@) diff --git a/rules/betaftpd.make b/rules/betaftpd.make index bd305f475..425072b01 100644 --- a/rules/betaftpd.make +++ b/rules/betaftpd.make @@ -38,7 +38,7 @@ $(STATEDIR)/betaftpd.get: $(betaftpd_get_deps_default) $(BETAFTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BETAFTPD_URL)) + @$(call get, BETAFTPD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ betaftpd_extract: $(STATEDIR)/betaftpd.extract $(STATEDIR)/betaftpd.extract: $(betaftpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BETAFTPD_DIR)) - @$(call extract, $(BETAFTPD_SOURCE)) + @$(call extract, BETAFTPD) @$(call patchin, $(BETAFTPD)) @$(call touch, $@) diff --git a/rules/bind.make b/rules/bind.make index ca519db3f..9f0dbc253 100644 --- a/rules/bind.make +++ b/rules/bind.make @@ -38,7 +38,7 @@ $(STATEDIR)/bind.get: $(bind_get_deps_default) $(BIND_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BIND_URL)) + @$(call get, BIND) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ bind_extract: $(STATEDIR)/bind.extract $(STATEDIR)/bind.extract: $(bind_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BIND_DIR)) - @$(call extract, $(BIND_SOURCE)) + @$(call extract, BIND) @$(call patchin, $(BIND)) @$(call touch, $@) diff --git a/rules/bing.make b/rules/bing.make index bcb9e9012..fbbba40b6 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -38,7 +38,7 @@ $(STATEDIR)/bing.get: $(bing_get_deps_default) $(BING_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BING_URL)) + @$(call get, BING) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ bing_extract: $(STATEDIR)/bing.extract $(STATEDIR)/bing.extract: $(bing_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BING_DIR)) - @$(call extract, $(BING_SOURCE)) + @$(call extract, BING) @$(call patchin, $(BING)) @$(call touch, $@) diff --git a/rules/binutils.make b/rules/binutils.make index e91b63d99..87ac55995 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/binutils.get: $(binutils_get_deps_default) $(BINUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BINUTILS_URL)) + @$(call get, BINUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ binutils_extract: $(STATEDIR)/binutils.extract $(STATEDIR)/binutils.extract: $(binutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BINUTILS_DIR)) - @$(call extract, $(BINUTILS_SOURCE)) + @$(call extract, BINUTILS) @$(call patchin, $(BINUTILS)) @$(call touch, $@) diff --git a/rules/blackbox.make b/rules/blackbox.make index 61825f3b7..b7bb12fb2 100644 --- a/rules/blackbox.make +++ b/rules/blackbox.make @@ -38,7 +38,7 @@ $(STATEDIR)/blackbox.get: $(blackbox_get_deps_default) $(BLACKBOX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BLACKBOX_URL)) + @$(call get, BLACKBOX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ blackbox_extract: $(STATEDIR)/blackbox.extract $(STATEDIR)/blackbox.extract: $(blackbox_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BLACKBOX_DIR)) - @$(call extract, $(BLACKBOX_SOURCE)) + @$(call extract, BLACKBOX) @$(call patchin, $(BLACKBOX)) @$(call touch, $@) diff --git a/rules/bluez-libs.make b/rules/bluez-libs.make index a0c70de52..7c5cf8f6b 100644 --- a/rules/bluez-libs.make +++ b/rules/bluez-libs.make @@ -38,7 +38,7 @@ $(STATEDIR)/bluez-libs.get: $(bluez-libs_get_deps_default) $(BLUEZ_LIBS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BLUEZ_LIBS_URL)) + @$(call get, BLUEZ_LIBS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ bluez-libs_extract: $(STATEDIR)/bluez-libs.extract $(STATEDIR)/bluez-libs.extract: $(bluez-libs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BLUEZ_LIBS_DIR)) - @$(call extract, $(BLUEZ_LIBS_SOURCE)) + @$(call extract, BLUEZ_LIBS) @$(call patchin, $(BLUEZ_LIBS)) @$(call touch, $@) diff --git a/rules/bluez-utils.make b/rules/bluez-utils.make index 098aff5cf..8b3d2bfbc 100644 --- a/rules/bluez-utils.make +++ b/rules/bluez-utils.make @@ -38,7 +38,7 @@ $(STATEDIR)/bluez-utils.get: $(bluez-utils_get_deps_default) $(BLUEZ_UTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BLUEZ_UTILS_URL)) + @$(call get, BLUEZ_UTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ bluez-utils_extract: $(STATEDIR)/bluez-utils.extract $(STATEDIR)/bluez-utils.extract: $(bluez-utils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BLUEZ_UTILS_DIR)) - @$(call extract, $(BLUEZ_UTILS_SOURCE)) + @$(call extract, BLUEZ_UTILS) @$(call patchin, $(BLUEZ_UTILS)) @$(call touch, $@) diff --git a/rules/bonniexx.make b/rules/bonniexx.make index f2078a4d1..643505892 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -38,7 +38,7 @@ $(STATEDIR)/bonniexx.get: $(bonniexx_get_deps_default) $(BONNIEXX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BONNIEXX_URL)) + @$(call get, BONNIEXX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ bonniexx_extract: $(STATEDIR)/bonniexx.extract $(STATEDIR)/bonniexx.extract: $(bonniexx_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BONNIEXX_DIR)) - @$(call extract, $(BONNIEXX_SOURCE)) + @$(call extract, BONNIEXX) @$(call patchin, $(BONNIEXX)) @$(call touch, $@) diff --git a/rules/boost.make b/rules/boost.make index 50bcf260d..a33afd432 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -38,7 +38,7 @@ $(STATEDIR)/boost.get: $(boost_get_deps_default) $(BOOST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BOOST_URL)) + @$(call get, BOOST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ boost_extract: $(STATEDIR)/boost.extract $(STATEDIR)/boost.extract: $(boost_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BOOST_DIR)) - @$(call extract, $(BOOST_SOURCE)) + @$(call extract, BOOST) @$(call patchin, $(BOOST)) @$(call touch, $@) diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make index 0f40fac7b..3e1dac131 100644 --- a/rules/bridge-utils.make +++ b/rules/bridge-utils.make @@ -40,7 +40,7 @@ $(STATEDIR)/bridge-utils.get: $(bridge-utils_get_deps_default) $(BRIDGE_UTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BRIDGE_UTILS_URL)) + @$(call get, BRIDGE_UTILS) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ bridge-utils_extract: $(STATEDIR)/bridge-utils.extract $(STATEDIR)/bridge-utils.extract: $(bridge-utils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BRIDGE_UTILS_DIR)) - @$(call extract, $(BRIDGE_UTILS_SOURCE)) + @$(call extract, BRIDGE_UTILS) @$(call patchin, $(BRIDGE_UTILS)) @$(call touch, $@) diff --git a/rules/busybox.make b/rules/busybox.make index 9038325ce..57faaa240 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -38,7 +38,7 @@ $(STATEDIR)/busybox.get: $(busybox_get_deps_default) $(BUSYBOX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(BUSYBOX_URL)) + @$(call get, BUSYBOX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ busybox_extract: $(STATEDIR)/busybox.extract $(STATEDIR)/busybox.extract: $(busybox_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(BUSYBOX_DIR)) - @$(call extract, $(BUSYBOX_SOURCE)) + @$(call extract, BUSYBOX) @$(call patchin, $(BUSYBOX)) # # fix: turn off debugging in init.c diff --git a/rules/cairo.make b/rules/cairo.make index f189dc83a..f492f66d0 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -38,7 +38,7 @@ $(STATEDIR)/cairo.get: $(cairo_get_deps_default) $(CAIRO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CAIRO_URL)) + @$(call get, CAIRO) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ cairo_extract: $(STATEDIR)/cairo.extract $(STATEDIR)/cairo.extract: $(cairo_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CAIRO_DIR)) - @$(call extract, $(CAIRO_SOURCE)) + @$(call extract, CAIRO) @$(call patchin, $(CAIRO)) @$(call touch, $@) diff --git a/rules/canutils.make b/rules/canutils.make index a24d9764e..092a7e42b 100644 --- a/rules/canutils.make +++ b/rules/canutils.make @@ -39,7 +39,7 @@ $(STATEDIR)/canutils.get: $(canutils_get_deps_default) $(CANUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CANUTILS_URL)) + @$(call get, CANUTILS) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ canutils_extract: $(STATEDIR)/canutils.extract $(STATEDIR)/canutils.extract: $(canutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CANUTILS_DIR)) - @$(call extract, $(CANUTILS_SOURCE)) + @$(call extract, CANUTILS) @$(call patchin, $(CANUTILS)) @$(call touch, $@) diff --git a/rules/cfgsh.make b/rules/cfgsh.make index db32439b3..e467011f0 100644 --- a/rules/cfgsh.make +++ b/rules/cfgsh.make @@ -38,7 +38,7 @@ $(STATEDIR)/cfgsh.get: $(cfgsh_get_deps_default) $(CFGSH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CFGSH_URL)) + @$(call get, CFGSH) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ cfgsh_extract: $(STATEDIR)/cfgsh.extract $(STATEDIR)/cfgsh.extract: $(cfgsh_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CFGSH_DIR)) - @$(call extract, $(CFGSH_SOURCE)) + @$(call extract, CFGSH) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/chrony.make b/rules/chrony.make index 9b73c1dc3..a17e01634 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -38,7 +38,7 @@ $(STATEDIR)/chrony.get: $(chrony_get_deps_default) $(CHRONY_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CHRONY_URL)) + @$(call get, CHRONY) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ chrony_extract: $(STATEDIR)/chrony.extract $(STATEDIR)/chrony.extract: $(chrony_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CHRONY_DIR)) - @$(call extract, $(CHRONY_SOURCE)) + @$(call extract, CHRONY) @$(call patchin, $(CHRONY)) @$(call touch, $@) diff --git a/rules/clock.make b/rules/clock.make index 494f95a5d..dff6636c8 100644 --- a/rules/clock.make +++ b/rules/clock.make @@ -38,7 +38,7 @@ $(STATEDIR)/clock.get: $(clock_get_deps_default) $(CLOCK_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CLOCK_URL)) + @$(call get, CLOCK) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ clock_extract: $(STATEDIR)/clock.extract $(STATEDIR)/clock.extract: $(clock_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CLOCK_DIR)) - @$(call extract, $(CLOCK_SOURCE)) + @$(call extract, CLOCK) @$(call patchin, $(CLOCK)) @$(call touch, $@) diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index 588ab9456..b54a7679a 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -38,7 +38,7 @@ $(STATEDIR)/commoncpp2.get: $(commoncpp2_get_deps_default) $(COMMONCPP2_SOURCE): @$(call targetinfo, $@) - @$(call get, $(COMMONCPP2_URL)) + @$(call get, COMMONCPP2) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ commoncpp2_extract: $(STATEDIR)/commoncpp2.extract $(STATEDIR)/commoncpp2.extract: $(commoncpp2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(COMMONCPP2_DIR)) - @$(call extract, $(COMMONCPP2_SOURCE)) + @$(call extract, COMMONCPP2) @$(call patchin, $(COMMONCPP2)) @$(call touch, $@) diff --git a/rules/coreutils.make b/rules/coreutils.make index 8016af89f..647d16b3f 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -36,7 +36,7 @@ $(STATEDIR)/coreutils.get: $(coreutils_get_deps_default) $(COREUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(COREUTILS_URL)) + @$(call get, COREUTILS) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ coreutils_extract: $(STATEDIR)/coreutils.extract $(STATEDIR)/coreutils.extract: $(coreutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(COREUTILS_DIR)) - @$(call extract, $(COREUTILS_SOURCE)) + @$(call extract, COREUTILS) @$(call patchin, $(COREUTILS)) @$(call touch, $@) diff --git a/rules/cppunit.make b/rules/cppunit.make index 491356c0c..82dc79473 100644 --- a/rules/cppunit.make +++ b/rules/cppunit.make @@ -38,7 +38,7 @@ $(STATEDIR)/cppunit.get: $(cppunit_get_deps_default) $(CPPUNIT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CPPUNIT_URL)) + @$(call get, CPPUNIT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ cppunit_extract: $(STATEDIR)/cppunit.extract $(STATEDIR)/cppunit.extract: $(cppunit_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CPPUNIT_DIR)) - @$(call extract, $(CPPUNIT_SOURCE)) + @$(call extract, CPPUNIT) @$(call patchin, $(CPPUNIT)) @$(call touch, $@) diff --git a/rules/cramfs.make b/rules/cramfs.make index 356c38c7b..f11f1973e 100644 --- a/rules/cramfs.make +++ b/rules/cramfs.make @@ -40,7 +40,7 @@ $(STATEDIR)/cramfs.get: $(cramfs_get_deps_default) $(CRAMFS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CRAMFS_URL)) + @$(call get, CRAMFS) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ cramfs_extract: $(STATEDIR)/cramfs.extract $(STATEDIR)/cramfs.extract: $(cramfs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CRAMFS_DIR)) - @$(call extract, $(CRAMFS_SOURCE)) + @$(call extract, CRAMFS) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/cross-gdb.make b/rules/cross-gdb.make index 0bbe37f8e..e4ca71035 100644 --- a/rules/cross-gdb.make +++ b/rules/cross-gdb.make @@ -45,7 +45,7 @@ cross-gdb_extract: $(STATEDIR)/cross-gdb.extract $(STATEDIR)/cross-gdb.extract: $(cross-gdb_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CROSS_GDB_DIR)) - @$(call extract, $(CROSS_GDB_SOURCE), $(CROSS_BUILDDIR)) + @$(call extract, CROSS_GDB, $(CROSS_BUILDDIR)) @$(call patchin, $(CROSS_GDB), $(CROSS_GDB_DIR)) @$(call touch, $@) diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make index 5d49d4960..68dc7155c 100644 --- a/rules/cross-nasm.make +++ b/rules/cross-nasm.make @@ -39,7 +39,7 @@ $(STATEDIR)/cross-nasm.get: $(cross-nasm_get_deps_default) $(CROSS_NASM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CROSS_NASM_URL)) + @$(call get, CROSS_NASM) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ cross-nasm_extract: $(STATEDIR)/cross-nasm.extract $(STATEDIR)/cross-nasm.extract: $(cross-nasm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CROSS_NASM_DIR)) - @$(call extract, $(CROSS_NASM_SOURCE), $(CROSS_BUILDDIR)) + @$(call extract, CROSS_NASM, $(CROSS_BUILDDIR)) @$(call patchin, $(CROSS_NASM), $(CROSS_NASM_DIR)) @$(call touch, $@) diff --git a/rules/crosstool.make b/rules/crosstool.make index 651ab4cf0..767bae697 100644 --- a/rules/crosstool.make +++ b/rules/crosstool.make @@ -43,7 +43,7 @@ $(STATEDIR)/crosstool.get: $(crosstool_get_deps_default) $(CROSSTOOL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CROSSTOOL_URL)) + @$(call get, CROSSTOOL) # ---------------------------------------------------------------------------- # Extract @@ -54,7 +54,7 @@ crosstool_extract: $(STATEDIR)/crosstool.extract $(STATEDIR)/crosstool.extract: $(crosstool_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CROSSTOOL_DIR)) - @$(call extract, $(CROSSTOOL_SOURCE), $(CROSS_BUILDDIR)) + @$(call extract, CROSSTOOL, $(CROSS_BUILDDIR)) @$(call patchin, $(CROSSTOOL),$(CROSSTOOL_DIR)) @$(call touch, $@) diff --git a/rules/cyclictest.make b/rules/cyclictest.make index 8a6b82310..1b8560e62 100644 --- a/rules/cyclictest.make +++ b/rules/cyclictest.make @@ -38,7 +38,7 @@ $(STATEDIR)/cyclictest.get: $(cyclictest_get_deps_default) $(CYCLICTEST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CYCLICTEST_URL)) + @$(call get, CYCLICTEST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ cyclictest_extract: $(STATEDIR)/cyclictest.extract $(STATEDIR)/cyclictest.extract: $(cyclictest_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CYCLICTEST_DIR)) - @$(call extract, $(CYCLICTEST_SOURCE)) + @$(call extract, CYCLICTEST) @$(call patchin, $(CYCLICTEST)) # Well, we extract to... mv $(BUILDDIR)/cyclictest $(CYCLICTEST_DIR) diff --git a/rules/daemonize.make b/rules/daemonize.make index 7228c8c98..7a357fc66 100644 --- a/rules/daemonize.make +++ b/rules/daemonize.make @@ -38,7 +38,7 @@ $(STATEDIR)/daemonize.get: $(daemonize_get_deps_default) $(DAEMONIZE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DAEMONIZE_URL)) + @$(call get, DAEMONIZE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ daemonize_extract: $(STATEDIR)/daemonize.extract $(STATEDIR)/daemonize.extract: $(daemonize_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DAEMONIZE_DIR)) - @$(call extract, $(DAEMONIZE_SOURCE)) + @$(call extract, DAEMONIZE) @$(call patchin, $(DAEMONIZE)) @$(call touch, $@) diff --git a/rules/db41.make b/rules/db41.make index 1963e73ca..161c92449 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -38,7 +38,7 @@ $(STATEDIR)/db41.get: $(db41_get_deps_default) $(DB41_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DB41_URL)) + @$(call get, DB41) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ db41_extract: $(STATEDIR)/db41.extract $(STATEDIR)/db41.extract: $(db41_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DB41_DIR)) - @$(call extract, $(DB41_SOURCE)) + @$(call extract, DB41) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/dbench.make b/rules/dbench.make index 822b6af4e..1ad6e0a99 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -38,7 +38,7 @@ $(STATEDIR)/dbench.get: $(dbench_get_deps_default) $(DBENCH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DBENCH_URL)) + @$(call get, DBENCH) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ dbench_extract: $(STATEDIR)/dbench.extract $(STATEDIR)/dbench.extract: $(dbench_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DBENCH_DIR)) - @$(call extract, $(DBENCH_SOURCE)) + @$(call extract, DBENCH) @$(call patchin, $(DBENCH)) @$(call touch, $@) diff --git a/rules/dhcp.make b/rules/dhcp.make index fd5d6a70f..a98498bec 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -38,7 +38,7 @@ $(STATEDIR)/dhcp.get: $(dhcp_get_deps_default) $(DHCP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DHCP_URL)) + @$(call get, DHCP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ dhcp_extract: $(STATEDIR)/dhcp.extract $(STATEDIR)/dhcp.extract: $(dhcp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DHCP_DIR)) - @$(call extract, $(DHCP_SOURCE)) + @$(call extract, DHCP) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/dialog.make b/rules/dialog.make index 89e79a826..601881005 100644 --- a/rules/dialog.make +++ b/rules/dialog.make @@ -38,7 +38,7 @@ $(STATEDIR)/dialog.get: $(dialog_get_deps_default) $(DIALOG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DIALOG_URL)) + @$(call get, DIALOG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ dialog_extract: $(STATEDIR)/dialog.extract $(STATEDIR)/dialog.extract: $(dialog_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DIALOG_DIR)) - @$(call extract, $(DIALOG_SOURCE)) + @$(call extract, DIALOG) @$(call patchin, $(DIALOG)) @$(call touch, $@) diff --git a/rules/diffutils.make b/rules/diffutils.make index 4c68fb13c..2207b723c 100644 --- a/rules/diffutils.make +++ b/rules/diffutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/diffutils.get: $(diffutils_get_deps_default) $(DIFFUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DIFFUTILS_URL)) + @$(call get, DIFFUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ diffutils_extract: $(STATEDIR)/diffutils.extract $(STATEDIR)/diffutils.extract: $(diffutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DIFFUTILS_DIR)) - @$(call extract, $(DIFFUTILS_SOURCE)) + @$(call extract, DIFFUTILS) @$(call patchin, $(DIFFUTILS)) @$(call touch, $@) diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index df503579e..91292f6ac 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -38,7 +38,7 @@ $(STATEDIR)/dnsmasq.get: $(dnsmasq_get_deps_default) $(DNSMASQ_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DNSMASQ_URL)) + @$(call get, DNSMASQ) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ dnsmasq_extract: $(STATEDIR)/dnsmasq.extract $(STATEDIR)/dnsmasq.extract: $(dnsmasq_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DNSMASQ_DIR)) - @$(call extract, $(DNSMASQ_SOURCE)) + @$(call extract, DNSMASQ) @$(call patchin, $(DNSMASQ)) @$(call touch, $@) diff --git a/rules/dosfstools.make b/rules/dosfstools.make index aca5be86f..aeb549e07 100644 --- a/rules/dosfstools.make +++ b/rules/dosfstools.make @@ -41,7 +41,7 @@ $(STATEDIR)/dosfstools.get: $(dosfstools_get_deps_default) $(DOSFSTOOLS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DOSFSTOOLS_URL)) + @$(call get, DOSFSTOOLS) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ dosfstools_extract: $(STATEDIR)/dosfstools.extract $(STATEDIR)/dosfstools.extract: $(dosfstools_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DOSFSTOOLS_DIR)) - @$(call extract, $(DOSFSTOOLS_SOURCE)) + @$(call extract, DOSFSTOOLS) @$(call patchin, $(DOSFSTOOLS)) @$(call touch, $@) diff --git a/rules/dropbear.make b/rules/dropbear.make index 6a73ba6fb..4a53a9d81 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -39,7 +39,7 @@ $(STATEDIR)/dropbear.get: $(dropbear_get_deps_default) $(DROPBEAR_SOURCE): @$(call targetinfo, $@) - @$(call get, $(DROPBEAR_URL)) + @$(call get, DROPBEAR) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ dropbear_extract: $(STATEDIR)/dropbear.extract $(STATEDIR)/dropbear.extract: $(dropbear_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(DROPBEAR_DIR)) - @$(call extract, $(DROPBEAR_SOURCE)) + @$(call extract, DROPBEAR) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 0f873a861..d3e202907 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -39,7 +39,7 @@ $(STATEDIR)/e2fsprogs.get: $(e2fsprogs_get_deps_default) $(E2FSPROGS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(E2FSPROGS_URL)) + @$(call get, E2FSPROGS) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ e2fsprogs_extract: $(STATEDIR)/e2fsprogs.extract $(STATEDIR)/e2fsprogs.extract: $(e2fsprogs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(E2FSPROGS_DIR)) - @$(call extract, $(E2FSPROGS_SOURCE)) + @$(call extract, E2FSPROGS) @$(call patchin, $(E2FSPROGS)) chmod +w $(E2FSPROGS_DIR)/po/*.po @$(call touch, $@) diff --git a/rules/e2tools.make b/rules/e2tools.make index 4a2769eeb..d151d20d8 100644 --- a/rules/e2tools.make +++ b/rules/e2tools.make @@ -40,7 +40,7 @@ $(STATEDIR)/host-e2tools.get: $(host-e2tools_get_deps_default) $(HOST_E2TOOLS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_E2TOOLS_URL)) + @$(call get, HOST_E2TOOLS) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ host-e2tools_extract: $(STATEDIR)/host-e2tools.extract $(STATEDIR)/host-e2tools.extract: $(host-e2tools_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_E2TOOLS_DIR)) - @$(call extract, $(HOST_E2TOOLS_SOURCE)) + @$(call extract, HOST_E2TOOLS) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/efax.make b/rules/efax.make index 2f682951e..53a54e860 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -38,7 +38,7 @@ $(STATEDIR)/efax.get: $(efax_get_deps_default) $(EFAX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(EFAX_URL)) + @$(call get, EFAX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ efax_extract: $(STATEDIR)/efax.extract $(STATEDIR)/efax.extract: $(efax_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(EFAX_DIR)) - @$(call extract, $(EFAX_SOURCE)) + @$(call extract, EFAX) @$(call patchin, $(EFAX)) @$(call touch, $@) diff --git a/rules/ethereal.make b/rules/ethereal.make index aae77e1b2..2612a6e30 100644 --- a/rules/ethereal.make +++ b/rules/ethereal.make @@ -38,7 +38,7 @@ $(STATEDIR)/ethereal.get: $(ethereal_get_deps_default) $(ETHEREAL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ETHEREAL_URL)) + @$(call get, ETHEREAL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ ethereal_extract: $(STATEDIR)/ethereal.extract $(STATEDIR)/ethereal.extract: $(ethereal_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ETHEREAL_DIR)) - @$(call extract, $(ETHEREAL_SOURCE)) + @$(call extract, ETHEREAL) @$(call patchin, $(ETHEREAL)) @$(call touch, $@) diff --git a/rules/etherwake.make b/rules/etherwake.make index 1173c2657..8e50213e5 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -38,7 +38,7 @@ $(STATEDIR)/etherwake.get: $(etherwake_get_deps_default) $(ETHERWAKE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ETHERWAKE_URL)) + @$(call get, ETHERWAKE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ etherwake_extract: $(STATEDIR)/etherwake.extract $(STATEDIR)/etherwake.extract: $(etherwake_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ETHERWAKE_DIR)) - @$(call extract, $(ETHERWAKE_SOURCE)) + @$(call extract, ETHERWAKE) @$(call patchin, $(ETHERWAKE)) @$(call touch, $@) diff --git a/rules/eventlog.make b/rules/eventlog.make index 57c42ed8e..54984a7c7 100644 --- a/rules/eventlog.make +++ b/rules/eventlog.make @@ -38,7 +38,7 @@ $(STATEDIR)/eventlog.get: $(eventlog_get_deps_default) $(EVENTLOG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(EVENTLOG_URL)) + @$(call get, EVENTLOG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ eventlog_extract: $(STATEDIR)/eventlog.extract $(STATEDIR)/eventlog.extract: $(eventlog_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(EVENTLOG_DIR)) - @$(call extract, $(EVENTLOG_SOURCE)) + @$(call extract, EVENTLOG) @$(call patchin, $(EVENTLOG)) @$(call touch, $@) diff --git a/rules/expat.make b/rules/expat.make index aeed4add5..f4720a635 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -39,7 +39,7 @@ $(STATEDIR)/expat.get: $(expat_get_deps_default) $(EXPAT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(EXPAT_URL)) + @$(call get, EXPAT) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ expat_extract: $(STATEDIR)/expat.extract $(STATEDIR)/expat.extract: $(expat_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(EXPAT_DIR)) - @$(call extract, $(EXPAT_SOURCE)) + @$(call extract, EXPAT) @$(call patchin, $(EXPAT)) @$(call touch, $@) diff --git a/rules/fbtest.make b/rules/fbtest.make index 65e54194b..b09d40e92 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -38,7 +38,7 @@ $(STATEDIR)/fbtest.get: $(fbtest_get_deps_default) $(FBTEST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FBTEST_URL)) + @$(call get, FBTEST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ fbtest_extract: $(STATEDIR)/fbtest.extract $(STATEDIR)/fbtest.extract: $(fbtest_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FBTEST_DIR)) - @$(call extract, $(FBTEST_SOURCE)) + @$(call extract, FBTEST) @$(call patchin, $(FBTEST)) @$(call touch, $@) diff --git a/rules/fbutils.make b/rules/fbutils.make index 760f256e5..ac64da772 100644 --- a/rules/fbutils.make +++ b/rules/fbutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/fbutils.get: $(fbutils_get_deps_default) $(FBUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FBUTILS_URL)) + @$(call get, FBUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ fbutils_extract: $(STATEDIR)/fbutils.extract $(STATEDIR)/fbutils.extract: $(fbutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FBUTILS_DIR)) - @$(call extract, $(FBUTILS_SOURCE)) + @$(call extract, FBUTILS) @$(call patchin, $(FBUTILS)) @$(call touch, $@) diff --git a/rules/figlet.make b/rules/figlet.make index 551f867b8..dfb46306d 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -38,7 +38,7 @@ $(STATEDIR)/figlet.get: $(figlet_get_deps_default) $(FIGLET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FIGLET_URL)) + @$(call get, FIGLET) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ figlet_extract: $(STATEDIR)/figlet.extract $(STATEDIR)/figlet.extract: $(figlet_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FIGLET_DIR)) - @$(call extract, $(FIGLET_SOURCE)) + @$(call extract, FIGLET) @$(call patchin, $(FIGLET)) @$(call touch, $@) diff --git a/rules/flash.make b/rules/flash.make index 91919090c..c0d0f3f89 100644 --- a/rules/flash.make +++ b/rules/flash.make @@ -44,7 +44,7 @@ $(STATEDIR)/flash.get: $(flash_get_deps_default) $(FLASH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FLASH_URL)) + @$(call get, FLASH) # ---------------------------------------------------------------------------- # Extract diff --git a/rules/flex.make b/rules/flex.make index 10eea046f..e0e2a7506 100644 --- a/rules/flex.make +++ b/rules/flex.make @@ -38,7 +38,7 @@ $(STATEDIR)/flex.get: $(flex_get_deps_default) $(FLEX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FLEX_URL)) + @$(call get, FLEX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ flex_extract: $(STATEDIR)/flex.extract $(STATEDIR)/flex.extract: $(flex_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FLEX_DIR)) - @$(call extract, $(FLEX_SOURCE)) + @$(call extract, FLEX) @$(call patchin, $(FLEX)) @$(call touch, $@) diff --git a/rules/fltk.make b/rules/fltk.make index f7e9d18a3..9b93e06fa 100644 --- a/rules/fltk.make +++ b/rules/fltk.make @@ -38,7 +38,7 @@ $(STATEDIR)/fltk.get: $(fltk_get_deps_default) $(FLTK_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FLTK_URL)) + @$(call get, FLTK) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ fltk_extract: $(STATEDIR)/fltk.extract $(STATEDIR)/fltk.extract: $(fltk_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FLTK_DIR)) - @$(call extract, $(FLTK_SOURCE)) + @$(call extract, FLTK) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/fontconfig.make b/rules/fontconfig.make index ea6879d91..342c06291 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -38,7 +38,7 @@ $(STATEDIR)/fontconfig.get: $(fontconfig_get_deps_default) $(FONTCONFIG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FONTCONFIG_URL)) + @$(call get, FONTCONFIG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ fontconfig_extract: $(STATEDIR)/fontconfig.extract $(STATEDIR)/fontconfig.extract: $(fontconfig_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FONTCONFIG_DIR)) - @$(call extract, $(FONTCONFIG_SOURCE)) + @$(call extract, FONTCONFIG) @$(call patchin, $(FONTCONFIG)) @$(call touch, $@) @@ -60,12 +60,16 @@ $(STATEDIR)/fontconfig.extract: $(fontconfig_extract_deps_default) fontconfig_prepare: $(STATEDIR)/fontconfig.prepare FONTCONFIG_PATH := PATH=$(CROSS_PATH) -FONTCONFIG_ENV := $(CROSS_ENV) +FONTCONFIG_ENV := \ + $(CROSS_ENV) \ + ac_cv_prog_HASDOCBOOK=no # # autoconf # -FONTCONFIG_AUTOCONF := $(CROSS_AUTOCONF_USR) +FONTCONFIG_AUTOCONF = \ + $(CROSS_AUTOCONF_USR) \ + --disable-docs $(STATEDIR)/fontconfig.prepare: $(fontconfig_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/freetype.make b/rules/freetype.make index 328f303bf..834bc5859 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -38,7 +38,7 @@ $(STATEDIR)/freetype.get: $(freetype_get_deps_default) $(FREETYPE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(FREETYPE_URL)) + @$(call get, FREETYPE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ freetype_extract: $(STATEDIR)/freetype.extract $(STATEDIR)/freetype.extract: $(freetype_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(FREETYPE_DIR)) - @$(call extract, $(FREETYPE_SOURCE)) + @$(call extract, FREETYPE) @$(call patchin, $(FREETYPE)) @$(call touch, $@) diff --git a/rules/gail.make b/rules/gail.make index 0486d088b..251e1f1d4 100644 --- a/rules/gail.make +++ b/rules/gail.make @@ -38,7 +38,7 @@ $(STATEDIR)/gail.get: $(gail_get_deps_default) $(GAIL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GAIL_URL)) + @$(call get, GAIL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gail_extract: $(STATEDIR)/gail.extract $(STATEDIR)/gail.extract: $(gail_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GAIL_DIR)) - @$(call extract, $(GAIL_SOURCE)) + @$(call extract, GAIL) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/gawk.make b/rules/gawk.make index 09fd9e7a3..662983098 100644 --- a/rules/gawk.make +++ b/rules/gawk.make @@ -38,7 +38,7 @@ $(STATEDIR)/gawk.get: $(gawk_get_deps_default) $(GAWK_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GAWK_URL)) + @$(call get, GAWK) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gawk_extract: $(STATEDIR)/gawk.extract $(STATEDIR)/gawk.extract: $(gawk_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GAWK_DIR)) - @$(call extract, $(GAWK_SOURCE)) + @$(call extract, GAWK) @$(call patchin, $(GAWK)) @$(call touch, $@) diff --git a/rules/gdb.make b/rules/gdb.make index 242e616bb..d73474f64 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -40,7 +40,7 @@ $(STATEDIR)/gdb.get: $(gdb_get_deps_default) $(GDB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GDB_URL)) + @$(call get, GDB) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ gdb_extract: $(STATEDIR)/gdb.extract $(STATEDIR)/gdb.extract: $(gdb_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GDB_DIR)) - @$(call extract, $(GDB_SOURCE)) + @$(call extract, GDB) @$(call patchin, $(GDB)) @$(call touch, $@) diff --git a/rules/gettext.make b/rules/gettext.make index ddfb1aea3..a2d567cff 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -41,7 +41,7 @@ $(STATEDIR)/gettext.get: $(gettext_get_deps_default) $(GETTEXT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GETTEXT_URL)) + @$(call get, GETTEXT) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ gettext_extract: $(STATEDIR)/gettext.extract $(STATEDIR)/gettext.extract: $(gettext_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GETTEXT_DIR)) - @$(call extract, $(GETTEXT_SOURCE)) + @$(call extract, GETTEXT) @$(call patchin, $(GETTEXT)) @$(call touch, $@) diff --git a/rules/glib.make b/rules/glib.make index e4ab5569f..1473b553e 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -39,7 +39,7 @@ $(STATEDIR)/glib.get: $(glib_get_deps_default) $(GLIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GLIB_URL)) + @$(call get, GLIB) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ glib_extract: $(STATEDIR)/glib.extract $(STATEDIR)/glib.extract: $(glib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GLIB_DIR)) - @$(call extract, $(GLIB_SOURCE)) + @$(call extract, GLIB) @$(call patchin, $(GLIB)) @$(call touch, $@) diff --git a/rules/gmp3.make b/rules/gmp3.make index f3d8a5e42..37160d01e 100644 --- a/rules/gmp3.make +++ b/rules/gmp3.make @@ -37,7 +37,7 @@ $(STATEDIR)/gmp3.get: $(gmp3_get_deps_default)) $(GMP3_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GMP3_URL)) + @$(call get, GMP3) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ gmp3_extract: $(STATEDIR)/gmp3.extract $(STATEDIR)/gmp3.extract: $(gmp3_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GMP3_DIR)) - @$(call extract, $(GMP3_SOURCE)) + @$(call extract, GMP3) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/gmp4.make b/rules/gmp4.make index 957fff259..ff81c3540 100644 --- a/rules/gmp4.make +++ b/rules/gmp4.make @@ -37,7 +37,7 @@ $(STATEDIR)/gmp4.get: $(gmp4_get_deps_default) $(GMP4_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GMP4_URL)) + @$(call get, GMP4) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ gmp4_extract: $(STATEDIR)/gmp4.extract $(STATEDIR)/gmp4.extract: $(gmp4_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GMP4_DIR)) - @$(call extract, $(GMP4_SOURCE)) + @$(call extract, GMP4) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/gnupg.make b/rules/gnupg.make index 6f576c106..5d63601fa 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -38,7 +38,7 @@ $(STATEDIR)/gnupg.get: $(gnupg_get_deps_default) $(GNUPG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GNUPG_URL)) + @$(call get, GNUPG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gnupg_extract: $(STATEDIR)/gnupg.extract $(STATEDIR)/gnupg.extract: $(gnupg_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GNUPG_DIR)) - @$(call extract, $(GNUPG_SOURCE)) + @$(call extract, GNUPG) @$(call patchin, $(GNUPG)) @$(call touch, $@) diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 727434f36..45ad678b7 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -38,7 +38,7 @@ $(STATEDIR)/gnuplot.get: $(gnuplot_get_deps_default) $(GNUPLOT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GNUPLOT_URL)) + @$(call get, GNUPLOT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gnuplot_extract: $(STATEDIR)/gnuplot.extract $(STATEDIR)/gnuplot.extract: $(gnuplot_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GNUPLOT_DIR)) - @$(call extract, $(GNUPLOT_SOURCE)) + @$(call extract, GNUPLOT) @$(call patchin, $(GNUPLOT)) @$(call touch, $@) diff --git a/rules/grub.make b/rules/grub.make index 3f934fb06..00862e6d7 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -36,7 +36,7 @@ $(STATEDIR)/grub.get: $(grub_get_deps_default) $(GRUB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GRUB_URL)) + @$(call get, GRUB) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ grub_extract: $(STATEDIR)/grub.extract $(STATEDIR)/grub.extract: $(grub_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GRUB_DIR)) - @$(call extract, $(GRUB_SOURCE)) + @$(call extract, GRUB) @$(call patchin, $(GRUB)) @$(call touch, $@) diff --git a/rules/gtk.make b/rules/gtk.make index 213d59f6f..f0214459f 100644 --- a/rules/gtk.make +++ b/rules/gtk.make @@ -38,7 +38,7 @@ $(STATEDIR)/gtk.get: $(gtk_get_deps_default) $(GTK_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GTK_URL)) + @$(call get, GTK) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gtk_extract: $(STATEDIR)/gtk.extract $(STATEDIR)/gtk.extract: $(gtk_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GTK_DIR)) - @$(call extract, $(GTK_SOURCE)) + @$(call extract, GTK) @$(call patchin, $(GTK)) @$(call touch, $@) diff --git a/rules/gtk1210.make b/rules/gtk1210.make index 6d9730d86..e1e80bbf4 100644 --- a/rules/gtk1210.make +++ b/rules/gtk1210.make @@ -39,7 +39,7 @@ $(STATEDIR)/gtk1210.get: $(gtk1210_get_deps_default) $(GTK1210_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GTK1210_URL)) + @$(call get, GTK1210) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ gtk1210_extract: $(STATEDIR)/gtk1210.extract $(STATEDIR)/gtk1210.extract: $(gtk1210_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GTK1210_DIR)) - @$(call extract, $(GTK1210_SOURCE)) + @$(call extract, GTK1210) @$(call patchin, $(GTK1210)) @$(call touch, $@) diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make index edc1d4f8b..7424a6549 100644 --- a/rules/gtk2-engines.make +++ b/rules/gtk2-engines.make @@ -38,7 +38,7 @@ $(STATEDIR)/gtk2-engines.get: $(gtk2-engines_get_deps_default) $(GTK2-ENGINES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GTK2-ENGINES_URL)) + @$(call get, GTK2-ENGINES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ gtk2-engines_extract: $(STATEDIR)/gtk2-engines.extract $(STATEDIR)/gtk2-engines.extract: $(gtk2-engines_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GTK2-ENGINES_DIR)) - @$(call extract, $(GTK2-ENGINES_SOURCE)) + @$(call extract, GTK2-ENGINES) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/gtk22.make b/rules/gtk22.make index 00a96f189..2774364ab 100644 --- a/rules/gtk22.make +++ b/rules/gtk22.make @@ -39,7 +39,7 @@ $(STATEDIR)/gtk22.get: $(gtk22_get_deps_default) $(GTK22_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GTK22_URL)) + @$(call get, GTK22) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ gtk22_extract: $(STATEDIR)/gtk22.extract $(STATEDIR)/gtk22.extract: $(gtk22_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GTK22_DIR)) - @$(call extract, $(GTK22_SOURCE)) + @$(call extract, GTK22) @$(call patchin, $(GTK22)) @$(call touch, $@) diff --git a/rules/gtk26.make b/rules/gtk26.make index 182ec0acb..34b4b6f82 100644 --- a/rules/gtk26.make +++ b/rules/gtk26.make @@ -39,7 +39,7 @@ $(STATEDIR)/gtk26.get: $(gtk26_get_deps_default) $(GTK26_SOURCE): @$(call targetinfo, $@) - @$(call get, $(GTK26_URL)) + @$(call get, GTK26) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ gtk26_extract: $(STATEDIR)/gtk26.extract $(STATEDIR)/gtk26.extract: $(gtk26_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(GTK26_DIR)) - @$(call extract, $(GTK26_SOURCE)) + @$(call extract, GTK26) @$(call patchin, $(GTK26)) @$(call touch, $@) diff --git a/rules/hdparm.make b/rules/hdparm.make index ebb82ee39..f787098b6 100644 --- a/rules/hdparm.make +++ b/rules/hdparm.make @@ -38,7 +38,7 @@ $(STATEDIR)/hdparm.get: $(hdparm_get_deps_default) $(HDPARM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HDPARM_URL)) + @$(call get, HDPARM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ hdparm_extract: $(STATEDIR)/hdparm.extract $(STATEDIR)/hdparm.extract: $(hdparm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HDPARM_DIR)) - @$(call extract, $(HDPARM_SOURCE)) + @$(call extract, HDPARM) @$(call patchin, $(HDPARM)) @$(call touch, $@) diff --git a/rules/hexedit.make b/rules/hexedit.make index bdfd5d015..3d9a6af84 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -38,7 +38,7 @@ $(STATEDIR)/hexedit.get: $(hexedit_get_deps_default) $(HEXEDIT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HEXEDIT_URL)) + @$(call get, HEXEDIT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ hexedit_extract: $(STATEDIR)/hexedit.extract $(STATEDIR)/hexedit.extract: $(hexedit_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HEXEDIT_DIR)) - @$(call extract, $(HEXEDIT_SOURCE)) + @$(call extract, HEXEDIT) mv $(BUILDDIR)/hexedit $(HEXEDIT_DIR) @$(call patchin, $(HEXEDIT)) @$(call touch, $@) diff --git a/rules/host-apache2.make b/rules/host-apache2.make index a82ff5f2a..4e689fbb6 100644 --- a/rules/host-apache2.make +++ b/rules/host-apache2.make @@ -40,7 +40,7 @@ host-apache2_extract: $(STATEDIR)/host-apache2.extract $(STATEDIR)/host-apache2.extract: $(host-apache2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_APACHE2_DIR)) - @$(call extract, $(APACHE2_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, APACHE2, $(HOST_BUILDDIR)) @$(call patchin, $(APACHE2), $(HOST_APACHE2_DIR)) @$(call touch, $@) diff --git a/rules/host-checkinstall.make b/rules/host-checkinstall.make index a43bfc617..d5d23d569 100644 --- a/rules/host-checkinstall.make +++ b/rules/host-checkinstall.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-checkinstall.get: $(host-checkinstall_get_deps_default) $(HOST_CHECKINSTALL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_CHECKINSTALL_URL)) + @$(call get, HOST_CHECKINSTALL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-checkinstall_extract: $(STATEDIR)/host-checkinstall.extract $(STATEDIR)/host-checkinstall.extract: $(host-checkinstall_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_CHECKINSTALL_DIR)) - @$(call extract, $(HOST_CHECKINSTALL_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_CHECKINSTALL, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_CHECKINSTALL), $(HOST_CHECKINSTALL_DIR)) @$(call touch, $@) diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index e763030dd..1730f6db1 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -40,7 +40,7 @@ host-e2fsprogs_extract: $(STATEDIR)/host-e2fsprogs.extract $(STATEDIR)/host-e2fsprogs.extract: $(host-e2fsprogs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_E2FSPROGS_DIR)) - @$(call extract, $(E2FSPROGS_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, E2FSPROGS, $(HOST_BUILDDIR)) @$(call patchin, $(E2FSPROGS), $(HOST_E2FSPROGS_DIR)) @$(call touch, $@) diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index d33b46ffb..e43c80faf 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-fakeroot.get: $(host-fakeroot_get_deps_default) $(HOST_FAKEROOT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_FAKEROOT_URL)) + @$(call get, HOST_FAKEROOT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-fakeroot_extract: $(STATEDIR)/host-fakeroot.extract $(STATEDIR)/host-fakeroot.extract: $(host-fakeroot_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_FAKEROOT_DIR)) - @$(call extract, $(HOST_FAKEROOT_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_FAKEROOT, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_FAKEROOT),$(HOST_FAKEROOT_DIR)) @$(call touch, $@) diff --git a/rules/host-flex254.make b/rules/host-flex254.make index 339648840..7435f8d52 100644 --- a/rules/host-flex254.make +++ b/rules/host-flex254.make @@ -40,7 +40,7 @@ host-flex254_extract: $(STATEDIR)/host-flex254.extract $(STATEDIR)/host-flex254.extract: $(host-flex254_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_FLEX254_DIR)) - @$(call extract, $(FLEX_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, FLEX, $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make index ed9876723..b7925e97a 100644 --- a/rules/host-genext2fs.make +++ b/rules/host-genext2fs.make @@ -39,7 +39,7 @@ $(STATEDIR)/host-genext2fs.get: $(host-genext2fs_get_deps_default) $(HOST_GENEXT2FS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_GENEXT2FS_URL)) + @$(call get, HOST_GENEXT2FS) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ host-genext2fs_extract: $(STATEDIR)/host-genext2fs.extract $(STATEDIR)/host-genext2fs.extract: $(host-genext2fs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_GENEXT2FS_DIR)) - @$(call extract, $(HOST_GENEXT2FS_SOURCE),$(HOST_BUILDDIR)) + @$(call extract, HOST_GENEXT2FS,$(HOST_BUILDDIR)) @$(call patchin, $(HOST_GENEXT2FS),$(HOST_GENEXT2FS_DIR)) @$(call touch, $@) diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 726f7e357..8a1bea3b8 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-ipkg-utils.get: $(host-ipkg-utils_get_deps_default) $(HOST_IPKG_UTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_IPKG_UTILS_URL)) + @$(call get, HOST_IPKG_UTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-ipkg-utils_extract: $(STATEDIR)/host-ipkg-utils.extract $(STATEDIR)/host-ipkg-utils.extract: $(host-ipkg-utils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_IPKG_UTILS_DIR)) - @$(call extract, $(HOST_IPKG_UTILS_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_IPKG_UTILS, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_IPKG_UTILS), $(HOST_IPKG_UTILS_DIR)) perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_HOST_PREFIX)/usr,g" \ $(HOST_IPKG_UTILS_DIR)/Makefile diff --git a/rules/host-ipkg.make b/rules/host-ipkg.make index 30861a609..ec1773416 100644 --- a/rules/host-ipkg.make +++ b/rules/host-ipkg.make @@ -46,7 +46,7 @@ host-ipkg_extract: $(STATEDIR)/host-ipkg.extract $(STATEDIR)/host-ipkg.extract: $(host-ipkg_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_IPKG_DIR)) - @$(call extract, $(HOST_IPKG_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_IPKG, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_IPKG), $(HOST_IPKG_DIR)) @$(call touch, $@) diff --git a/rules/host-mico.make b/rules/host-mico.make index 4f25d518c..6fca6b90a 100644 --- a/rules/host-mico.make +++ b/rules/host-mico.make @@ -47,7 +47,7 @@ $(STATEDIR)/host-mico.extract: $(host-mico_extract_deps_default) @$(call clean, $(HOST_MICO_DIR)) mkdir -p $(HOST_BUILDDIR) tmpdir=`mktemp -d`; \ - $(call extract, $(HOST_MICO_SOURCE), $$tmpdir) \ + $(call extract, HOST_MICO, $$tmpdir) \ mv $$tmpdir/mico $(HOST_MICO_DIR); \ rm -fr $$tmpdir @$(call patchin, $(HOST_MICO), $(HOST_MICO_DIR)) diff --git a/rules/host-mknbi.make b/rules/host-mknbi.make index 7f81ceb98..87d9ca4fe 100644 --- a/rules/host-mknbi.make +++ b/rules/host-mknbi.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-mknbi.get: $(host-mknbi_get_deps_default) $(HOST_MKNBI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_MKNBI_URL)) + @$(call get, HOST_MKNBI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-mknbi_extract: $(STATEDIR)/host-mknbi.extract $(STATEDIR)/host-mknbi.extract: $(host-mknbi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_MKNBI_DIR)) - @$(call extract, $(HOST_MKNBI_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_MKNBI, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_MKNBI), $(HOST_MKNBI_DIR) ) @$(call touch, $@) diff --git a/rules/host-module-init-tools.make b/rules/host-module-init-tools.make index b16a235c3..60addf915 100644 --- a/rules/host-module-init-tools.make +++ b/rules/host-module-init-tools.make @@ -48,7 +48,7 @@ host-module-init-tools_extract: $(STATEDIR)/host-module-init-tools.extract $(STATEDIR)/host-module-init-tools.extract: $(host-module-init-tools_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_MODULE_INIT_TOOLS_DIR)) - @$(call extract, $(MODULE_INIT_TOOLS_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, MODULE_INIT_TOOLS, $(HOST_BUILDDIR)) @$(call patchin, $(MODULE_INIT_TOOLS), $(HOST_MODULE_INIT_TOOLS_DIR)) @$(call touch, $@) diff --git a/rules/host-modutils.make b/rules/host-modutils.make index 53555b98c..6de380d9c 100644 --- a/rules/host-modutils.make +++ b/rules/host-modutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-modutils.get: $(host-modutils_get_deps_default) $(HOST_MODUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_MODUTILS_URL)) + @$(call get, HOST_MODUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-modutils_extract: $(STATEDIR)/host-modutils.extract $(STATEDIR)/host-modutils.extract: $(host-modutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_MODUTILS_DIR)) - @$(call extract, $(HOST_MODUTILS_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_MODUTILS, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_MODUTILS), $(HOST_MODUTILS_DIR)) @$(call touch, $@) diff --git a/rules/host-mtd.make b/rules/host-mtd.make index dd4384d78..e2101f7b4 100644 --- a/rules/host-mtd.make +++ b/rules/host-mtd.make @@ -42,7 +42,7 @@ host-mtd_extract: $(STATEDIR)/host-mtd.extract $(STATEDIR)/host-mtd.extract: $(host-mtd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_MTD_DIR)) - @$(call extract, $(HOST_MTD_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_MTD, $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-python24.make b/rules/host-python24.make index 7f3a39e74..e6a83ed7d 100644 --- a/rules/host-python24.make +++ b/rules/host-python24.make @@ -40,7 +40,7 @@ host-python24_extract: $(STATEDIR)/host-python24.extract $(STATEDIR)/host-python24.extract: $(host-python24_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_PYTHON24_DIR)) - @$(call extract, $(PYTHON24_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, PYTHON24, $(HOST_BUILDDIR)) @$(call patchin, $(PYTHON24), $(HOST_PYTHON24_DIR)) @$(call touch, $@) diff --git a/rules/host-qte.make b/rules/host-qte.make index 5f9e47e2e..17b0a561b 100644 --- a/rules/host-qte.make +++ b/rules/host-qte.make @@ -45,7 +45,7 @@ host-qte_extract: $(STATEDIR)/host-qte.extract $(STATEDIR)/host-qte.extract: $(host-qte_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_QTE_DIR)) - @$(call extract, $(HOST_QTE_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_QTE, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_QTE), $(HOST_QTE_DIR)) @$(call touch, $@) diff --git a/rules/host-slirp.make b/rules/host-slirp.make index e744bf74e..2632c3d63 100644 --- a/rules/host-slirp.make +++ b/rules/host-slirp.make @@ -38,7 +38,7 @@ $(STATEDIR)/host-slirp.get: $(host-slirp_get_deps_default) $(HOST_SLIRP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_SLIRP_URL)) + @$(call get, HOST_SLIRP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ host-slirp_extract: $(STATEDIR)/host-slirp.extract $(STATEDIR)/host-slirp.extract: $(host-slirp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_SLIRP_DIR)) - @$(call extract, $(HOST_SLIRP_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_SLIRP, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_SLIRP), $(HOST_SLIRP_DIR)) @$(call touch, $@) diff --git a/rules/host-termcap.make b/rules/host-termcap.make index 48454d5fe..14fe73941 100644 --- a/rules/host-termcap.make +++ b/rules/host-termcap.make @@ -44,7 +44,7 @@ host-termcap_extract: $(STATEDIR)/host-termcap.extract $(STATEDIR)/host-termcap.extract: $(host-termcap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_TERMCAP_DIR)) - @$(call extract, $(TERMCAP_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, TERMCAP, $(HOST_BUILDDIR)) @$(call patchin, $(HOST_TERMCAP), $(HOST_TERMCAP_DIR)) @$(call touch, $@) diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 8d5d07396..ff9413f3a 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -37,7 +37,7 @@ $(STATEDIR)/host-umkimage.get: $(host-umkimage_get_deps_default) $(HOST_UMKIMAGE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOST_UMKIMAGE_URL)) + @$(call get, HOST_UMKIMAGE) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ host-umkimage_extract: $(STATEDIR)/host-umkimage.extract $(STATEDIR)/host-umkimage.extract: $(host-umkimage_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_UMKIMAGE_DIR)) - @$(call extract, $(HOST_UMKIMAGE_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, HOST_UMKIMAGE, $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 1c4e8af08..bcc8bf645 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -38,7 +38,7 @@ host-util-linux_extract: $(STATEDIR)/host-util-linux.extract $(STATEDIR)/host-util-linux.extract: $(host-util-linux_extract_deps) @$(call targetinfo, $@) @$(call clean, $(UTIL_LINUX_DIR)) - @$(call extract, $(UTIL_LINUX_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, UTIL_LINUX, $(HOST_BUILDDIR)) @$(call patchin, $(UTIL_LINUX),$(HOST_UTIL_LINUX_DIR)) @$(call touch, $@) diff --git a/rules/host-zlib.make b/rules/host-zlib.make index 9e7427709..04039dddd 100644 --- a/rules/host-zlib.make +++ b/rules/host-zlib.make @@ -37,7 +37,7 @@ host-zlib_extract: $(STATEDIR)/host-zlib.extract $(STATEDIR)/host-zlib.extract: $(host_zlib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_ZLIB_BUILDDIR)) - @$(call extract, $(ZLIB_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, ZLIB, $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/hotplug.make b/rules/hotplug.make index a771b5cb9..ccbfc561d 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -38,7 +38,7 @@ $(STATEDIR)/hotplug.get: $(hotplug_get_deps_default) $(HOTPLUG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOTPLUG_URL)) + @$(call get, HOTPLUG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ hotplug_extract: $(STATEDIR)/hotplug.extract $(STATEDIR)/hotplug.extract: $(hotplug_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOTPLUG_DIR)) - @$(call extract, $(HOTPLUG_SOURCE)) + @$(call extract, HOTPLUG) @$(call patchin, $(HOTPLUG)) perl -i -p -e "s,/bin/bash,/bin/sh,g" $(HOTPLUG_DIR)/etc/hotplug.d/default/default.hotplug diff --git a/rules/hrtimers-support.make b/rules/hrtimers-support.make index fefdb1cca..7d66303a9 100644 --- a/rules/hrtimers-support.make +++ b/rules/hrtimers-support.make @@ -38,7 +38,7 @@ $(STATEDIR)/hrtimers-support.get: $(hrtimers-support_get_deps_default) $(HRTIMERS_SUPPORT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HRTIMERS_SUPPORT_URL)) + @$(call get, HRTIMERS_SUPPORT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ hrtimers-support_extract: $(STATEDIR)/hrtimers-support.extract $(STATEDIR)/hrtimers-support.extract: $(hrtimers-support_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HRTIMERS_SUPPORT_DIR)) - @$(call extract, $(HRTIMERS_SUPPORT_SOURCE)) + @$(call extract, HRTIMERS_SUPPORT) @$(call patchin, $(HRTIMERS_SUPPORT)) @$(call touch, $@) diff --git a/rules/inetutils.make b/rules/inetutils.make index 9280f0031..076598e70 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/inetutils.get: $(inetutils_get_deps_default) $(INETUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(INETUTILS_URL)) + @$(call get, INETUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ inetutils_extract: $(STATEDIR)/inetutils.extract $(STATEDIR)/inetutils.extract: $(inetutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(INETUTILS_DIR)) - @$(call extract, $(INETUTILS_SOURCE)) + @$(call extract, INETUTILS) @$(call patchin, $(INETUTILS)) @$(call touch, $@) diff --git a/rules/initng.make b/rules/initng.make index d93a6e356..5cca24798 100644 --- a/rules/initng.make +++ b/rules/initng.make @@ -38,7 +38,7 @@ $(STATEDIR)/initng.get: $(initng_get_deps_default) $(INITNG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(INITNG_URL)) + @$(call get, INITNG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ initng_extract: $(STATEDIR)/initng.extract $(STATEDIR)/initng.extract: $(initng_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(INITNG_DIR)) - @$(call extract, $(INITNG_SOURCE)) + @$(call extract, INITNG) @$(call patchin, $(INITNG)) @$(call touch, $@) diff --git a/rules/ipkg.make b/rules/ipkg.make index 9d047e933..5249e77d9 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -38,7 +38,7 @@ $(STATEDIR)/ipkg.get: $(ipkg_get_deps_default) $(IPKG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(IPKG_URL)) + @$(call get, IPKG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ ipkg_extract: $(STATEDIR)/ipkg.extract $(STATEDIR)/ipkg.extract: $(ipkg_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(IPKG_DIR)) - @$(call extract, $(IPKG_SOURCE)) + @$(call extract, IPKG) @$(call patchin, $(IPKG)) @$(call touch, $@) diff --git a/rules/iptables.make b/rules/iptables.make index 24ef8b05c..e8cc150aa 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -38,7 +38,7 @@ $(STATEDIR)/iptables.get: $(iptables_get_deps_default) $(IPTABLES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(IPTABLES_URL)) + @$(call get, IPTABLES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ iptables_extract: $(STATEDIR)/iptables.extract $(STATEDIR)/iptables.extract: $(iptables_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(IPTABLES_DIR)) - @$(call extract, $(IPTABLES_SOURCE)) + @$(call extract, IPTABLES) @$(call patchin, $(IPTABLES)) @$(call touch, $@) diff --git a/rules/jed.make b/rules/jed.make index b56e312d6..42ddc4a57 100644 --- a/rules/jed.make +++ b/rules/jed.make @@ -38,7 +38,7 @@ $(STATEDIR)/jed.get: $(jed_get_deps_default) $(JED_SOURCE): @$(call targetinfo, $@) - @$(call get, $(JED_URL)) + @$(call get, JED) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ jed_extract: $(STATEDIR)/jed.extract $(STATEDIR)/jed.extract: $(jed_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(JED_DIR)) - @$(call extract, $(JED_SOURCE)) + @$(call extract, JED) @$(call patchin, $(JED)) @$(call touch, $@) diff --git a/rules/joe.make b/rules/joe.make index a09f53d1c..bbdb5a6c7 100644 --- a/rules/joe.make +++ b/rules/joe.make @@ -37,7 +37,7 @@ $(STATEDIR)/joe.get: $(joe_get_deps_default) $(JOE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(JOE_URL)) + @$(call get, JOE) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ joe_extract: $(STATEDIR)/joe.extract $(STATEDIR)/joe.extract: $(joe_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(JOE_DIR)) - @$(call extract, $(JOE_SOURCE)) + @$(call extract, JOE) @$(call patchin, $(JOE)) @$(call touch, $@) diff --git a/rules/jvisu.make b/rules/jvisu.make index db6b2cecb..cd78182b3 100644 --- a/rules/jvisu.make +++ b/rules/jvisu.make @@ -37,7 +37,7 @@ $(STATEDIR)/jvisu.get: $(jvisu_get_deps_default) $(JVISU_SOURCE): @$(call targetinfo, $@) - @$(call get, $(JVISU_URL)) + @$(call get, JVISU) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ jvisu_extract: $(STATEDIR)/jvisu.extract $(STATEDIR)/jvisu.extract: $(jvisu_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(JVISU_DIR)) - @$(call extract, $(JVISU_SOURCE)) + @$(call extract, JVISU) @$(call patchin, $(JVISU)) # FIXME: we cannot currently overwrite the JAVAPATH on the command line, diff --git a/rules/kernel.make b/rules/kernel.make index d9b3d088e..286a09324 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -116,7 +116,7 @@ $(STATEDIR)/kernel.get: $(kernel_get_deps) $(KERNEL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(KERNEL_URL)) + @$(call get, KERNEL) # ---------------------------------------------------------------------------- # Extract @@ -129,7 +129,7 @@ kernel_extract_deps = $(STATEDIR)/kernel.get $(STATEDIR)/kernel.extract: $(kernel_extract_deps) @$(call targetinfo, $@) @$(call clean, $(KERNEL_DIR)) - @$(call extract, $(KERNEL_SOURCE)) + @$(call extract, KERNEL) ifeq (2.4.18,$(KERNEL_VERSION)) # kernels before 2.4.19 extract to "linux" instead of "linux-<version>" diff --git a/rules/klibc.make b/rules/klibc.make index ce6f9dea9..cb014fb2b 100644 --- a/rules/klibc.make +++ b/rules/klibc.make @@ -38,7 +38,7 @@ $(STATEDIR)/klibc.get: $(klibc_get_deps_default) $(KLIBC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(KLIBC_URL)) + @$(call get, KLIBC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ klibc_extract: $(STATEDIR)/klibc.extract $(STATEDIR)/klibc.extract: $(klibc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(KLIBC_DIR)) - @$(call extract, $(KLIBC_SOURCE)) + @$(call extract, KLIBC) @$(call patchin, $(KLIBC)) @$(call touch, $@) diff --git a/rules/konq-e.make b/rules/konq-e.make index aa4835b41..23d186842 100644 --- a/rules/konq-e.make +++ b/rules/konq-e.make @@ -38,7 +38,7 @@ $(STATEDIR)/konq-e.get: $(konq-e_get_deps_default) $(KONQ_E_SOURCE): @$(call targetinfo, $@) - @$(call get, $(KONQ_E_URL)) + @$(call get, KONQ_E) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ konq-e_extract: $(STATEDIR)/konq-e.extract $(STATEDIR)/konq-e.extract: $(konq-e_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(KONQ_E_DIR)) - @$(call extract, $(KONQ_E_SOURCE)) + @$(call extract, KONQ_E) @$(call patchin, $(KONQ_E)) @$(call touch, $@) diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make index f00d5709d..5cba71d2c 100644 --- a/rules/libIDL-2.make +++ b/rules/libIDL-2.make @@ -41,7 +41,7 @@ $(STATEDIR)/libidl-2.get: $(libidl-2_get_deps_default) $(LIBIDL_2_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBIDL_2_URL)) + @$(call get, LIBIDL_2) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ libidl-2_extract: $(STATEDIR)/libidl-2.extract $(STATEDIR)/libidl-2.extract: $(libidl-2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBIDL_2_DIR)) - @$(call extract, $(LIBIDL_2_SOURCE)) + @$(call extract, LIBIDL_2) @$(call patchin, $(LIBIDL_2)) @$(call touch, $@) diff --git a/rules/libIDL068.make b/rules/libIDL068.make index 7e5eb02d2..06c6dffe8 100644 --- a/rules/libIDL068.make +++ b/rules/libIDL068.make @@ -41,7 +41,7 @@ $(STATEDIR)/libidl068.get: $(libidl068_get_deps_default) $(LIBIDL068_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBIDL068_URL)) + @$(call get, LIBIDL068) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ libidl068_extract: $(STATEDIR)/libidl068.extract $(STATEDIR)/libidl068.extract: $(libidl068_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBIDL068_DIR)) - @$(call extract, $(LIBIDL068_SOURCE)) + @$(call extract, LIBIDL068) @$(call patchin, $(LIBIDL068)) @$(call touch, $@) diff --git a/rules/libart.make b/rules/libart.make index 9ade3455d..dce33fe6d 100644 --- a/rules/libart.make +++ b/rules/libart.make @@ -38,7 +38,7 @@ $(STATEDIR)/libart.get: $(libart_get_deps_default) $(LIBART_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBART_URL)) + @$(call get, LIBART) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libart_extract: $(STATEDIR)/libart.extract $(STATEDIR)/libart.extract: $(libart_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBART_DIR)) - @$(call extract, $(LIBART_SOURCE)) + @$(call extract, LIBART) @$(call patchin, $(LIBART)) @$(call touch, $@) diff --git a/rules/libcgicc.make b/rules/libcgicc.make index 31f0b43e0..173245123 100644 --- a/rules/libcgicc.make +++ b/rules/libcgicc.make @@ -37,7 +37,7 @@ $(STATEDIR)/libcgicc.get: $(libcgicc_get_deps_default) $(CGICC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(CGICC_URL)) + @$(call get, CGICC) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ libcgicc_extract: $(STATEDIR)/libcgicc.extract $(STATEDIR)/libcgicc.extract: $(libcgicc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(CGICC_DIR)) - @$(call extract, $(CGICC_SOURCE)) + @$(call extract, CGICC) @$(call patchin, $(CGICC)) @$(call touch, $@) diff --git a/rules/libdaemon.make b/rules/libdaemon.make index 7622dc6b8..91eda8af2 100644 --- a/rules/libdaemon.make +++ b/rules/libdaemon.make @@ -38,7 +38,7 @@ $(STATEDIR)/libdaemon.get: $(libdaemon_get_deps_default) $(LIBDAEMON_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBDAEMON_URL)) + @$(call get, LIBDAEMON) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libdaemon_extract: $(STATEDIR)/libdaemon.extract $(STATEDIR)/libdaemon.extract: $(libdaemon_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBDAEMON_DIR)) - @$(call extract, $(LIBDAEMON_SOURCE)) + @$(call extract, LIBDAEMON) @$(call patchin, $(LIBDAEMON)) @$(call touch, $@) diff --git a/rules/libdrm.make b/rules/libdrm.make index d41962473..c13ca7479 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -38,7 +38,7 @@ $(STATEDIR)/libdrm.get: $(libdrm_get_deps_default) $(LIBDRM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBDRM_URL)) + @$(call get, LIBDRM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libdrm_extract: $(STATEDIR)/libdrm.extract $(STATEDIR)/libdrm.extract: $(libdrm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBDRM_DIR)) - @$(call extract, $(LIBDRM_SOURCE)) + @$(call extract, LIBDRM) @$(call patchin, $(LIBDRM)) @$(call touch, $@) diff --git a/rules/libelf.make b/rules/libelf.make index 43b664107..fd26b57bc 100644 --- a/rules/libelf.make +++ b/rules/libelf.make @@ -39,7 +39,7 @@ $(STATEDIR)/libelf.get: $(libelf_get_deps_default) $(LIBELF_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBELF_URL)) + @$(call get, LIBELF) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ libelf_extract: $(STATEDIR)/libelf.extract $(STATEDIR)/libelf.extract: $(libelf_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBELF_DIR)) - @$(call extract, $(LIBELF_SOURCE)) + @$(call extract, LIBELF) @$(call patchin, $(LIBELF)) @$(call touch, $@) diff --git a/rules/libezv24.make b/rules/libezv24.make index fa65f031a..8444d81db 100644 --- a/rules/libezv24.make +++ b/rules/libezv24.make @@ -38,7 +38,7 @@ $(STATEDIR)/libezv24.get: $(libezv24_get_deps_default) $(LIBEZV24_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBEZV24_URL)) + @$(call get, LIBEZV24) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libezv24_extract: $(STATEDIR)/libezv24.extract $(STATEDIR)/libezv24.extract: $(libezv24_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBEZV24_DIR)) - @$(call extract, $(LIBEZV24_SOURCE)) + @$(call extract, LIBEZV24) @$(call patchin, $(LIBEZV24)) @$(call touch, $@) diff --git a/rules/libgd.make b/rules/libgd.make index 698324031..9446d196f 100644 --- a/rules/libgd.make +++ b/rules/libgd.make @@ -38,7 +38,7 @@ $(STATEDIR)/libgd.get: $(libgd_get_deps_default) $(LIBGD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBGD_URL)) + @$(call get, LIBGD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libgd_extract: $(STATEDIR)/libgd.extract $(STATEDIR)/libgd.extract: $(libgd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBGD_DIR)) - @$(call extract, $(LIBGD_SOURCE)) + @$(call extract, LIBGD) @$(call patchin, $(LIBGD)) @$(call touch, $@) diff --git a/rules/libglade.make b/rules/libglade.make index b26653e75..d89de9b37 100644 --- a/rules/libglade.make +++ b/rules/libglade.make @@ -38,7 +38,7 @@ $(STATEDIR)/libglade.get: $(libglade_get_deps_default) $(LIBGLADE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBGLADE_URL)) + @$(call get, LIBGLADE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libglade_extract: $(STATEDIR)/libglade.extract $(STATEDIR)/libglade.extract: $(libglade_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBGLADE_DIR)) - @$(call extract, $(LIBGLADE_SOURCE)) + @$(call extract, LIBGLADE) @$(call patchin, $(LIBGLADE)) @$(call touch, $@) diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make index 35225f013..b3dd21e82 100644 --- a/rules/libgnomecanvas.make +++ b/rules/libgnomecanvas.make @@ -38,7 +38,7 @@ $(STATEDIR)/libgnomecanvas.get: $(libgnomecanvas_get_deps_default) $(LIBGNOMECANVAS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBGNOMECANVAS_URL)) + @$(call get, LIBGNOMECANVAS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libgnomecanvas_extract: $(STATEDIR)/libgnomecanvas.extract $(STATEDIR)/libgnomecanvas.extract: $(libgnomecanvas_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBGNOMECANVAS_DIR)) - @$(call extract, $(LIBGNOMECANVAS_SOURCE)) + @$(call extract, LIBGNOMECANVAS) @$(call patchin, $(LIBGNOMECANVAS)) @$(call touch, $@) diff --git a/rules/libgsloop.make b/rules/libgsloop.make index aeac968df..cdf14853c 100644 --- a/rules/libgsloop.make +++ b/rules/libgsloop.make @@ -38,7 +38,7 @@ $(STATEDIR)/libgsloop.get: $(libgsloop_get_deps_default) $(LIBGSLOOP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBGSLOOP_URL)) + @$(call get, LIBGSLOOP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libgsloop_extract: $(STATEDIR)/libgsloop.extract $(STATEDIR)/libgsloop.extract: $(libgsloop_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBGSLOOP_DIR)) - @$(call extract, $(LIBGSLOOP_SOURCE)) + @$(call extract, LIBGSLOOP) @$(call patchin, $(LIBGSLOOP)) @$(call touch, $@) diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 8ed95f3bb..b4761d768 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -38,7 +38,7 @@ $(STATEDIR)/libjpeg.get: $(libjpeg_get_deps_default) $(LIBJPEG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBJPEG_URL)) + @$(call get, LIBJPEG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libjpeg_extract: $(STATEDIR)/libjpeg.extract $(STATEDIR)/libjpeg.extract: $(libjpeg_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBJPEG_DIR)) - @$(call extract, $(LIBJPEG_SOURCE)) + @$(call extract, LIBJPEG) @$(call patchin, $(LIBJPEG)) @$(call touch, $@) diff --git a/rules/liblist.make b/rules/liblist.make index 9f46d0bd4..4dd195ee8 100644 --- a/rules/liblist.make +++ b/rules/liblist.make @@ -38,7 +38,7 @@ $(STATEDIR)/liblist.get: $(liblist_get_deps_default) $(LIBLIST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBLIST_URL)) + @$(call get, LIBLIST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ liblist_extract: $(STATEDIR)/liblist.extract $(STATEDIR)/liblist.extract: $(liblist_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBLIST_DIR)) - @$(call extract, $(LIBLIST_SOURCE)) + @$(call extract, LIBLIST) @$(call patchin, $(LIBLIST)) @$(call touch, $@) diff --git a/rules/liblockfile.make b/rules/liblockfile.make index b6bc27e38..6ef887d64 100644 --- a/rules/liblockfile.make +++ b/rules/liblockfile.make @@ -38,7 +38,7 @@ $(STATEDIR)/liblockfile.get: $(liblockfile_get_deps_default) $(LIBLOCKFILE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBLOCKFILE_URL)) + @$(call get, LIBLOCKFILE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ liblockfile_extract: $(STATEDIR)/liblockfile.extract $(STATEDIR)/liblockfile.extract: $(liblockfile_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBLOCKFILE_DIR)) - @$(call extract, $(LIBLOCKFILE_SOURCE)) + @$(call extract, LIBLOCKFILE) @$(call patchin, $(LIBLOCKFILE)) @$(call touch, $@) diff --git a/rules/libmodbus.make b/rules/libmodbus.make index f3004fe34..48a240201 100644 --- a/rules/libmodbus.make +++ b/rules/libmodbus.make @@ -38,7 +38,7 @@ $(STATEDIR)/libmodbus.get: $(libmodbus_get_deps_default) $(LIBMODBUS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBMODBUS_URL)) + @$(call get, LIBMODBUS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libmodbus_extract: $(STATEDIR)/libmodbus.extract $(STATEDIR)/libmodbus.extract: $(libmodbus_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBMODBUS_DIR)) - @$(call extract, $(LIBMODBUS_SOURCE)) + @$(call extract, LIBMODBUS) @$(call patchin, $(LIBMODBUS)) @$(call touch, $@) diff --git a/rules/libmqueue.make b/rules/libmqueue.make index 399fc0d53..c747adba3 100644 --- a/rules/libmqueue.make +++ b/rules/libmqueue.make @@ -38,7 +38,7 @@ $(STATEDIR)/libmqueue.get: $(libmqueue_get_deps_default) $(LIBMQUEUE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBMQUEUE_URL)) + @$(call get, LIBMQUEUE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libmqueue_extract: $(STATEDIR)/libmqueue.extract $(STATEDIR)/libmqueue.extract: $(libmqueue_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBMQUEUE_DIR)) - @$(call extract, $(LIBMQUEUE_SOURCE)) + @$(call extract, LIBMQUEUE) @$(call patchin, $(LIBMQUEUE)) @$(call touch, $@) diff --git a/rules/libnet.make b/rules/libnet.make index aa7429a02..87fe427d0 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -38,7 +38,7 @@ $(STATEDIR)/libnet.get: $(libnet_get_deps_default) $(LIBNET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBNET_URL)) + @$(call get, LIBNET) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libnet_extract: $(STATEDIR)/libnet.extract $(STATEDIR)/libnet.extract: $(libnet_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBNET_DIR)) - @$(call extract, $(LIBNET_SOURCE)) + @$(call extract, LIBNET) mv $(BUILDDIR)/libnet $(LIBNET_DIR) @$(call patchin, $(LIBNET), $(LIBNET_DIR)) @$(call touch, $@) diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make index e25743afc..9e1bc211b 100644 --- a/rules/libnetpbm.make +++ b/rules/libnetpbm.make @@ -38,7 +38,7 @@ $(STATEDIR)/libnetpbm.get: $(libnetpbm_get_deps_default) $(LIBNETPBM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBNETPBM_URL)) + @$(call get, LIBNETPBM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libnetpbm_extract: $(STATEDIR)/libnetpbm.extract $(STATEDIR)/libnetpbm.extract: $(libnetpbm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBNETPBM_DIR)) - @$(call extract, $(LIBNETPBM_SOURCE)) + @$(call extract, LIBNETPBM) @$(call patchin, $(LIBNETPBM)) @$(call touch, $@) diff --git a/rules/liboop.make b/rules/liboop.make index 3a5a680bf..01594f37e 100644 --- a/rules/liboop.make +++ b/rules/liboop.make @@ -38,7 +38,7 @@ $(STATEDIR)/liboop.get: $(liboop_get_deps_default) $(LIBOOP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBOOP_URL)) + @$(call get, LIBOOP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ liboop_extract: $(STATEDIR)/liboop.extract $(STATEDIR)/liboop.extract: $(liboop_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBOOP_DIR)) - @$(call extract, $(LIBOOP_SOURCE)) + @$(call extract, LIBOOP) @$(call patchin, $(LIBOOP)) @$(call touch, $@) diff --git a/rules/libpcap.make b/rules/libpcap.make index bd6570db9..4bafa5b6e 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -38,7 +38,7 @@ $(STATEDIR)/libpcap.get: $(libpcap_get_deps_default) $(LIBPCAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBPCAP_URL)) + @$(call get, LIBPCAP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libpcap_extract: $(STATEDIR)/libpcap.extract $(STATEDIR)/libpcap.extract: $(libpcap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBPCAP_DIR)) - @$(call extract, $(LIBPCAP_SOURCE)) + @$(call extract, LIBPCAP) @$(call patchin, $(LIBPCAP)) @$(call touch, $@) diff --git a/rules/libpng.make b/rules/libpng.make index f8f47963c..9bdeed08d 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -39,7 +39,7 @@ $(STATEDIR)/libpng.get: $(libpng_get_deps_default) $(LIBPNG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBPNG_URL)) + @$(call get, LIBPNG) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ libpng_extract: $(STATEDIR)/libpng.extract $(STATEDIR)/libpng.extract: $(libpng_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBPNG_DIR)) - @$(call extract, $(LIBPNG_SOURCE)) + @$(call extract, LIBPNG) @$(call patchin, $(LIBPNG)) @$(call touch, $@) diff --git a/rules/libpopt.make b/rules/libpopt.make index 736e89d87..0e21c73d9 100644 --- a/rules/libpopt.make +++ b/rules/libpopt.make @@ -39,7 +39,7 @@ $(STATEDIR)/libpopt.get: $(libpopt_get_deps_default) $(LIBPOPT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBPOPT_URL)) + @$(call get, LIBPOPT) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ libpopt_extract: $(STATEDIR)/libpopt.extract $(STATEDIR)/libpopt.extract: $(libpopt_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBPOPT_DIR)) - @$(call extract, $(LIBPOPT_SOURCE)) + @$(call extract, LIBPOPT) @$(call patchin, $(LIBPOPT)) @$(call touch, $@) diff --git a/rules/libpv.make b/rules/libpv.make index ae5d64767..1e79de553 100644 --- a/rules/libpv.make +++ b/rules/libpv.make @@ -38,7 +38,7 @@ $(STATEDIR)/libpv.get: $(libpv_get_deps_default) $(LIBPV_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBPV_URL)) + @$(call get, LIBPV) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libpv_extract: $(STATEDIR)/libpv.extract $(STATEDIR)/libpv.extract: $(libpv_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBPV_DIR)) - @$(call extract, $(LIBPV_SOURCE)) + @$(call extract, LIBPV) @$(call patchin, $(LIBPV)) @$(call touch, $@) diff --git a/rules/librn.make b/rules/librn.make index 748368035..cd9c26c71 100644 --- a/rules/librn.make +++ b/rules/librn.make @@ -39,7 +39,7 @@ $(STATEDIR)/librn.get: $(librn_get_deps_default) $(LIBRN_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBRN_URL)) + @$(call get, LIBRN) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ librn_extract: $(STATEDIR)/librn.extract $(STATEDIR)/librn.extract: $(librn_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBRN_DIR)) - @$(call extract, $(LIBRN_SOURCE)) + @$(call extract, LIBRN) @$(call patchin, $(LIBRN)) @$(call touch, $@) diff --git a/rules/libxml2.make b/rules/libxml2.make index 2d6dc1cf9..6cce17c41 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -38,7 +38,7 @@ $(STATEDIR)/libxml2.get: $(libxml2_get_deps_default) $(LIBXML2_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBXML2_URL)) + @$(call get, LIBXML2) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libxml2_extract: $(STATEDIR)/libxml2.extract $(STATEDIR)/libxml2.extract: $(libxml2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBXML2_DIR)) - @$(call extract, $(LIBXML2_SOURCE)) + @$(call extract, LIBXML2) @$(call patchin, $(LIBXML2)) @$(call touch, $@) diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make index c83b114fc..931413fc2 100644 --- a/rules/libxmlconfig.make +++ b/rules/libxmlconfig.make @@ -38,7 +38,7 @@ $(STATEDIR)/libxmlconfig.get: $(libxmlconfig_get_deps_default) $(LIBXMLCONFIG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBXMLCONFIG_URL)) + @$(call get, LIBXMLCONFIG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libxmlconfig_extract: $(STATEDIR)/libxmlconfig.extract $(STATEDIR)/libxmlconfig.extract: $(libxmlconfig_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBXMLCONFIG_DIR)) - @$(call extract, $(LIBXMLCONFIG_SOURCE)) + @$(call extract, LIBXMLCONFIG) @$(call patchin, $(LIBXMLCONFIG)) @$(call touch, $@) diff --git a/rules/libxslt.make b/rules/libxslt.make index b001ea828..94650641a 100644 --- a/rules/libxslt.make +++ b/rules/libxslt.make @@ -38,7 +38,7 @@ $(STATEDIR)/libxslt.get: $(libxslt_get_deps_default) $(LIBXSLT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LIBXSLT_URL)) + @$(call get, LIBXSLT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ libxslt_extract: $(STATEDIR)/libxslt.extract $(STATEDIR)/libxslt.extract: $(libxslt_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LIBXSLT_DIR)) - @$(call extract, $(LIBXSLT_SOURCE)) + @$(call extract, LIBXSLT) @$(call patchin, $(LIBXSLT)) @$(call touch, $@) diff --git a/rules/lilo.make b/rules/lilo.make index 535f06416..cd162f7b7 100644 --- a/rules/lilo.make +++ b/rules/lilo.make @@ -39,7 +39,7 @@ $(STATEDIR)/lilo.get: $(lilo_get_deps_default) $(LILO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LILO_URL)) + @$(call get, LILO) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ lilo_extract: $(STATEDIR)/lilo.extract $(STATEDIR)/lilo.extract: $(lilo_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LILO_DIR)) - @$(call extract, $(LILO_SOURCE)) + @$(call extract, LILO) @$(call patchin, $(LILO)) @$(call touch, $@) diff --git a/rules/lrzsz.make b/rules/lrzsz.make index 67b37fccb..0b544a3e9 100644 --- a/rules/lrzsz.make +++ b/rules/lrzsz.make @@ -40,7 +40,7 @@ $(STATEDIR)/lrzsz.get: $(lrzsz_get_deps_default) $(LRZSZ_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LRZSZ_URL)) + @$(call get, LRZSZ) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ lrzsz_extract: $(STATEDIR)/lrzsz.extract $(STATEDIR)/lrzsz.extract: $(lrzsz_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LRZSZ_DIR)) - @$(call extract, $(LRZSZ_SOURCE)) + @$(call extract, LRZSZ) @$(call patchin, $(LRZSZ)) @$(call touch, $@) diff --git a/rules/lsh.make b/rules/lsh.make index 5280271f0..f8d87cf3d 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -38,7 +38,7 @@ $(STATEDIR)/lsh.get: $(lsh_get_deps_default) $(LSH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LSH_URL)) + @$(call get, LSH) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ lsh_extract: $(STATEDIR)/lsh.extract $(STATEDIR)/lsh.extract: $(lsh_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LSH_DIR)) - @$(call extract, $(LSH_SOURCE)) + @$(call extract, LSH) @$(call patchin, $(LSH)) @$(call touch, $@) diff --git a/rules/ltp.make b/rules/ltp.make index fd968fc5e..4b83e4a56 100644 --- a/rules/ltp.make +++ b/rules/ltp.make @@ -38,7 +38,7 @@ $(STATEDIR)/ltp.get: $(ltp_get_deps_default) $(LTP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LTP_URL)) + @$(call get, LTP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ ltp_extract: $(STATEDIR)/ltp.extract $(STATEDIR)/ltp.extract: $(ltp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LTP_DIR)) - @$(call extract, $(LTP_SOURCE)) + @$(call extract, LTP) @$(call patchin, $(LTP)) @$(call touch, $@) diff --git a/rules/ltrace.make b/rules/ltrace.make index 8866dc835..af755b299 100644 --- a/rules/ltrace.make +++ b/rules/ltrace.make @@ -39,7 +39,7 @@ $(STATEDIR)/ltrace.get: $(ltrace_get_deps_default) $(LTRACE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LTRACE_URL)) + @$(call get, LTRACE) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ ltrace_extract: $(STATEDIR)/ltrace.extract $(STATEDIR)/ltrace.extract: $(ltrace_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LTRACE_DIR)) - @$(call extract, $(LTRACE_SOURCE)) + @$(call extract, LTRACE) @$(call patchin, $(LTRACE)) @$(call touch, $@) diff --git a/rules/ltt.make b/rules/ltt.make index d8e47df28..1c6f93892 100644 --- a/rules/ltt.make +++ b/rules/ltt.make @@ -40,7 +40,7 @@ $(STATEDIR)/ltt.get: $(ltt_get_deps_default) $(LTT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(LTT_URL)) + @$(call get, LTT) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ ltt_extract: $(STATEDIR)/ltt.extract $(STATEDIR)/ltt.extract: $(ltt_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(LTT_DIR)) - @$(call extract, $(LTT_SOURCE)) + @$(call extract, LTT) @$(call patchin, $(LTT)) @$(call touch, $@) diff --git a/rules/mad.make b/rules/mad.make index 16f15ecb7..2e1ac65fe 100644 --- a/rules/mad.make +++ b/rules/mad.make @@ -38,7 +38,7 @@ $(STATEDIR)/mad.get: $(mad_get_deps_default) $(MAD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MAD_URL)) + @$(call get, MAD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ mad_extract: $(STATEDIR)/mad.extract $(STATEDIR)/mad.extract: $(mad_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MAD_DIR)) - @$(call extract, $(MAD_SOURCE)) + @$(call extract, MAD) @$(call patchin, $(MAD_SOURCE)) @$(call touch, $@) diff --git a/rules/madwifi.make b/rules/madwifi.make index 28b877aaf..a89a2999d 100644 --- a/rules/madwifi.make +++ b/rules/madwifi.make @@ -48,7 +48,7 @@ $(STATEDIR)/madwifi.get: $(madwifi_get_deps_default) $(MADWIFI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MADWIFI_URL)) + @$(call get, MADWIFI) # ---------------------------------------------------------------------------- # Extract @@ -59,7 +59,7 @@ madwifi_extract: $(STATEDIR)/madwifi.extract $(STATEDIR)/madwifi.extract: $(madwifi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MADWIFI_DIR)) - @$(call extract, $(MADWIFI_SOURCE)) + @$(call extract, MADWIFI) @$(call patchin, $(MADWIFI)) @$(call touch, $@) diff --git a/rules/memedit.make b/rules/memedit.make index d914e66b7..2ace7fa29 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -38,7 +38,7 @@ $(STATEDIR)/memedit.get: $(memedit_get_deps_default) $(MEMEDIT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MEMEDIT_URL)) + @$(call get, MEMEDIT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ memedit_extract: $(STATEDIR)/memedit.extract $(STATEDIR)/memedit.extract: $(memedit_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MEMEDIT_DIR)) - @$(call extract, $(MEMEDIT_SOURCE)) + @$(call extract, MEMEDIT) @$(call patchin, $(MEMEDIT)) @$(call touch, $@) diff --git a/rules/memstat.make b/rules/memstat.make index 2eccbba06..eaa99597a 100644 --- a/rules/memstat.make +++ b/rules/memstat.make @@ -38,7 +38,7 @@ $(STATEDIR)/memstat.get: $(memstat_get_deps_default) $(MEMSTAT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MEMSTAT_URL)) + @$(call get, MEMSTAT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ memstat_extract: $(STATEDIR)/memstat.extract $(STATEDIR)/memstat.extract: $(memstat_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MEMSTAT_DIR)) - @$(call extract, $(MEMSTAT_SOURCE)) + @$(call extract, MEMSTAT) @$(call patchin, memstat-$(MEMSTAT_VERSION)) @$(call touch, $@) diff --git a/rules/memtest.make b/rules/memtest.make index 66845999c..f2a7798bf 100644 --- a/rules/memtest.make +++ b/rules/memtest.make @@ -38,7 +38,7 @@ $(STATEDIR)/memtest.get: $(memtest_get_deps_default) $(MEMTEST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MEMTEST_URL)) + @$(call get, MEMTEST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ memtest_extract: $(STATEDIR)/memtest.extract $(STATEDIR)/memtest.extract: $(memtest_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MEMTEST_DIR)) - @$(call extract, $(MEMTEST_SOURCE)) + @$(call extract, MEMTEST) @$(call patchin, $(MEMTEST)) @$(call touch, $@) diff --git a/rules/memtester.make b/rules/memtester.make index 033febdaa..e87c4823d 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -38,7 +38,7 @@ $(STATEDIR)/memtester.get: $(memtester_get_deps_default) $(MEMTESTER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MEMTESTER_URL)) + @$(call get, MEMTESTER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ memtester_extract: $(STATEDIR)/memtester.extract $(STATEDIR)/memtester.extract: $(memtester_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MEMTESTER_DIR)) - @$(call extract, $(MEMTESTER_SOURCE)) + @$(call extract, MEMTESTER) @$(call patchin, $(MEMTESTER)) @$(call touch, $@) diff --git a/rules/mesalib.make b/rules/mesalib.make index 50fe36b59..dd3bc1240 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -41,7 +41,7 @@ $(STATEDIR)/mesalib.get: $(mesalib_get_deps_default) $(MESALIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MESALIB_URL)) + @$(call get, MESALIB) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ mesalib_extract: $(STATEDIR)/mesalib.extract $(STATEDIR)/mesalib.extract: $(mesalib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MESALIB_DIR)) - @$(call extract, $(MESALIB_SOURCE)) + @$(call extract, MESALIB) @$(call patchin, $(MESALIB)) @$(call touch, $@) diff --git a/rules/mfirebird.make b/rules/mfirebird.make index 9eb628da2..634317947 100644 --- a/rules/mfirebird.make +++ b/rules/mfirebird.make @@ -39,7 +39,7 @@ $(STATEDIR)/mfirebird.get: $(mfirebird_get_deps_default) $(MFIREBIRD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MFIREBIRD_URL)) + @$(call get, MFIREBIRD) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ mfirebird_extract: $(STATEDIR)/mfirebird.extract $(STATEDIR)/mfirebird.extract: $(mfirebird_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MFIREBIRD_DIR)) - @$(call extract, $(MFIREBIRD_SOURCE)) + @$(call extract, MFIREBIRD) cd $(BUILDDIR) && mv mozilla $(MFIREBIRD) @$(call patchin, $(MFIREBIRD)) @$(call touch, $@) diff --git a/rules/mgetty.make b/rules/mgetty.make index e94c61fa5..1254f056d 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -39,7 +39,7 @@ $(STATEDIR)/mgetty.get: $(mgetty_get_deps_default) $(MGETTY_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MGETTY_URL)) + @$(call get, MGETTY) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ mgetty_extract: $(STATEDIR)/mgetty.extract $(STATEDIR)/mgetty.extract: $(mgetty_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MGETTY_DIR)) - @$(call extract, $(MGETTY_SOURCE)) + @$(call extract, MGETTY) @$(call patchin, $(MGETTY), $(MGETTY_DIR)) @$(call touch, $@) diff --git a/rules/mico.make b/rules/mico.make index 3a833f30f..f13d8892a 100644 --- a/rules/mico.make +++ b/rules/mico.make @@ -38,7 +38,7 @@ $(STATEDIR)/mico.get: $(mico_get_deps_default) $(MICO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MICO_URL)) + @$(call get, MICO) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ $(STATEDIR)/mico.extract: $(mico_extract_deps_default) rm -fr $(MICO_DIR) mkdir -p $(BUILDDIR) tmpdir=`mktemp -d`; \ - $(call extract, $(MICO_SOURCE), $$tmpdir) \ + $(call extract, MICO, $$tmpdir) \ mv $$tmpdir/mico $(MICO_DIR); \ rm -fr $$tmpdir @$(call patchin, $(MICO)) diff --git a/rules/mii-diag.make b/rules/mii-diag.make index cc5f5e4e0..dbca72e83 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -38,7 +38,7 @@ $(STATEDIR)/mii-diag.get: $(mii-diag_get_deps_default) $(MII_DIAG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MII_DIAG_URL)) + @$(call get, MII_DIAG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ mii-diag_extract: $(STATEDIR)/mii-diag.extract $(STATEDIR)/mii-diag.extract: $(mii-diag_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MII_DIAG_DIR)) - @$(call extract, $(MII_DIAG_SOURCE)) + @$(call extract, MII_DIAG) @$(call patchin, $(MII_DIAG)) @$(call touch, $@) diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index 30d5e3955..369b3cde7 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -38,7 +38,7 @@ $(STATEDIR)/module-init-tools.get: $(module-init-tools_get_deps_default) $(MODULE_INIT_TOOLS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MODULE_INIT_TOOLS_URL)) + @$(call get, MODULE_INIT_TOOLS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ module-init-tools_extract: $(STATEDIR)/module-init-tools.extract $(STATEDIR)/module-init-tools.extract: $(module-init-tools_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MODULE_INIT_TOOLS_DIR)) - @$(call extract, $(MODULE_INIT_TOOLS_SOURCE)) + @$(call extract, MODULE_INIT_TOOLS) @$(call patchin, $(MODULE_INIT_TOOLS), $(MODULE_INIT_TOOLS_DIR)) @$(call touch, $@) diff --git a/rules/mplayer.make b/rules/mplayer.make index 379f0f416..cd8d36ebc 100644 --- a/rules/mplayer.make +++ b/rules/mplayer.make @@ -38,7 +38,7 @@ $(STATEDIR)/mplayer.get: $(mplayer_get_deps_default) $(MPLAYER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MPLAYER_URL)) + @$(call get, MPLAYER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ mplayer_extract: $(STATEDIR)/mplayer.extract $(STATEDIR)/mplayer.extract: $(mplayer_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MPLAYER_DIR)) - @$(call extract, $(MPLAYER_SOURCE)) + @$(call extract, MPLAYER) @$(call patchin, $(MPLAYER)) @$(call touch, $@) diff --git a/rules/mtd.make b/rules/mtd.make index af463a602..18cb1b5e5 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -38,7 +38,7 @@ $(STATEDIR)/mtd.get: $(mtd_get_deps_default) $(MTD_UTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MTD_UTILS_URL)) + @$(call get, MTD_UTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ mtd_extract: $(STATEDIR)/mtd.extract $(STATEDIR)/mtd.extract: $(mtd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MTD_UTILS_DIR)) - @$(call extract, $(MTD_UTILS_SOURCE)) + @$(call extract, MTD_UTILS) @$(call patchin, $(MTD_UTILS)) @$(call touch, $@) diff --git a/rules/myghty.make b/rules/myghty.make index 141e3341a..4c6c5a94a 100644 --- a/rules/myghty.make +++ b/rules/myghty.make @@ -38,7 +38,7 @@ $(STATEDIR)/myghty.get: $(myghty_get_deps_default) $(MYGHTY_SOURCE): @$(call targetinfo, $@) - @$(call get, $(MYGHTY_URL)) + @$(call get, MYGHTY) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ myghty_extract: $(STATEDIR)/myghty.extract $(STATEDIR)/myghty.extract: $(myghty_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(MYGHTY_DIR)) - @$(call extract, $(MYGHTY_SOURCE)) + @$(call extract, MYGHTY) @$(call patchin, $(MYGHTY)) @$(call touch, $@) diff --git a/rules/nano.make b/rules/nano.make index f728150f1..657183d00 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -38,7 +38,7 @@ $(STATEDIR)/nano.get: $(nano_get_deps_default) $(NANO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NANO_URL)) + @$(call get, NANO) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ nano_extract: $(STATEDIR)/nano.extract $(STATEDIR)/nano.extract: $(nano_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NANO_DIR)) - @$(call extract, $(NANO_SOURCE)) + @$(call extract, NANO) @$(call patchin, $(NANO)) @$(call touch, $@) diff --git a/rules/ncurses.make b/rules/ncurses.make index ac569620f..960c60174 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -37,7 +37,7 @@ $(STATEDIR)/ncurses.get: $(ncurses_get_deps_default) $(NCURSES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NCURSES_URL)) + @$(call get, NCURSES) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ ncurses_extract: $(STATEDIR)/ncurses.extract $(STATEDIR)/ncurses.extract: $(ncurses_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NCURSES_DIR)) - @$(call extract, $(NCURSES_SOURCE)) + @$(call extract, NCURSES) @$(call patchin, $(NCURSES)) @$(call touch, $@) diff --git a/rules/netcat.make b/rules/netcat.make index 3d981d02a..8ff550e54 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -38,7 +38,7 @@ $(STATEDIR)/netcat.get: $(netcat_get_deps_default) $(NETCAT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NETCAT_URL)) + @$(call get, NETCAT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ netcat_extract: $(STATEDIR)/netcat.extract $(STATEDIR)/netcat.extract: $(netcat_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NETCAT_DIR)) - @$(call extract, $(NETCAT_SOURCE)) + @$(call extract, NETCAT) @$(call patchin, $(NETCAT)) @$(call touch, $@) diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make index a592394d3..47ada5e6b 100644 --- a/rules/netkit-ftp.make +++ b/rules/netkit-ftp.make @@ -38,7 +38,7 @@ $(STATEDIR)/netkit-ftp.get: $(netkit-ftp_get_deps_default) $(NETKIT_FTP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NETKIT_FTP_URL)) + @$(call get, NETKIT_FTP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ netkit-ftp_extract: $(STATEDIR)/netkit-ftp.extract $(STATEDIR)/netkit-ftp.extract: $(netkit-ftp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NETKIT_FTP_DIR)) - @$(call extract, $(NETKIT_FTP_SOURCE)) + @$(call extract, NETKIT_FTP) @$(call patchin, $(NETKIT_FTP)) @$(call touch, $@) diff --git a/rules/nfsutils.make b/rules/nfsutils.make index dd08f0ae8..f94fc2dab 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -36,7 +36,7 @@ $(STATEDIR)/nfsutils.get: $(NFSUTILS_SOURCE) $(NFSUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NFSUTILS_URL)) + @$(call get, NFSUTILS) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ nfsutils_extract: $(STATEDIR)/nfsutils.extract $(STATEDIR)/nfsutils.extract: $(nfsutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NFSUTILS_DIR)) - @$(call extract, $(NFSUTILS_SOURCE)) + @$(call extract, NFSUTILS) @$(call patchin, $(NFSUTILS)) # # regenerate configure script with new autoconf, to make cross compiling work diff --git a/rules/nmap.make b/rules/nmap.make index 207644877..38896111c 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -38,7 +38,7 @@ $(STATEDIR)/nmap.get: $(nmap_get_deps_default) $(NMAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NMAP_URL)) + @$(call get, NMAP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ nmap_extract: $(STATEDIR)/nmap.extract $(STATEDIR)/nmap.extract: $(nmap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NMAP_DIR)) - @$(call extract, $(NMAP_SOURCE)) + @$(call extract, NMAP) @$(call patchin, $(NMAP)) @$(call touch, $@) diff --git a/rules/ntp.make b/rules/ntp.make index 0caeab758..e5338ada7 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -38,7 +38,7 @@ $(STATEDIR)/ntp.get: $(ntp_get_deps_default) $(NTP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NTP_URL)) + @$(call get, NTP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ ntp_extract: $(STATEDIR)/ntp.extract $(STATEDIR)/ntp.extract: $(ntp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NTP_DIR)) - @$(call extract, $(NTP_SOURCE)) + @$(call extract, NTP) @$(call patchin, $(NTP)) @$(call touch, $@) diff --git a/rules/ntpclient.make b/rules/ntpclient.make index 1255bb41f..f14b46be5 100644 --- a/rules/ntpclient.make +++ b/rules/ntpclient.make @@ -30,7 +30,7 @@ $(STATEDIR)/ntpclient.get: $(ntpclient_get_deps_default) $(NTPCLIENT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(NTPCLIENT_URL)) + @$(call get, NTPCLIENT) # ---------------------------------------------------------------------------- # Extract @@ -41,7 +41,7 @@ ntpclient_extract: $(STATEDIR)/ntpclient.extract $(STATEDIR)/ntpclient.extract: $(ntpclient_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NTPCLIENT_DIR)) - @$(call extract, $(NTPCLIENT_SOURCE)) + @$(call extract, NTPCLIENT) @$(call patchin, $(NTPCLIENT)) @$(call touch, $@) diff --git a/rules/omniorb.make b/rules/omniorb.make index 08b2e0bb0..06fa1d190 100644 --- a/rules/omniorb.make +++ b/rules/omniorb.make @@ -40,7 +40,7 @@ $(STATEDIR)/omniorb.get: $(omniorb_get_deps_default) $(OMNIORB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OMNIORB_URL)) + @$(call get, OMNIORB) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ omniorb_extract: $(STATEDIR)/omniorb.extract $(STATEDIR)/omniorb.extract: $(omniorb_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(OMNIORB_DIR)) - @$(call extract, $(OMNIORB_SOURCE)) + @$(call extract, OMNIORB) @$(call patchin, $(OMNIORB)) @$(call touch, $@) diff --git a/rules/openafs.make b/rules/openafs.make index ec080e1ca..f9482b21e 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -38,7 +38,7 @@ $(STATEDIR)/openafs.get: $(openafs_get_deps_default) $(OPENAFS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OPENAFS_URL)) + @$(call get, OPENAFS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ openafs_extract: $(STATEDIR)/openafs.extract $(STATEDIR)/openafs.extract: $(openafs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(OPENAFS_DIR)) - @$(call extract, $(OPENAFS_SOURCE)) + @$(call extract, OPENAFS) @$(call patchin, $(OPENAFS)) @$(call touch, $@) diff --git a/rules/openntpd.make b/rules/openntpd.make index 2452171fa..75eb7c397 100644 --- a/rules/openntpd.make +++ b/rules/openntpd.make @@ -37,7 +37,7 @@ $(STATEDIR)/openntpd.get: $(openntpd_get_deps_default) $(OPENNTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OPENNTPD_URL)) + @$(call get, OPENNTPD) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ openntpd_extract: $(STATEDIR)/openntpd.extract $(STATEDIR)/openntpd.extract: $(openntpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(OPENNTPD_DIR)) - @$(call extract, $(OPENNTPD_SOURCE)) + @$(call extract, OPENNTPD) @$(call patchin, $(OPENNTPD)) @$(call touch, $@) diff --git a/rules/openssh.make b/rules/openssh.make index 7ed48e5de..27a569793 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -37,7 +37,7 @@ $(STATEDIR)/openssh.get: $(openssh_get_deps_default) $(OPENSSH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OPENSSH_URL)) + @$(call get, OPENSSH) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ openssh_extract: $(STATEDIR)/openssh.extract $(STATEDIR)/openssh.extract: $(openssh_extract_deps_default) @$(call targetinfo, openssh.extract) @$(call clean, $(OPENSSH_DIR)) - @$(call extract, $(OPENSSH_SOURCE)) + @$(call extract, OPENSSH) @$(call patchin, $(OPENSSH)) @$(call touch, $@) diff --git a/rules/openssl.make b/rules/openssl.make index 526bc4014..63d558d8c 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -66,7 +66,7 @@ $(STATEDIR)/openssl.get: $(openssl_get_deps_default) $(OPENSSL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OPENSSL_URL)) + @$(call get, OPENSSL) # ---------------------------------------------------------------------------- # Extract @@ -77,7 +77,7 @@ openssl_extract: $(STATEDIR)/openssl.extract $(STATEDIR)/openssl.extract: $(openssl_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(OPENSSL_DIR)) - @$(call extract, $(OPENSSL_SOURCE)) + @$(call extract, OPENSSL) @$(call patchin, $(OPENSSL)) @$(call touch, $@) diff --git a/rules/oprofile.make b/rules/oprofile.make index bd7c5613c..45acaf721 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -38,7 +38,7 @@ $(STATEDIR)/oprofile.get: $(oprofile_get_deps_default) $(OPROFILE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(OPROFILE_URL)) + @$(call get, OPROFILE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ oprofile_extract: $(STATEDIR)/oprofile.extract $(STATEDIR)/oprofile.extract: $(oprofile_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(OPROFILE_DIR)) - @$(call extract, $(OPROFILE_SOURCE)) + @$(call extract, OPROFILE) @$(call patchin, $(OPROFILE)) @$(call touch, $@) diff --git a/rules/pango.make b/rules/pango.make index 666b68c3a..e0d298d6b 100644 --- a/rules/pango.make +++ b/rules/pango.make @@ -40,7 +40,7 @@ $(STATEDIR)/pango.get: $(pango_get_deps_default) $(PANGO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PANGO_URL)) + @$(call get, PANGO) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ pango_extract: $(STATEDIR)/pango.extract $(STATEDIR)/pango.extract: $(pango_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PANGO_DIR)) - @$(call extract, $(PANGO_SOURCE)) + @$(call extract, PANGO) @$(call patchin, $(PANGO)) @$(call touch, $@) diff --git a/rules/paranoia.make b/rules/paranoia.make index 9985db561..0bef6e1df 100644 --- a/rules/paranoia.make +++ b/rules/paranoia.make @@ -38,7 +38,7 @@ $(STATEDIR)/paranoia.get: $(paranoia_get_deps_default) $(PARANOIA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PARANOIA_URL)) + @$(call get, PARANOIA) # ---------------------------------------------------------------------------- # Extract diff --git a/rules/pciutils.make b/rules/pciutils.make index e1e09d953..bcc54b117 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/pciutils.get: $(pciutils_get_deps_default) $(PCIUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PCIUTILS_URL)) + @$(call get, PCIUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pciutils_extract: $(STATEDIR)/pciutils.extract $(STATEDIR)/pciutils.extract: $(pciutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PCIUTILS_DIR)) - @$(call extract, $(PCIUTILS_SOURCE)) + @$(call extract, PCIUTILS) @$(call patchin, $(PCIUTILS)) @$(call touch, $@) diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make index f067f726e..3a1bd84bd 100644 --- a/rules/pcmcia-cs.make +++ b/rules/pcmcia-cs.make @@ -38,7 +38,7 @@ $(STATEDIR)/pcmcia-cs.get: $(pcmcia-cs_get_deps_default) $(PCMCIA-CS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PCMCIA-CS_URL)) + @$(call get, PCMCIA-CS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pcmcia-cs_extract: $(STATEDIR)/pcmcia-cs.extract $(STATEDIR)/pcmcia-cs.extract: $(pcmcia-cs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PCMCIA-CS_DIR)) - @$(call extract, $(PCMCIA-CS_SOURCE)) + @$(call extract, PCMCIA-CS) @$(call patchin, $(PCMCIA-CS)) @$(call touch, $@) diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index d52884876..965700884 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -37,7 +37,7 @@ $(STATEDIR)/pcmciautils.get: $(pcmciautils_get_deps_default) $(PCMCIAUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PCMCIAUTILS_URL)) + @$(call get, PCMCIAUTILS) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ pcmciautils_extract: $(STATEDIR)/pcmciautils.extract $(STATEDIR)/pcmciautils.extract: $(pcmciautils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PCMCIAUTILS_DIR)) - @$(call extract, $(PCMCIAUTILS_SOURCE)) + @$(call extract, PCMCIAUTILS) @$(call patchin, $(PCMCIAUTILS)) @$(call touch, $@) diff --git a/rules/pcre.make b/rules/pcre.make index 66811eed0..51e9488f8 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -39,7 +39,7 @@ $(STATEDIR)/pcre.get: $(pcre_get_deps_default) $(PCRE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PCRE_URL)) + @$(call get, PCRE) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ pcre_extract: $(STATEDIR)/pcre.extract $(STATEDIR)/pcre.extract: $(pcre_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PCRE_DIR)) - @$(call extract, $(PCRE_SOURCE)) + @$(call extract, PCRE) @$(call patchin, $(PCRE)) @$(call touch, $@) diff --git a/rules/pdksh.make b/rules/pdksh.make index 6c29d5937..ca78b9a68 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -38,7 +38,7 @@ $(STATEDIR)/pdksh.get: $(pdksh_get_deps_default) $(PDKSH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PDKSH_URL)) + @$(call get, PDKSH) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pdksh_extract: $(STATEDIR)/pdksh.extract $(STATEDIR)/pdksh.extract: $(pdksh_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PDKSH_DIR)) - @$(call extract, $(PDKSH_SOURCE)) + @$(call extract, PDKSH) @$(call patchin, $(PDKSH)) @$(call touch, $@) diff --git a/rules/pekwm.make b/rules/pekwm.make index 2f7fd0579..83dbb7158 100644 --- a/rules/pekwm.make +++ b/rules/pekwm.make @@ -38,7 +38,7 @@ $(STATEDIR)/pekwm.get: $(pekwm_get_deps_default) $(PEKWM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PEKWM_URL)) + @$(call get, PEKWM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pekwm_extract: $(STATEDIR)/pekwm.extract $(STATEDIR)/pekwm.extract: $(pekwm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PEKWM_DIR)) - @$(call extract, $(PEKWM_SOURCE)) + @$(call extract, PEKWM) @$(call patchin, $(PEKWM)) @$(call touch, $@) diff --git a/rules/penguzilla.make b/rules/penguzilla.make index 680aa8d79..e25ae7a24 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -38,7 +38,7 @@ $(STATEDIR)/penguzilla.get: $(penguzilla_get_deps_default) $(PENGUZILLA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PENGUZILLA_URL)) + @$(call get, PENGUZILLA) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ penguzilla_extract: $(STATEDIR)/penguzilla.extract $(STATEDIR)/penguzilla.extract: $(penguzilla_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PENGUZILLA_DIR)) - @$(call extract, $(PENGUZILLA_SOURCE)) + @$(call extract, PENGUZILLA) @$(call patchin, $(PENGUZILLA)) @$(call touch, $@) diff --git a/rules/php-apc.make b/rules/php-apc.make index f9f5cdda6..d05281469 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -38,7 +38,7 @@ $(STATEDIR)/php-apc.get: $(php-apc_get_deps_default) $(PHP_APC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PHP_APC_URL)) + @$(call get, PHP_APC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ php-apc_extract: $(STATEDIR)/php-apc.extract $(STATEDIR)/php-apc.extract: $(php-apc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PHP_APC_DIR)) - @$(call extract, $(PHP_APC_SOURCE), $(PHP_DIR)/ext) + @$(call extract, PHP_APC, $(PHP_DIR)/ext) @$(call patchin, $(PHP_APC)) @$(call touch, $@) diff --git a/rules/php.make b/rules/php.make index b7f17cbb1..1e17f6e9b 100644 --- a/rules/php.make +++ b/rules/php.make @@ -38,7 +38,7 @@ $(STATEDIR)/php.get: $(php_get_deps_default) $(PHP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PHP_URL)) + @$(call get, PHP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ php_extract: $(STATEDIR)/php.extract $(STATEDIR)/php.extract: $(php_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PHP_DIR)) - @$(call extract, $(PHP_SOURCE)) + @$(call extract, PHP) @$(call patchin, $(PHP)) @$(call touch, $@) diff --git a/rules/pnet.make b/rules/pnet.make index eb86f5fa5..3f5a6dee8 100644 --- a/rules/pnet.make +++ b/rules/pnet.make @@ -38,7 +38,7 @@ $(STATEDIR)/pnet.get: $(pnet_get_deps_default) $(PNET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PNET_URL)) + @$(call get, PNET) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pnet_extract: $(STATEDIR)/pnet.extract $(STATEDIR)/pnet.extract: $(pnet_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PNET_DIR)) - @$(call extract, $(PNET_SOURCE)) + @$(call extract, PNET) @$(call patchin, $(PNET)) @$(call touch, $@) diff --git a/rules/pnetlib.make b/rules/pnetlib.make index e7ac44b4f..f3cea4514 100644 --- a/rules/pnetlib.make +++ b/rules/pnetlib.make @@ -38,7 +38,7 @@ $(STATEDIR)/pnetlib.get: $(pnetlib_get_deps_default) $(PNETLIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PNETLIB_URL)) + @$(call get, PNETLIB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pnetlib_extract: $(STATEDIR)/pnetlib.extract $(STATEDIR)/pnetlib.extract: $(pnetlib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PNETLIB_DIR)) - @$(call extract, $(PNETLIB_SOURCE)) + @$(call extract, PNETLIB) @$(call patchin, $(PNETLIB)) @$(call touch, $@) diff --git a/rules/pop3spam.make b/rules/pop3spam.make index f95fd8c32..a39598c31 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -38,7 +38,7 @@ $(STATEDIR)/pop3spam.get: $(pop3spam_get_deps_default) $(POP3SPAM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(POP3SPAM_URL)) + @$(call get, POP3SPAM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pop3spam_extract: $(STATEDIR)/pop3spam.extract $(STATEDIR)/pop3spam.extract: $(pop3spam_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(POP3SPAM_DIR)) - @$(call extract, $(POP3SPAM_SOURCE)) + @$(call extract, POP3SPAM) @$(call patchin, $(POP3SPAM)) @$(call touch, $@) diff --git a/rules/portmap.make b/rules/portmap.make index 54c456632..e893d7c27 100644 --- a/rules/portmap.make +++ b/rules/portmap.make @@ -35,7 +35,7 @@ $(STATEDIR)/portmap.get: $(portmap_get_deps_default) $(PORTMAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PORTMAP_URL)) + @$(call get, PORTMAP) # ---------------------------------------------------------------------------- # Extract @@ -46,7 +46,7 @@ portmap_extract: $(STATEDIR)/portmap.extract $(STATEDIR)/portmap.extract: $(portmap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PORTMAP_DIR)) - @$(call extract, $(PORTMAP_SOURCE)) + @$(call extract, PORTMAP) @$(call patchin, $(PORTMAP)) # apply some fixes @$(call disable_sh, $(PORTMAP_DIR)/Makefile, HOSTS_ACCESS) diff --git a/rules/ppp.make b/rules/ppp.make index 108ecfdca..295c922c2 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -37,7 +37,7 @@ $(STATEDIR)/ppp.get: $(ppp_get_deps_default) $(PPP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PPP_URL)) + @$(call get, PPP) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ ppp_extract: $(STATEDIR)/ppp.extract $(STATEDIR)/ppp.extract: $(ppp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PPP_DIR)) - @$(call extract, $(PPP_SOURCE)) + @$(call extract, PPP) @$(call patchin, $(PPP)) @$(call touch, $@) diff --git a/rules/procps.make b/rules/procps.make index 617215890..7112c7734 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -38,7 +38,7 @@ $(STATEDIR)/procps.get: $(procps_get_deps_default) $(PROCPS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PROCPS_URL)) + @$(call get, PROCPS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ procps_extract: $(STATEDIR)/procps.extract $(STATEDIR)/procps.extract: $(procps_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PROCPS_DIR)) - @$(call extract, $(PROCPS_SOURCE)) + @$(call extract, PROCPS) @$(call patchin, $(PROCPS)) @$(call touch, $@) diff --git a/rules/proftpd.make b/rules/proftpd.make index c30507863..a8eb000e8 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -38,7 +38,7 @@ $(STATEDIR)/proftpd.get: $(proftpd_get_deps_default) $(PROFTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PROFTPD_URL)) + @$(call get, PROFTPD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ proftpd_extract: $(STATEDIR)/proftpd.extract $(STATEDIR)/proftpd.extract: $(proftpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PROFTPD_DIR)) - @$(call extract, $(PROFTPD_SOURCE)) + @$(call extract, PROFTPD) @$(call patchin, $(PROFTPD)) @$(call touch, $@) diff --git a/rules/pureftpd.make b/rules/pureftpd.make index 5e2e8cb73..864559545 100644 --- a/rules/pureftpd.make +++ b/rules/pureftpd.make @@ -38,7 +38,7 @@ $(STATEDIR)/pureftpd.get: $(pureftpd_get_deps_default) $(PUREFTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PUREFTPD_URL)) + @$(call get, PUREFTPD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ pureftpd_extract: $(STATEDIR)/pureftpd.extract $(STATEDIR)/pureftpd.extract: $(pureftpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PUREFTPD_DIR)) - @$(call extract, $(PUREFTPD_SOURCE)) + @$(call extract, PUREFTPD) @$(call patchin, $(PUREFTPD)) @$(call touch, $@) diff --git a/rules/python.make b/rules/python.make index d09baafae..5fadf11a6 100644 --- a/rules/python.make +++ b/rules/python.make @@ -39,7 +39,7 @@ $(STATEDIR)/python.get: $(python_get_deps_default) $(PYTHON_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PYTHON_URL)) + @$(call get, PYTHON) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ python_extract: $(STATEDIR)/python.extract $(STATEDIR)/python.extract: $(python_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PYTHON_DIR)) - @$(call extract, $(PYTHON_SOURCE)) + @$(call extract, PYTHON) @$(call patchin, $(PYTHON)) @$(call touch, $@) diff --git a/rules/python24.make b/rules/python24.make index d405ac7db..ee3e74138 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -38,7 +38,7 @@ $(STATEDIR)/python24.get: $(python24_get_deps_default) $(PYTHON24_SOURCE): @$(call targetinfo, $@) - @$(call get, $(PYTHON24_URL)) + @$(call get, PYTHON24) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ python24_extract: $(STATEDIR)/python24.extract $(STATEDIR)/python24.extract: $(python24_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PYTHON24_DIR)) - @$(call extract, $(PYTHON24_SOURCE)) + @$(call extract, PYTHON24) @$(call patchin, $(PYTHON24)) @$(call touch, $@) diff --git a/rules/qt.make b/rules/qt.make index 3acbb076e..927f1c7da 100644 --- a/rules/qt.make +++ b/rules/qt.make @@ -40,7 +40,7 @@ $(STATEDIR)/qt.get: $(qt_get_deps_default) $(QT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(QT_URL)) + @$(call get, QT) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ qt_extract: $(STATEDIR)/qt.extract $(STATEDIR)/qt.extract: $(qt_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(QT_DIR)) - @$(call extract, $(QT_SOURCE)) + @$(call extract, QT) @$(call patchin, $(QT_SOURCE)) @$(call touch, $@) diff --git a/rules/qte.make b/rules/qte.make index abd7a0263..a5ec8eef7 100644 --- a/rules/qte.make +++ b/rules/qte.make @@ -44,7 +44,7 @@ $(STATEDIR)/qte.get: $(qte_get_deps_default) $(QTE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(QTE_URL)) + @$(call get, QTE) # ---------------------------------------------------------------------------- # Extract @@ -55,7 +55,7 @@ qte_extract: $(STATEDIR)/qte.extract $(STATEDIR)/qte.extract: $(qte_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(QTE_DIR)) - @$(call extract, $(QTE_SOURCE)) + @$(call extract, QTE) @$(call patchin, $(QTE)) @$(call touch, $@) diff --git a/rules/rawrec.make b/rules/rawrec.make index 8f75bdbef..cdce5a983 100644 --- a/rules/rawrec.make +++ b/rules/rawrec.make @@ -38,7 +38,7 @@ $(STATEDIR)/rawrec.get: $(rawrec_get_deps_default) $(RAWREC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(RAWREC_URL)) + @$(call get, RAWREC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ rawrec_extract: $(STATEDIR)/rawrec.extract $(STATEDIR)/rawrec.extract: $(rawrec_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(RAWREC_DIR)) - @$(call extract, $(RAWREC_SOURCE)) + @$(call extract, RAWREC) @$(call patchin, $(RAWREC)) @$(call touch, $@) diff --git a/rules/readline.make b/rules/readline.make index 6b9bb6aba..2997749d9 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -38,7 +38,7 @@ $(STATEDIR)/readline.get: $(readline_get_deps_default) $(READLINE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(READLINE_URL)) + @$(call get, READLINE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ readline_extract: $(STATEDIR)/readline.extract $(STATEDIR)/readline.extract: $(readline_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(READLINE_DIR)) - @$(call extract, $(READLINE_SOURCE)) + @$(call extract, READLINE) @$(call patchin, $(READLINE)) @$(call touch, $@) diff --git a/rules/realvnc.make b/rules/realvnc.make index 9eede9d2a..c8edfeb6a 100644 --- a/rules/realvnc.make +++ b/rules/realvnc.make @@ -41,7 +41,7 @@ $(STATEDIR)/realvnc.get: $(realvnc_get_deps_default) $(REALVNC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(REALVNC_URL)) + @$(call get, REALVNC) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ realvnc_extract: $(STATEDIR)/realvnc.extract $(STATEDIR)/realvnc.extract: $(realvnc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(REALVNC_DIR)) - @$(call extract, $(REALVNC_SOURCE)) + @$(call extract, REALVNC) @$(call patchin, $(REALVNC)) @$(call touch, $@) diff --git a/rules/rsync.make b/rules/rsync.make index e0313ccb7..da7a3a6c1 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -38,7 +38,7 @@ $(STATEDIR)/rsync.get: $(rsync_get_deps_default) $(RSYNC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(RSYNC_URL)) + @$(call get, RSYNC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ rsync_extract: $(STATEDIR)/rsync.extract $(STATEDIR)/rsync.extract: $(rsync_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(RSYNC_DIR)) - @$(call extract, $(RSYNC_SOURCE)) + @$(call extract, RSYNC) @$(call patchin, $(RSYNC)) @$(call touch, $@) diff --git a/rules/rtai.make b/rules/rtai.make index b58674df8..74b316381 100644 --- a/rules/rtai.make +++ b/rules/rtai.make @@ -47,7 +47,7 @@ $(STATEDIR)/rtai.get: $(rtai_get_deps_default) $(RTAI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(RTAI_URL)) + @$(call get, RTAI) # ---------------------------------------------------------------------------- # Extract @@ -58,7 +58,7 @@ rtai_extract: $(STATEDIR)/rtai.extract $(STATEDIR)/rtai.extract: $(rtai_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(RTAI_DIR)) - @$(call extract, $(RTAI_SOURCE)) + @$(call extract, RTAI) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/rtnet.make b/rules/rtnet.make index c13a8c795..2ec8d4bb7 100644 --- a/rules/rtnet.make +++ b/rules/rtnet.make @@ -41,7 +41,7 @@ $(STATEDIR)/rtnet.get: $(rtnet_get_deps_default) $(RTNET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(RTNET_URL)) + @$(call get, RTNET) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ rtnet_extract: $(STATEDIR)/rtnet.extract $(STATEDIR)/rtnet.extract: $(rtnet_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(RTNET_DIR)) - @$(call extract, $(RTNET_SOURCE)) + @$(call extract, RTNET) @$(call patchin, $(RTNET)) @$(call touch, $@) diff --git a/rules/schedutils.make b/rules/schedutils.make index 180ad7f04..2dc7a3b97 100644 --- a/rules/schedutils.make +++ b/rules/schedutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/schedutils.get: $(schedutils_get_deps_default) $(SCHEDUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SCHEDUTILS_URL)) + @$(call get, SCHEDUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ schedutils_extract: $(STATEDIR)/schedutils.extract $(STATEDIR)/schedutils.extract: $(schedutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SCHEDUTILS_DIR)) - @$(call extract, $(SCHEDUTILS_SOURCE)) + @$(call extract, SCHEDUTILS) @$(call patchin, $(SCHEDUTILS)) @$(call touch, $@) diff --git a/rules/sdl.make b/rules/sdl.make index 8e0ccee56..101cebb3f 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -38,7 +38,7 @@ $(STATEDIR)/sdl.get: $(sdl_get_deps_default) $(SDL_LIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SDL_LIB_URL)) + @$(call get, SDL_LIB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ sdl_extract: $(STATEDIR)/sdl.extract $(STATEDIR)/sdl.extract: $(sdl_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SDL_LIB_DIR)) - @$(call extract, $(SDL_LIB_SOURCE)) + @$(call extract, SDL_LIB) @$(call patchin, $(SDL_LIB)) @$(call touch, $@) diff --git a/rules/sdl_image.make b/rules/sdl_image.make index c0a33adda..9b78bc99b 100644 --- a/rules/sdl_image.make +++ b/rules/sdl_image.make @@ -38,7 +38,7 @@ $(STATEDIR)/sdl_image.get: $(sdl_image_get_deps_default) $(SDL_IMAGE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SDL_IMAGE_URL)) + @$(call get, SDL_IMAGE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ sdl_image_extract: $(STATEDIR)/sdl_image.extract $(STATEDIR)/sdl_image.extract: $(sdl_image_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SDL_IMAGE_DIR)) - @$(call extract, $(SDL_IMAGE_SOURCE)) + @$(call extract, SDL_IMAGE) @$(call patchin, $(SDL_IMAGE)) @$(call touch, $@) diff --git a/rules/setmixer.make b/rules/setmixer.make index e0bcd51c8..804858b93 100644 --- a/rules/setmixer.make +++ b/rules/setmixer.make @@ -38,7 +38,7 @@ $(STATEDIR)/setmixer.get: $(setmixer_get_deps_default) $(SETMIXER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SETMIXER_URL)) + @$(call get, SETMIXER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ setmixer_extract: $(STATEDIR)/setmixer.extract $(STATEDIR)/setmixer.extract: $(setmixer_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SETMIXER_DIR)) - @$(call extract, $(SETMIXER_SOURCE)) + @$(call extract, SETMIXER) @$(call patchin, $(SETMIXER),$(SETMIXER_DIR)) @$(call touch, $@) diff --git a/rules/setserial.make b/rules/setserial.make index 48f0539d2..390d7d167 100644 --- a/rules/setserial.make +++ b/rules/setserial.make @@ -38,7 +38,7 @@ $(STATEDIR)/setserial.get: $(setserial_get_deps_default) $(SETSERIAL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SETSERIAL_URL)) + @$(call get, SETSERIAL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ setserial_extract: $(STATEDIR)/setserial.extract $(STATEDIR)/setserial.extract: $(setserial_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SETSERIAL_DIR)) - @$(call extract, $(SETSERIAL_SOURCE)) + @$(call extract, SETSERIAL) @$(call patchin, $(SETSERIAL)) @$(call touch, $@) diff --git a/rules/shorewall.make b/rules/shorewall.make index 14a1d0b31..2313f1cf9 100644 --- a/rules/shorewall.make +++ b/rules/shorewall.make @@ -39,7 +39,7 @@ $(STATEDIR)/shorewall.get: $(shorewall_get_deps_default) $(SHOREWALL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SHOREWALL_URL)) + @$(call get, SHOREWALL) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ shorewall_extract: $(STATEDIR)/shorewall.extract $(STATEDIR)/shorewall.extract: $(shorewall_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SHOREWALL_DIR)) - @$(call extract, $(SHOREWALL_SOURCE)) + @$(call extract, SHOREWALL) @$(call patchin, $(SHOREWALL)) @$(call touch, $@) diff --git a/rules/slang.make b/rules/slang.make index b2038bfd3..43ef00a8c 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -38,7 +38,7 @@ $(STATEDIR)/slang.get: $(slang_get_deps_default) $(SLANG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SLANG_URL)) + @$(call get, SLANG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ slang_extract: $(STATEDIR)/slang.extract $(STATEDIR)/slang.extract: $(slang_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SLANG_DIR)) - @$(call extract, $(SLANG_SOURCE)) + @$(call extract, SLANG) @$(call patchin, $(SLANG)) @$(call touch, $@) diff --git a/rules/smtpclient.make b/rules/smtpclient.make index f9a82c7d6..3bc9b5b2d 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -38,7 +38,7 @@ $(STATEDIR)/smtpclient.get: $(smtpclient_get_deps_default) $(SMTPCLIENT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SMTPCLIENT_URL)) + @$(call get, SMTPCLIENT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ smtpclient_extract: $(STATEDIR)/smtpclient.extract $(STATEDIR)/smtpclient.extract: $(smtpclient_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SMTPCLIENT_DIR)) - @$(call extract, $(SMTPCLIENT_SOURCE)) + @$(call extract, SMTPCLIENT) @$(call patchin, $(SMTPCLIENT)) @$(call touch, $@) diff --git a/rules/sqlite.make b/rules/sqlite.make index a02427db5..c9d2c63ac 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -39,7 +39,7 @@ $(STATEDIR)/sqlite.get: $(sqlite_get_deps_default) $(SQLITE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SQLITE_URL)) + @$(call get, SQLITE) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ sqlite_extract: $(STATEDIR)/sqlite.extract $(STATEDIR)/sqlite.extract: $(sqlite_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SQLITE_DIR)) - @$(call extract, $(SQLITE_SOURCE)) + @$(call extract, SQLITE) @$(call patchin, $(SQLITE)) @$(call touch, $@) diff --git a/rules/ssmtp.make b/rules/ssmtp.make index 83b2900d9..a871a7b1c 100644 --- a/rules/ssmtp.make +++ b/rules/ssmtp.make @@ -39,7 +39,7 @@ $(STATEDIR)/ssmtp.get: $(ssmtp_get_deps_default) $(SSMTP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SSMTP_URL)) + @$(call get, SSMTP) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ ssmtp_extract: $(STATEDIR)/ssmtp.extract $(STATEDIR)/ssmtp.extract: $(ssmtp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SSMTP_DIR)) - @$(call extract, $(SSMTP_SOURCE)) + @$(call extract, SSMTP) @$(call patchin, $(SSMTP)) @$(call touch, $@) diff --git a/rules/strace.make b/rules/strace.make index 4900a9d82..ca145a4be 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -37,7 +37,7 @@ $(STATEDIR)/strace.get: $(strace_get_deps_default) $(STRACE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(STRACE_URL)) + @$(call get, STRACE) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ strace_extract: $(STATEDIR)/strace.extract $(STATEDIR)/strace.extract: $(strace_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(STRACE_DIR)) - @$(call extract, $(STRACE_SOURCE)) + @$(call extract, STRACE) @$(call patchin, $(STRACE)) @$(call touch, $@) diff --git a/rules/sudo.make b/rules/sudo.make index cadc6df41..290d04695 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -40,7 +40,7 @@ $(STATEDIR)/sudo.get: $(sudo_get_deps_default) $(SUDO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SUDO_URL)) + @$(call get, SUDO) # ---------------------------------------------------------------------------- # Extract @@ -51,7 +51,7 @@ sudo_extract: $(STATEDIR)/sudo.extract $(STATEDIR)/sudo.extract: $(sudo_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SUDO_DIR)) - @$(call extract, $(SUDO_SOURCE)) + @$(call extract, SUDO) @$(call patchin, $(SUDO)) @$(call touch, $@) diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 4bdbf7a7f..b1563bcc9 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/sysfsutils.get: $(sysfsutils_get_deps_default) $(SYSFSUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SYSFSUTILS_URL)) + @$(call get, SYSFSUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ sysfsutils_extract: $(STATEDIR)/sysfsutils.extract $(STATEDIR)/sysfsutils.extract: $(sysfsutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SYSFSUTILS_DIR)) - @$(call extract, $(SYSFSUTILS_SOURCE)) + @$(call extract, SYSFSUTILS) @$(call patchin, $(SYSFSUTILS)) @$(call touch, $@) diff --git a/rules/syslogng.make b/rules/syslogng.make index ca77bbad3..89ac1e879 100644 --- a/rules/syslogng.make +++ b/rules/syslogng.make @@ -38,7 +38,7 @@ $(STATEDIR)/syslogng.get: $(syslogng_get_deps_default) $(SYSLOGNG_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SYSLOGNG_URL)) + @$(call get, SYSLOGNG) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ syslogng_extract: $(STATEDIR)/syslogng.extract $(STATEDIR)/syslogng.extract: $(syslogng_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SYSLOGNG_DIR)) - @$(call extract, $(SYSLOGNG_SOURCE)) + @$(call extract, SYSLOGNG) @$(call patchin, $(SYSLOGNG)) @$(call touch, $@) diff --git a/rules/sysutils.make b/rules/sysutils.make index fe74c23e4..67c83b9a5 100644 --- a/rules/sysutils.make +++ b/rules/sysutils.make @@ -38,7 +38,7 @@ $(STATEDIR)/sysutils.get: $(sysutils_get_deps_default) $(SYSUTILS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SYSUTILS_URL)) + @$(call get, SYSUTILS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ sysutils_extract: $(STATEDIR)/sysutils.extract $(STATEDIR)/sysutils.extract: $(sysutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SYSUTILS_DIR)) - @$(call extract, $(SYSUTILS_SOURCE)) + @$(call extract, SYSUTILS) @$(call patchin, $(SYSUTILS)) @$(call touch, $@) diff --git a/rules/sysvinit.make b/rules/sysvinit.make index 6801f8994..37813bc81 100644 --- a/rules/sysvinit.make +++ b/rules/sysvinit.make @@ -43,7 +43,7 @@ $(STATEDIR)/sysvinit.get: $(sysvinit_get_deps_default) $(SYSVINIT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(SYSVINIT_URL)) + @$(call get, SYSVINIT) # ---------------------------------------------------------------------------- # Extract @@ -54,7 +54,7 @@ sysvinit_extract: $(STATEDIR)/sysvinit.extract $(STATEDIR)/sysvinit.extract: $(sysvinit_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SYSVINIT_DIR)) - @$(call extract, $(SYSVINIT_SOURCE)) + @$(call extract, SYSVINIT) @$(call patchin, $(SYSVINIT)) @$(call touch, $@) @@ -156,8 +156,8 @@ ifdef PTXCONF_SYSVINIT_MESG endif ifdef PTXCONF_SYSVINIT_BSDINIT @$(call clean, $(BSDINIT_DIR)) - @$(call get, $(BSDINIT_URL)) - @$(call extract, $(BSDINIT_SOURCE)) + @$(call get, BSDINIT) + @$(call extract, BSDINIT) @$(call install_copy, sysvinit, 0, 0, 0644, $(BSDINIT_DIR)/inittab, /etc/inittab, n) @$(call install_copy, sysvinit, 0, 0, 0755, /etc/rc.d) @$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.0, /etc/rc.d/rc.0, n) diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 240c67422..f4d300f70 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -38,7 +38,7 @@ $(STATEDIR)/tcpdump.get: $(tcpdump_get_deps_default) $(TCPDUMP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TCPDUMP_URL)) + @$(call get, TCPDUMP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ tcpdump_extract: $(STATEDIR)/tcpdump.extract $(STATEDIR)/tcpdump.extract: $(tcpdump_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TCPDUMP_DIR)) - @$(call extract, $(TCPDUMP_SOURCE), $(BUILDDIR)) + @$(call extract, TCPDUMP, $(BUILDDIR)) @$(call patchin, $(TCPDUMP)) @$(call touch, $@) diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make index 1e8324c96..078013ab5 100644 --- a/rules/tcpwrapper.make +++ b/rules/tcpwrapper.make @@ -37,7 +37,7 @@ $(STATEDIR)/tcpwrapper.get: $(tcpwrapper_get_deps_default) $(TCPWRAPPER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TCPWRAPPER_URL)) + @$(call get, TCPWRAPPER) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ tcpwrapper_extract: $(STATEDIR)/tcpwrapper.extract $(STATEDIR)/tcpwrapper.extract: $(tcpwrapper_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TCPWRAPPER_DIR)) - @$(call extract, $(TCPWRAPPER_SOURCE)) + @$(call extract, TCPWRAPPER) @$(call patchin, $(TCPWRAPPER)) @$(call touch, $@) diff --git a/rules/template b/rules/template index bf8fd448f..33de8730a 100644 --- a/rules/template +++ b/rules/template @@ -49,7 +49,7 @@ $(@PACKET@_SOURCE): $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(@PACKET@_DIR)) - @$(call extract, $(@PACKET@_SOURCE)) + @$(call extract, @PACKET@) @$(call patchin, $(@PACKET@)) @$(call touch, $@) diff --git a/rules/template-cross b/rules/template-cross index 2e3cb2232..ab856e106 100644 --- a/rules/template-cross +++ b/rules/template-cross @@ -38,7 +38,7 @@ $(STATEDIR)/@packet@.get: $(@packet@_get_deps_default) $(@PACKET@_SOURCE): @$(call targetinfo, $@) - @$(call get, $(@PACKET@_URL)) + @$(call get, @PACKET@) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ $(@PACKET@_SOURCE): $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(@PACKET@_DIR)) - @$(call extract, $(@PACKET@_SOURCE), $(CROSS_BUILDDIR)) + @$(call extract, @PACKET@, $(CROSS_BUILDDIR)) @$(call patchin, $(@PACKET@), $(@PACKET@_DIR)) @$(call touch, $@) diff --git a/rules/template-host b/rules/template-host index 432afc7b5..2043f8cdd 100644 --- a/rules/template-host +++ b/rules/template-host @@ -38,7 +38,7 @@ $(STATEDIR)/@packet@.get: $(@packet@_get_deps_default) $(@PACKET@_SOURCE): @$(call targetinfo, $@) - @$(call get, $(@PACKET@_URL)) + @$(call get, @PACKET@) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ $(@PACKET@_SOURCE): $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(@PACKET@_DIR)) - @$(call extract, $(@PACKET@_SOURCE), $(HOST_BUILDDIR)) + @$(call extract, @PACKET@, $(HOST_BUILDDIR)) @$(call patchin, $(@PACKET@), $(@PACKET@_DIR)) @$(call touch, $@) diff --git a/rules/termcap.make b/rules/termcap.make index 6cc930a9e..7f658166a 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -38,7 +38,7 @@ $(STATEDIR)/termcap.get: $(termcap_get_deps_default) $(TERMCAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TERMCAP_URL)) + @$(call get, TERMCAP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ termcap_extract: $(STATEDIR)/termcap.extract $(STATEDIR)/termcap.extract: $(termcap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TERMCAP_DIR)) - @$(call extract, $(TERMCAP_SOURCE)) + @$(call extract, TERMCAP) @$(call patchin, $(TERMCAP)) @$(call touch, $@) diff --git a/rules/thttpd.make b/rules/thttpd.make index 85ed48a20..d917e52d3 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -38,7 +38,7 @@ $(STATEDIR)/thttpd.get: $(thttpd_get_deps_default) $(THTTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(THTTPD_URL)) + @$(call get, THTTPD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ thttpd_extract: $(STATEDIR)/thttpd.extract $(STATEDIR)/thttpd.extract: $(thttpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(THTTPD_DIR)) - @$(call extract, $(THTTPD_SOURCE)) + @$(call extract, THTTPD) @$(call patchin, $(THTTPD)) @$(call touch, $@) diff --git a/rules/tinylogin.make b/rules/tinylogin.make index 2e3ef56ca..8ed11e41f 100644 --- a/rules/tinylogin.make +++ b/rules/tinylogin.make @@ -39,7 +39,7 @@ $(STATEDIR)/tinylogin.get: $(tinylogin_get_deps_default) $(TINYLOGIN_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TINYLOGIN_URL)) + @$(call get, TINYLOGIN) # ---------------------------------------------------------------------------- # Extract @@ -50,7 +50,7 @@ tinylogin_extract: $(STATEDIR)/tinylogin.extract $(STATEDIR)/tinylogin.extract: $(tinylogin_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TINYLOGIN_DIR)) - @$(call extract, $(TINYLOGIN_SOURCE)) + @$(call extract, TINYLOGIN) @$(call patchin, $(TINYLOGIN)) @$(call touch, $@) diff --git a/rules/treecc.make b/rules/treecc.make index 8642446c1..d5fb1fdf7 100644 --- a/rules/treecc.make +++ b/rules/treecc.make @@ -38,7 +38,7 @@ $(STATEDIR)/treecc.get: $(treecc_get_deps_default) $(TREECC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TREECC_URL)) + @$(call get, TREECC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ treecc_extract: $(STATEDIR)/treecc.extract $(STATEDIR)/treecc.extract: $(treecc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TREECC_DIR)) - @$(call extract, $(TREECC_SOURCE)) + @$(call extract, TREECC) @$(call patchin, $(TREECC)) @$(call touch, $@) diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make index 8384201f7..632d4b020 100644 --- a/rules/troll-ftpd.make +++ b/rules/troll-ftpd.make @@ -38,7 +38,7 @@ $(STATEDIR)/troll-ftpd.get: $(troll-ftpd_get_deps_default) $(TROLL_FTPD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TROLL_FTPD_URL)) + @$(call get, TROLL_FTPD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ troll-ftpd_extract: $(STATEDIR)/troll-ftpd.extract $(STATEDIR)/troll-ftpd.extract: $(troll-ftpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TROLL_FTPD_DIR)) - @$(call extract, $(TROLL_FTPD_SOURCE)) + @$(call extract, TROLL_FTPD) @$(call patchin, $(TROLL_FTPD)) @$(call touch, $@) diff --git a/rules/tslib.make b/rules/tslib.make index 99563dd8d..99cc75c5d 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -38,7 +38,7 @@ $(STATEDIR)/tslib.get: $(tslib_get_deps_default) $(TSLIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(TSLIB_URL)) + @$(call get, TSLIB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ tslib_extract: $(STATEDIR)/tslib.extract $(STATEDIR)/tslib.extract: $(tslib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TSLIB_DIR)) - @$(call extract, $(TSLIB_SOURCE)) + @$(call extract, TSLIB) @$(call patchin, $(TSLIB)) @$(call touch, $@) diff --git a/rules/udev.make b/rules/udev.make index c5caa218f..a105a402c 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -38,7 +38,7 @@ $(STATEDIR)/udev.get: $(udev_get_deps_default) $(UDEV_SOURCE): @$(call targetinfo, $@) - @$(call get, $(UDEV_URL)) + @$(call get, UDEV) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ udev_extract: $(STATEDIR)/udev.extract $(STATEDIR)/udev.extract: $(udev_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(UDEV_DIR)) - @$(call extract, $(UDEV_SOURCE)) + @$(call extract, UDEV) @$(call patchin, $(UDEV)) @$(call touch, $@) diff --git a/rules/utelnetd.make b/rules/utelnetd.make index 93430daa2..f0b21dc09 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -36,7 +36,7 @@ $(STATEDIR)/utelnetd.get: $(utelnetd_get_deps_default) $(UTELNETD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(UTELNETD_URL)) + @$(call get, UTELNETD) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ utelnetd_extract: $(STATEDIR)/utelnetd.extract $(STATEDIR)/utelnetd.extract: $(utelnetd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(UTELNETS_DIR)) - @$(call extract, $(UTELNETD_SOURCE)) + @$(call extract, UTELNETD) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/util-linux.make b/rules/util-linux.make index b6d8f8ef9..691965553 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -38,7 +38,7 @@ $(STATEDIR)/util-linux.get: $(util-linux_get_deps_default) $(UTIL_LINUX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(UTIL_LINUX_URL)) + @$(call get, UTIL_LINUX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ util-linux_extract: $(STATEDIR)/util-linux.extract $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(UTIL_LINUX_DIR)) - @$(call extract, $(UTIL_LINUX_SOURCE)) + @$(call extract, UTIL_LINUX) @$(call patchin, $(UTIL_LINUX)) perl -i -p -e 's/^CPU=.*$$/CPU=$(PTXCONF_ARCH)/g' $(UTIL_LINUX_DIR)/MCONFIG diff --git a/rules/valgrind.make b/rules/valgrind.make index ba6a05c82..6a6cff72f 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -38,7 +38,7 @@ $(STATEDIR)/valgrind.get: $(valgrind_get_deps_default) $(VALGRIND_SOURCE): @$(call targetinfo, $@) - @$(call get, $(VALGRIND_URL)) + @$(call get, VALGRIND) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ valgrind_extract: $(STATEDIR)/valgrind.extract $(STATEDIR)/valgrind.extract: $(valgrind_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(VALGRIND_DIR)) - @$(call extract, $(VALGRIND_SOURCE)) + @$(call extract, VALGRIND) @$(call patchin, $(VALGRIND)) @$(call touch, $@) diff --git a/rules/wget.make b/rules/wget.make index 8dbcac0ce..06aae9245 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -38,7 +38,7 @@ $(STATEDIR)/wget.get: $(wget_get_deps_default) $(WGET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(WGET_URL)) + @$(call get, WGET) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ wget_extract: $(STATEDIR)/wget.extract $(STATEDIR)/wget.extract: $(wget_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(WGET_DIR)) - @$(call extract, $(WGET_SOURCE)) + @$(call extract, WGET) @$(call patchin, $(WGET_PACKET)) @$(call touch, $@) diff --git a/rules/wireless.make b/rules/wireless.make index fb1c09cdc..f2de051fa 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -37,7 +37,7 @@ $(STATEDIR)/wireless.get: $(wireless_get_deps_default) $(WIRELESS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(WIRELESS_URL)) + @$(call get, WIRELESS) # ---------------------------------------------------------------------------- # Extract @@ -48,7 +48,7 @@ wireless_extract: $(STATEDIR)/wireless.extract $(STATEDIR)/wireless.extract: $(wireless_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(WIRELESS_DIR)) - @$(call extract, $(WIRELESS_SOURCE)) + @$(call extract, WIRELESS) @$(call patchin, $(WIRELESS)) @$(call touch, $@) diff --git a/rules/wxWindows.make b/rules/wxWindows.make index 53209ce76..6b1928bf8 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -41,7 +41,7 @@ $(STATEDIR)/wxWindows.get: $(wxWindows_get_deps_default) $(WXWINDOWS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(WXWINDOWS_URL)) + @$(call get, WXWINDOWS) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ wxWindows_extract: $(STATEDIR)/wxWindows.extract $(STATEDIR)/wxWindows.extract: $(wxWindows_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(WXWINDOWS_DIR)) - @$(call extract, $(WXWINDOWS_SOURCE)) + @$(call extract, WXWINDOWS) @$(call patchin, $(WXWINDOWS)) @$(call touch, $@) diff --git a/rules/xalf.make b/rules/xalf.make index 81b97680a..06c62338c 100644 --- a/rules/xalf.make +++ b/rules/xalf.make @@ -38,7 +38,7 @@ $(STATEDIR)/xalf.get: $(xalf_get_deps_default) $(XALF_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XALF_URL)) + @$(call get, XALF) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xalf_extract: $(STATEDIR)/xalf.extract $(STATEDIR)/xalf.extract: $(xalf_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XALF_DIR)) - @$(call extract, $(XALF_SOURCE)) + @$(call extract, XALF) @$(call patchin, $(XALF)) @$(call touch, $@) diff --git a/rules/xmlbench.make b/rules/xmlbench.make index 8cd332593..abdece495 100644 --- a/rules/xmlbench.make +++ b/rules/xmlbench.make @@ -44,7 +44,7 @@ $(STATEDIR)/xmlbench.get: $(xmlbench_get_deps_default) $(XMLBENCH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XMLBENCH_URL)) + @$(call get, XMLBENCH) # ---------------------------------------------------------------------------- # Extract @@ -55,7 +55,7 @@ xmlbench_extract: $(STATEDIR)/xmlbench.extract $(STATEDIR)/xmlbench.extract: $(xmlbench_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XMLBENCH_DIR)) - @$(call extract, $(XMLBENCH_SOURCE)) + @$(call extract, XMLBENCH) mv $(BUILDDIR)/xmlbench $(XMLBENCH_DIR) @$(call patchin, $(XMLBENCH)) @$(call touch, $@) diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index 3dad06e0d..7c343c5fd 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -38,7 +38,7 @@ $(STATEDIR)/xmlstarlet.get: $(xmlstarlet_get_deps_default) $(XMLSTARLET_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XMLSTARLET_URL)) + @$(call get, XMLSTARLET) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xmlstarlet_extract: $(STATEDIR)/xmlstarlet.extract $(STATEDIR)/xmlstarlet.extract: $(xmlstarlet_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XMLSTARLET_DIR)) - @$(call extract, $(XMLSTARLET_SOURCE)) + @$(call extract, XMLSTARLET) @$(call patchin, $(XMLSTARLET)) @$(call touch, $@) diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make index 7037ebefe..e0f350887 100644 --- a/rules/xorg-app-mkfontdir.make +++ b/rules/xorg-app-mkfontdir.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-mkfontdir.get: $(xorg-app-mkfontdir_get_deps_default) $(XORG_APP_MKFONTDIR_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_MKFONTDIR_URL)) + @$(call get, XORG_APP_MKFONTDIR) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-mkfontdir_extract: $(STATEDIR)/xorg-app-mkfontdir.extract $(STATEDIR)/xorg-app-mkfontdir.extract: $(xorg-app-mkfontdir_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_MKFONTDIR_DIR)) - @$(call extract, $(XORG_APP_MKFONTDIR_SOURCE)) + @$(call extract, XORG_APP_MKFONTDIR) @$(call patchin, $(XORG_APP_MKFONTDIR)) @$(call touch, $@) diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make index 5545a470d..84251ea80 100644 --- a/rules/xorg-app-rgb.make +++ b/rules/xorg-app-rgb.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-rgb.get: $(xorg-app-rgb_get_deps_default) $(XORG_APP_RGB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_RGB_URL)) + @$(call get, XORG_APP_RGB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-rgb_extract: $(STATEDIR)/xorg-app-rgb.extract $(STATEDIR)/xorg-app-rgb.extract: $(xorg-app-rgb_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_RGB_DIR)) - @$(call extract, $(XORG_APP_RGB_SOURCE)) + @$(call extract, XORG_APP_RGB) @$(call patchin, $(XORG_APP_RGB)) @$(call touch, $@) diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make index 28b250c4e..ea82658de 100644 --- a/rules/xorg-app-xdm.make +++ b/rules/xorg-app-xdm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-xdm.get: $(xorg-app-xdm_get_deps_default) $(XORG_APP_XDM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_XDM_URL)) + @$(call get, XORG_APP_XDM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-xdm_extract: $(STATEDIR)/xorg-app-xdm.extract $(STATEDIR)/xorg-app-xdm.extract: $(xorg-app-xdm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_XDM_DIR)) - @$(call extract, $(XORG_APP_XDM_SOURCE)) + @$(call extract, XORG_APP_XDM) @$(call patchin, $(XORG_APP_XDM)) @$(call touch, $@) diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make index dc14c9aea..2d0f3e810 100644 --- a/rules/xorg-app-xeyes.make +++ b/rules/xorg-app-xeyes.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-xeyes.get: $(xorg-app-xeyes_get_deps_default) $(XORG_APP_XEYES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_XEYES_URL)) + @$(call get, XORG_APP_XEYES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-xeyes_extract: $(STATEDIR)/xorg-app-xeyes.extract $(STATEDIR)/xorg-app-xeyes.extract: $(xorg-app-xeyes_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_XEYES_DIR)) - @$(call extract, $(XORG_APP_XEYES_SOURCE)) + @$(call extract, XORG_APP_XEYES) @$(call patchin, $(XORG_APP_XEYES)) @$(call touch, $@) diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make index 1bb386850..cc23321d1 100644 --- a/rules/xorg-app-xhost.make +++ b/rules/xorg-app-xhost.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-xhost.get: $(xorg-app-xhost_get_deps_default) $(XORG_APP_XHOST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_XHOST_URL)) + @$(call get, XORG_APP_XHOST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-xhost_extract: $(STATEDIR)/xorg-app-xhost.extract $(STATEDIR)/xorg-app-xhost.extract: $(xorg-app-xhost_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_XHOST_DIR)) - @$(call extract, $(XORG_APP_XHOST_SOURCE)) + @$(call extract, XORG_APP_XHOST) @$(call patchin, $(XORG_APP_XHOST)) @$(call touch, $@) diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make index 8b363210b..987198479 100644 --- a/rules/xorg-app-xinit.make +++ b/rules/xorg-app-xinit.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-xinit.get: $(xorg-app-xinit_get_deps_default) $(XORG_APP_XINIT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_XINIT_URL)) + @$(call get, XORG_APP_XINIT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-xinit_extract: $(STATEDIR)/xorg-app-xinit.extract $(STATEDIR)/xorg-app-xinit.extract: $(xorg-app-xinit_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_XINIT_DIR)) - @$(call extract, $(XORG_APP_XINIT_SOURCE)) + @$(call extract, XORG_APP_XINIT) @$(call patchin, $(XORG_APP_XINIT)) @$(call touch, $@) diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make index 0d84e0844..5b9d3dd94 100644 --- a/rules/xorg-app-xsetroot.make +++ b/rules/xorg-app-xsetroot.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-app-xsetroot.get: $(xorg-app-xsetroot_get_deps_default) $(XORG_APP_XSETROOT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_APP_XSETROOT_URL)) + @$(call get, XORG_APP_XSETROOT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-app-xsetroot_extract: $(STATEDIR)/xorg-app-xsetroot.extract $(STATEDIR)/xorg-app-xsetroot.extract: $(xorg-app-xsetroot_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_APP_XSETROOT_DIR)) - @$(call extract, $(XORG_APP_XSETROOT_SOURCE)) + @$(call extract, XORG_APP_XSETROOT) @$(call patchin, $(XORG_APP_XSETROOT)) @$(call touch, $@) diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make index f85937334..237d866e8 100644 --- a/rules/xorg-data-xbitmaps.make +++ b/rules/xorg-data-xbitmaps.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-data-xbitmaps.get: $(xorg-data-xbitmaps_get_deps_default) $(XORG_DATA_XBITMAPS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DATA_XBITMAPS_URL)) + @$(call get, XORG_DATA_XBITMAPS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-data-xbitmaps_extract: $(STATEDIR)/xorg-data-xbitmaps.extract $(STATEDIR)/xorg-data-xbitmaps.extract: $(xorg-data-xbitmaps_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DATA_XBITMAPS_DIR)) - @$(call extract, $(XORG_DATA_XBITMAPS_SOURCE)) + @$(call extract, XORG_DATA_XBITMAPS) @$(call patchin, $(XORG_DATA_XBITMAPS)) @$(call touch, $@) diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make index 2743b2142..c27623c89 100644 --- a/rules/xorg-driver-input-evdev.make +++ b/rules/xorg-driver-input-evdev.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-input-evdev.get: $(xorg-driver-input-evdev_get_deps_defa $(XORG_DRIVER_INPUT_EVDEV_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_INPUT_EVDEV_URL)) + @$(call get, XORG_DRIVER_INPUT_EVDEV) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-input-evdev_extract: $(STATEDIR)/xorg-driver-input-evdev.extract $(STATEDIR)/xorg-driver-input-evdev.extract: $(xorg-driver-input-evdev_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_INPUT_EVDEV_DIR)) - @$(call extract, $(XORG_DRIVER_INPUT_EVDEV_SOURCE)) + @$(call extract, XORG_DRIVER_INPUT_EVDEV) @$(call patchin, $(XORG_DRIVER_INPUT_EVDEV)) @$(call touch, $@) diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make index 92cb1c1a2..8aab3553f 100644 --- a/rules/xorg-driver-input-keyboard.make +++ b/rules/xorg-driver-input-keyboard.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-input-keyboard.get: $(xorg-driver-input-keyboard_get_dep $(XORG_DRIVER_INPUT_KEYBOARD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_INPUT_KEYBOARD_URL)) + @$(call get, XORG_DRIVER_INPUT_KEYBOARD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-input-keyboard_extract: $(STATEDIR)/xorg-driver-input-keyboard.extra $(STATEDIR)/xorg-driver-input-keyboard.extract: $(xorg-driver-input-keyboard_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)) - @$(call extract, $(XORG_DRIVER_INPUT_KEYBOARD_SOURCE)) + @$(call extract, XORG_DRIVER_INPUT_KEYBOARD) @$(call patchin, $(XORG_DRIVER_INPUT_KEYBOARD)) @$(call touch, $@) diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make index cd4dc56d7..d33208aed 100644 --- a/rules/xorg-driver-input-mouse.make +++ b/rules/xorg-driver-input-mouse.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-input-mouse.get: $(xorg-driver-input-mouse_get_deps_defa $(XORG_DRIVER_INPUT_MOUSE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_INPUT_MOUSE_URL)) + @$(call get, XORG_DRIVER_INPUT_MOUSE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-input-mouse_extract: $(STATEDIR)/xorg-driver-input-mouse.extract $(STATEDIR)/xorg-driver-input-mouse.extract: $(xorg-driver-input-mouse_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_INPUT_MOUSE_DIR)) - @$(call extract, $(XORG_DRIVER_INPUT_MOUSE_SOURCE)) + @$(call extract, XORG_DRIVER_INPUT_MOUSE) @$(call patchin, $(XORG_DRIVER_INPUT_MOUSE)) @$(call touch, $@) diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make index bd7f17a15..a37a16f82 100644 --- a/rules/xorg-driver-input-tslib.make +++ b/rules/xorg-driver-input-tslib.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-input-tslib.get: $(xorg-driver-input-tslib_get_deps_defa $(XORG_DRIVER_INPUT_TSLIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_INPUT_TSLIB_URL)) + @$(call get, XORG_DRIVER_INPUT_TSLIB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-input-tslib_extract: $(STATEDIR)/xorg-driver-input-tslib.extract $(STATEDIR)/xorg-driver-input-tslib.extract: $(xorg-driver-input-tslib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_INPUT_TSLIB_DIR)) - @$(call extract, $(XORG_DRIVER_INPUT_TSLIB_SOURCE)) + @$(call extract, XORG_DRIVER_INPUT_TSLIB) @$(call patchin, $(XORG_DRIVER_INPUT_TSLIB)) @$(call touch, $@) diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make index 6de14eb85..143ac878d 100644 --- a/rules/xorg-driver-input-void.make +++ b/rules/xorg-driver-input-void.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-input-void.get: $(xorg-driver-input-void_get_deps_defaul $(XORG_DRIVER_INPUT_VOID_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_INPUT_VOID_URL)) + @$(call get, XORG_DRIVER_INPUT_VOID) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-input-void_extract: $(STATEDIR)/xorg-driver-input-void.extract $(STATEDIR)/xorg-driver-input-void.extract: $(xorg-driver-input-void_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_INPUT_VOID_DIR)) - @$(call extract, $(XORG_DRIVER_INPUT_VOID_SOURCE)) + @$(call extract, XORG_DRIVER_INPUT_VOID) @$(call patchin, $(XORG_DRIVER_INPUT_VOID)) @$(call touch, $@) diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make index e9ec6cb41..4285f2758 100644 --- a/rules/xorg-driver-video-apm.make +++ b/rules/xorg-driver-video-apm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-video-apm.get: $(xorg-driver-video-apm_get_deps_default) $(XORG_DRIVER_VIDEO_APM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_VIDEO_APM_URL)) + @$(call get, XORG_DRIVER_VIDEO_APM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-video-apm_extract: $(STATEDIR)/xorg-driver-video-apm.extract $(STATEDIR)/xorg-driver-video-apm.extract: $(xorg-driver-video-apm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_VIDEO_APM_DIR)) - @$(call extract, $(XORG_DRIVER_VIDEO_APM_SOURCE)) + @$(call extract, XORG_DRIVER_VIDEO_APM) @$(call patchin, $(XORG_DRIVER_VIDEO_APM)) @$(call touch, $@) diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make index 922e847e7..332ef2042 100644 --- a/rules/xorg-driver-video-ati.make +++ b/rules/xorg-driver-video-ati.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-video-ati.get: $(xorg-driver-video-ati_get_deps_default) $(XORG_DRIVER_VIDEO_ATI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_VIDEO_ATI_URL)) + @$(call get, XORG_DRIVER_VIDEO_ATI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-video-ati_extract: $(STATEDIR)/xorg-driver-video-ati.extract $(STATEDIR)/xorg-driver-video-ati.extract: $(xorg-driver-video-ati_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_VIDEO_ATI_DIR)) - @$(call extract, $(XORG_DRIVER_VIDEO_ATI_SOURCE)) + @$(call extract, XORG_DRIVER_VIDEO_ATI) @$(call patchin, $(XORG_DRIVER_VIDEO_ATI)) @$(call touch, $@) diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make index 01dcff3d9..57217c8b9 100644 --- a/rules/xorg-driver-video-dummy.make +++ b/rules/xorg-driver-video-dummy.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-video-dummy.get: $(xorg-driver-video-dummy_get_deps_defa $(XORG_DRIVER_VIDEO_DUMMY_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_VIDEO_DUMMY_URL)) + @$(call get, XORG_DRIVER_VIDEO_DUMMY) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-video-dummy_extract: $(STATEDIR)/xorg-driver-video-dummy.extract $(STATEDIR)/xorg-driver-video-dummy.extract: $(xorg-driver-video-dummy_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_VIDEO_DUMMY_DIR)) - @$(call extract, $(XORG_DRIVER_VIDEO_DUMMY_SOURCE)) + @$(call extract, XORG_DRIVER_VIDEO_DUMMY) @$(call patchin, $(XORG_DRIVER_VIDEO_DUMMY)) @$(call touch, $@) diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make index 57cbf0321..64a4b6711 100644 --- a/rules/xorg-driver-video-fbdev.make +++ b/rules/xorg-driver-video-fbdev.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-driver-video-fbdev.get: $(xorg-driver-video-fbdev_get_deps_defa $(XORG_DRIVER_VIDEO_FBDEV_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_DRIVER_VIDEO_FBDEV_URL)) + @$(call get, XORG_DRIVER_VIDEO_FBDEV) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-driver-video-fbdev_extract: $(STATEDIR)/xorg-driver-video-fbdev.extract $(STATEDIR)/xorg-driver-video-fbdev.extract: $(xorg-driver-video-fbdev_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_DRIVER_VIDEO_FBDEV_DIR)) - @$(call extract, $(XORG_DRIVER_VIDEO_FBDEV_SOURCE)) + @$(call extract, XORG_DRIVER_VIDEO_FBDEV) @$(call patchin, $(XORG_DRIVER_VIDEO_FBDEV)) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make index f96c877e7..2862c9686 100644 --- a/rules/xorg-font-adobe-100dpi.make +++ b/rules/xorg-font-adobe-100dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-adobe-100dpi.get: $(xorg-font-adobe-100dpi_get_deps_defaul $(XORG_FONT_ADOBE_100DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ADOBE_100DPI_URL)) + @$(call get, XORG_FONT_ADOBE_100DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-adobe-100dpi_extract: $(STATEDIR)/xorg-font-adobe-100dpi.extract $(STATEDIR)/xorg-font-adobe-100dpi.extract: $(xorg-font-adobe-100dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ADOBE_100DPI_DIR)) - @$(call extract, $(XORG_FONT_ADOBE_100DPI_SOURCE)) + @$(call extract, XORG_FONT_ADOBE_100DPI) @$(call patchin, $(XORG_FONT_ADOBE_100DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make index 0f993246e..55d08afd6 100644 --- a/rules/xorg-font-adobe-75dpi.make +++ b/rules/xorg-font-adobe-75dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-adobe-75dpi.get: $(xorg-font-adobe-75dpi_get_deps_default) $(XORG_FONT_ADOBE_75DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ADOBE_75DPI_URL)) + @$(call get, XORG_FONT_ADOBE_75DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-adobe-75dpi_extract: $(STATEDIR)/xorg-font-adobe-75dpi.extract $(STATEDIR)/xorg-font-adobe-75dpi.extract: $(xorg-font-adobe-75dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ADOBE_75DPI_DIR)) - @$(call extract, $(XORG_FONT_ADOBE_75DPI_SOURCE)) + @$(call extract, XORG_FONT_ADOBE_75DPI) @$(call patchin, $(XORG_FONT_ADOBE_75DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make index d9cd35c37..ea224f252 100644 --- a/rules/xorg-font-adobe-utopia-100dpi.make +++ b/rules/xorg-font-adobe-utopia-100dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-100dpi.get: $(xorg-font-adobe-utopia-100dpi_g $(XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ADOBE_UTOPIA_100DPI_URL)) + @$(call get, XORG_FONT_ADOBE_UTOPIA_100DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-adobe-utopia-100dpi_extract: $(STATEDIR)/xorg-font-adobe-utopia-100dpi $(STATEDIR)/xorg-font-adobe-utopia-100dpi.extract: $(xorg-font-adobe-utopia-100dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR)) - @$(call extract, $(XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE)) + @$(call extract, XORG_FONT_ADOBE_UTOPIA_100DPI) @$(call patchin, $(XORG_FONT_ADOBE_UTOPIA_100DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make index 3bf3abc53..84f7b7a9b 100644 --- a/rules/xorg-font-adobe-utopia-75dpi.make +++ b/rules/xorg-font-adobe-utopia-75dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-75dpi.get: $(xorg-font-adobe-utopia-75dpi_get $(XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ADOBE_UTOPIA_75DPI_URL)) + @$(call get, XORG_FONT_ADOBE_UTOPIA_75DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-adobe-utopia-75dpi_extract: $(STATEDIR)/xorg-font-adobe-utopia-75dpi.e $(STATEDIR)/xorg-font-adobe-utopia-75dpi.extract: $(xorg-font-adobe-utopia-75dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR)) - @$(call extract, $(XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE)) + @$(call extract, XORG_FONT_ADOBE_UTOPIA_75DPI) @$(call patchin, $(XORG_FONT_ADOBE_UTOPIA_75DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make index e46660db2..eb6812113 100644 --- a/rules/xorg-font-adobe-utopia-type1.make +++ b/rules/xorg-font-adobe-utopia-type1.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-adobe-utopia-type1.get: $(xorg-font-adobe-utopia-type1_get $(XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ADOBE_UTOPIA_TYPE1_URL)) + @$(call get, XORG_FONT_ADOBE_UTOPIA_TYPE1) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-adobe-utopia-type1_extract: $(STATEDIR)/xorg-font-adobe-utopia-type1.e $(STATEDIR)/xorg-font-adobe-utopia-type1.extract: $(xorg-font-adobe-utopia-type1_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR)) - @$(call extract, $(XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE)) + @$(call extract, XORG_FONT_ADOBE_UTOPIA_TYPE1) @$(call patchin, $(XORG_FONT_ADOBE_UTOPIA_TYPE1)) @$(call touch, $@) diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make index f439be806..44fa2d5cc 100644 --- a/rules/xorg-font-alias.make +++ b/rules/xorg-font-alias.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-alias.get: $(xorg-font-alias_get_deps_default) $(XORG_FONT_ALIAS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ALIAS_URL)) + @$(call get, XORG_FONT_ALIAS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-alias_extract: $(STATEDIR)/xorg-font-alias.extract $(STATEDIR)/xorg-font-alias.extract: $(xorg-font-alias_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ALIAS_DIR)) - @$(call extract, $(XORG_FONT_ALIAS_SOURCE)) + @$(call extract, XORG_FONT_ALIAS) @$(call patchin, $(XORG_FONT_ALIAS)) @$(call touch, $@) diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make index 375d24f59..9c3a84994 100644 --- a/rules/xorg-font-arabic-misc.make +++ b/rules/xorg-font-arabic-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-arabic-misc.get: $(xorg-font-arabic-misc_get_deps_default) $(XORG_FONT_ARABIC_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ARABIC_MISC_URL)) + @$(call get, XORG_FONT_ARABIC_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-arabic-misc_extract: $(STATEDIR)/xorg-font-arabic-misc.extract $(STATEDIR)/xorg-font-arabic-misc.extract: $(xorg-font-arabic-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ARABIC_MISC_DIR)) - @$(call extract, $(XORG_FONT_ARABIC_MISC_SOURCE)) + @$(call extract, XORG_FONT_ARABIC_MISC) @$(call patchin, $(XORG_FONT_ARABIC_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make index 9c766149f..cfd781754 100644 --- a/rules/xorg-font-bh-100dpi.make +++ b/rules/xorg-font-bh-100dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bh-100dpi.get: $(xorg-font-bh-100dpi_get_deps_default) $(XORG_FONT_BH_100DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BH_100DPI_URL)) + @$(call get, XORG_FONT_BH_100DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bh-100dpi_extract: $(STATEDIR)/xorg-font-bh-100dpi.extract $(STATEDIR)/xorg-font-bh-100dpi.extract: $(xorg-font-bh-100dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BH_100DPI_DIR)) - @$(call extract, $(XORG_FONT_BH_100DPI_SOURCE)) + @$(call extract, XORG_FONT_BH_100DPI) @$(call patchin, $(XORG_FONT_BH_100DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make index b91762d84..cc790d348 100644 --- a/rules/xorg-font-bh-75dpi.make +++ b/rules/xorg-font-bh-75dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bh-75dpi.get: $(xorg-font-bh-75dpi_get_deps_default) $(XORG_FONT_BH_75DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BH_75DPI_URL)) + @$(call get, XORG_FONT_BH_75DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bh-75dpi_extract: $(STATEDIR)/xorg-font-bh-75dpi.extract $(STATEDIR)/xorg-font-bh-75dpi.extract: $(xorg-font-bh-75dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BH_75DPI_DIR)) - @$(call extract, $(XORG_FONT_BH_75DPI_SOURCE)) + @$(call extract, XORG_FONT_BH_75DPI) @$(call patchin, $(XORG_FONT_BH_75DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make index 6a6b1576c..31baec801 100644 --- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.get: $(xorg-font-bh-lucidatypew $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL)) + @$(call get, XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bh-lucidatypewriter-100dpi_extract: $(STATEDIR)/xorg-font-bh-lucidatyp $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.extract: $(xorg-font-bh-lucidatypewriter-100dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR)) - @$(call extract, $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE)) + @$(call extract, XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) @$(call patchin, $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make index f3a929a69..3dc659339 100644 --- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make +++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.get: $(xorg-font-bh-lucidatypewr $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL)) + @$(call get, XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bh-lucidatypewriter-75dpi_extract: $(STATEDIR)/xorg-font-bh-lucidatype $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.extract: $(xorg-font-bh-lucidatypewriter-75dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR)) - @$(call extract, $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE)) + @$(call extract, XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) @$(call patchin, $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make index 62e06be23..6e37cc72d 100644 --- a/rules/xorg-font-bh-ttf.make +++ b/rules/xorg-font-bh-ttf.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bh-ttf.get: $(xorg-font-bh-ttf_get_deps_default) $(XORG_FONT_BH_TTF_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BH_TTF_URL)) + @$(call get, XORG_FONT_BH_TTF) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bh-ttf_extract: $(STATEDIR)/xorg-font-bh-ttf.extract $(STATEDIR)/xorg-font-bh-ttf.extract: $(xorg-font-bh-ttf_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BH_TTF_DIR)) - @$(call extract, $(XORG_FONT_BH_TTF_SOURCE)) + @$(call extract, XORG_FONT_BH_TTF) @$(call patchin, $(XORG_FONT_BH_TTF)) @$(call touch, $@) diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make index 6d3b453a0..56473dee9 100644 --- a/rules/xorg-font-bitstream-100dpi.make +++ b/rules/xorg-font-bitstream-100dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bitstream-100dpi.get: $(xorg-font-bitstream-100dpi_get_dep $(XORG_FONT_BITSTREAM_100DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BITSTREAM_100DPI_URL)) + @$(call get, XORG_FONT_BITSTREAM_100DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bitstream-100dpi_extract: $(STATEDIR)/xorg-font-bitstream-100dpi.extra $(STATEDIR)/xorg-font-bitstream-100dpi.extract: $(xorg-font-bitstream-100dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BITSTREAM_100DPI_DIR)) - @$(call extract, $(XORG_FONT_BITSTREAM_100DPI_SOURCE)) + @$(call extract, XORG_FONT_BITSTREAM_100DPI) @$(call patchin, $(XORG_FONT_BITSTREAM_100DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make index 57295d899..b4750a800 100644 --- a/rules/xorg-font-bitstream-75dpi.make +++ b/rules/xorg-font-bitstream-75dpi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bitstream-75dpi.get: $(xorg-font-bitstream-75dpi_get_deps_ $(XORG_FONT_BITSTREAM_75DPI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BITSTREAM_75DPI_URL)) + @$(call get, XORG_FONT_BITSTREAM_75DPI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bitstream-75dpi_extract: $(STATEDIR)/xorg-font-bitstream-75dpi.extract $(STATEDIR)/xorg-font-bitstream-75dpi.extract: $(xorg-font-bitstream-75dpi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BITSTREAM_75DPI_DIR)) - @$(call extract, $(XORG_FONT_BITSTREAM_75DPI_SOURCE)) + @$(call extract, XORG_FONT_BITSTREAM_75DPI) @$(call patchin, $(XORG_FONT_BITSTREAM_75DPI)) @$(call touch, $@) diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make index 0184b347d..0608f7626 100644 --- a/rules/xorg-font-bitstream-speedo.make +++ b/rules/xorg-font-bitstream-speedo.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bitstream-speedo.get: $(xorg-font-bitstream-speedo_get_dep $(XORG_FONT_BITSTREAM_SPEEDO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BITSTREAM_SPEEDO_URL)) + @$(call get, XORG_FONT_BITSTREAM_SPEEDO) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bitstream-speedo_extract: $(STATEDIR)/xorg-font-bitstream-speedo.extra $(STATEDIR)/xorg-font-bitstream-speedo.extract: $(xorg-font-bitstream-speedo_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BITSTREAM_SPEEDO_DIR)) - @$(call extract, $(XORG_FONT_BITSTREAM_SPEEDO_SOURCE)) + @$(call extract, XORG_FONT_BITSTREAM_SPEEDO) @$(call patchin, $(XORG_FONT_BITSTREAM_SPEEDO)) @$(call touch, $@) diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make index 9a726cccb..3ece48ae3 100644 --- a/rules/xorg-font-bitstream-type1.make +++ b/rules/xorg-font-bitstream-type1.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-bitstream-type1.get: $(xorg-font-bitstream-type1_get_deps_ $(XORG_FONT_BITSTREAM_TYPE1_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_BITSTREAM_TYPE1_URL)) + @$(call get, XORG_FONT_BITSTREAM_TYPE1) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-bitstream-type1_extract: $(STATEDIR)/xorg-font-bitstream-type1.extract $(STATEDIR)/xorg-font-bitstream-type1.extract: $(xorg-font-bitstream-type1_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_BITSTREAM_TYPE1_DIR)) - @$(call extract, $(XORG_FONT_BITSTREAM_TYPE1_SOURCE)) + @$(call extract, XORG_FONT_BITSTREAM_TYPE1) @$(call patchin, $(XORG_FONT_BITSTREAM_TYPE1)) @$(call touch, $@) diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make index c5c876ac2..afb520acc 100644 --- a/rules/xorg-font-cronyx-cyrillic.make +++ b/rules/xorg-font-cronyx-cyrillic.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-cronyx-cyrillic.get: $(xorg-font-cronyx-cyrillic_get_deps_ $(XORG_FONT_CRONYX_CYRILLIC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_CRONYX_CYRILLIC_URL)) + @$(call get, XORG_FONT_CRONYX_CYRILLIC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-cronyx-cyrillic_extract: $(STATEDIR)/xorg-font-cronyx-cyrillic.extract $(STATEDIR)/xorg-font-cronyx-cyrillic.extract: $(xorg-font-cronyx-cyrillic_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_CRONYX_CYRILLIC_DIR)) - @$(call extract, $(XORG_FONT_CRONYX_CYRILLIC_SOURCE)) + @$(call extract, XORG_FONT_CRONYX_CYRILLIC) @$(call patchin, $(XORG_FONT_CRONYX_CYRILLIC)) @$(call touch, $@) diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make index adbb38d9c..df8c04e35 100644 --- a/rules/xorg-font-cursor-misc.make +++ b/rules/xorg-font-cursor-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-cursor-misc.get: $(xorg-font-cursor-misc_get_deps_default) $(XORG_FONT_CURSOR_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_CURSOR_MISC_URL)) + @$(call get, XORG_FONT_CURSOR_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-cursor-misc_extract: $(STATEDIR)/xorg-font-cursor-misc.extract $(STATEDIR)/xorg-font-cursor-misc.extract: $(xorg-font-cursor-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_CURSOR_MISC_DIR)) - @$(call extract, $(XORG_FONT_CURSOR_MISC_SOURCE)) + @$(call extract, XORG_FONT_CURSOR_MISC) @$(call patchin, $(XORG_FONT_CURSOR_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make index b1e72d60e..730ec775b 100644 --- a/rules/xorg-font-daewoo-misc.make +++ b/rules/xorg-font-daewoo-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-daewoo-misc.get: $(xorg-font-daewoo-misc_get_deps_default) $(XORG_FONT_DAEWOO_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_DAEWOO_MISC_URL)) + @$(call get, XORG_FONT_DAEWOO_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-daewoo-misc_extract: $(STATEDIR)/xorg-font-daewoo-misc.extract $(STATEDIR)/xorg-font-daewoo-misc.extract: $(xorg-font-daewoo-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_DAEWOO_MISC_DIR)) - @$(call extract, $(XORG_FONT_DAEWOO_MISC_SOURCE)) + @$(call extract, XORG_FONT_DAEWOO_MISC) @$(call patchin, $(XORG_FONT_DAEWOO_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make index 917d39d05..a5df6d21a 100644 --- a/rules/xorg-font-dec-misc.make +++ b/rules/xorg-font-dec-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-dec-misc.get: $(xorg-font-dec-misc_get_deps_default) $(XORG_FONT_DEC_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_DEC_MISC_URL)) + @$(call get, XORG_FONT_DEC_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-dec-misc_extract: $(STATEDIR)/xorg-font-dec-misc.extract $(STATEDIR)/xorg-font-dec-misc.extract: $(xorg-font-dec-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_DEC_MISC_DIR)) - @$(call extract, $(XORG_FONT_DEC_MISC_SOURCE)) + @$(call extract, XORG_FONT_DEC_MISC) @$(call patchin, $(XORG_FONT_DEC_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make index 5a78604c0..e4414c3b3 100644 --- a/rules/xorg-font-encodings.make +++ b/rules/xorg-font-encodings.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-encodings.get: $(xorg-font-encodings_get_deps_default) $(XORG_FONT_ENCODINGS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ENCODINGS_URL)) + @$(call get, XORG_FONT_ENCODINGS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-encodings_extract: $(STATEDIR)/xorg-font-encodings.extract $(STATEDIR)/xorg-font-encodings.extract: $(xorg-font-encodings_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ENCODINGS_DIR)) - @$(call extract, $(XORG_FONT_ENCODINGS_SOURCE)) + @$(call extract, XORG_FONT_ENCODINGS) @$(call patchin, $(XORG_FONT_ENCODINGS)) @$(call touch, $@) diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make index 0dde702e4..c5bfb8534 100644 --- a/rules/xorg-font-ibm-type1.make +++ b/rules/xorg-font-ibm-type1.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-ibm-type1.get: $(xorg-font-ibm-type1_get_deps_default) $(XORG_FONT_IBM_TYPE1_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_IBM_TYPE1_URL)) + @$(call get, XORG_FONT_IBM_TYPE1) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-ibm-type1_extract: $(STATEDIR)/xorg-font-ibm-type1.extract $(STATEDIR)/xorg-font-ibm-type1.extract: $(xorg-font-ibm-type1_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_IBM_TYPE1_DIR)) - @$(call extract, $(XORG_FONT_IBM_TYPE1_SOURCE)) + @$(call extract, XORG_FONT_IBM_TYPE1) @$(call patchin, $(XORG_FONT_IBM_TYPE1)) @$(call touch, $@) diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make index 99a7b4b61..b80dca328 100644 --- a/rules/xorg-font-isas-misc.make +++ b/rules/xorg-font-isas-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-isas-misc.get: $(xorg-font-isas-misc_get_deps_default) $(XORG_FONT_ISAS_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_ISAS_MISC_URL)) + @$(call get, XORG_FONT_ISAS_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-isas-misc_extract: $(STATEDIR)/xorg-font-isas-misc.extract $(STATEDIR)/xorg-font-isas-misc.extract: $(xorg-font-isas-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_ISAS_MISC_DIR)) - @$(call extract, $(XORG_FONT_ISAS_MISC_SOURCE)) + @$(call extract, XORG_FONT_ISAS_MISC) @$(call patchin, $(XORG_FONT_ISAS_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make index d996e3dcf..dd7270753 100644 --- a/rules/xorg-font-jis-misc.make +++ b/rules/xorg-font-jis-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-jis-misc.get: $(xorg-font-jis-misc_get_deps_default) $(XORG_FONT_JIS_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_JIS_MISC_URL)) + @$(call get, XORG_FONT_JIS_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-jis-misc_extract: $(STATEDIR)/xorg-font-jis-misc.extract $(STATEDIR)/xorg-font-jis-misc.extract: $(xorg-font-jis-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_JIS_MISC_DIR)) - @$(call extract, $(XORG_FONT_JIS_MISC_SOURCE)) + @$(call extract, XORG_FONT_JIS_MISC) @$(call patchin, $(XORG_FONT_JIS_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make index 6068cb725..8ae8dddac 100644 --- a/rules/xorg-font-micro-misc.make +++ b/rules/xorg-font-micro-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-micro-misc.get: $(xorg-font-micro-misc_get_deps_default) $(XORG_FONT_MICRO_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MICRO_MISC_URL)) + @$(call get, XORG_FONT_MICRO_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-micro-misc_extract: $(STATEDIR)/xorg-font-micro-misc.extract $(STATEDIR)/xorg-font-micro-misc.extract: $(xorg-font-micro-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MICRO_MISC_DIR)) - @$(call extract, $(XORG_FONT_MICRO_MISC_SOURCE)) + @$(call extract, XORG_FONT_MICRO_MISC) @$(call patchin, $(XORG_FONT_MICRO_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make index 0d7499ec2..c7cb9311b 100644 --- a/rules/xorg-font-misc-cyrillic.make +++ b/rules/xorg-font-misc-cyrillic.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-misc-cyrillic.get: $(xorg-font-misc-cyrillic_get_deps_defa $(XORG_FONT_MISC_CYRILLIC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MISC_CYRILLIC_URL)) + @$(call get, XORG_FONT_MISC_CYRILLIC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-misc-cyrillic_extract: $(STATEDIR)/xorg-font-misc-cyrillic.extract $(STATEDIR)/xorg-font-misc-cyrillic.extract: $(xorg-font-misc-cyrillic_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MISC_CYRILLIC_DIR)) - @$(call extract, $(XORG_FONT_MISC_CYRILLIC_SOURCE)) + @$(call extract, XORG_FONT_MISC_CYRILLIC) @$(call patchin, $(XORG_FONT_MISC_CYRILLIC)) @$(call touch, $@) diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make index c07adf4aa..fbaf3328e 100644 --- a/rules/xorg-font-misc-ethiopic.make +++ b/rules/xorg-font-misc-ethiopic.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-misc-ethiopic.get: $(xorg-font-misc-ethiopic_get_deps_defa $(XORG_FONT_MISC_ETHIOPIC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MISC_ETHIOPIC_URL)) + @$(call get, XORG_FONT_MISC_ETHIOPIC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-misc-ethiopic_extract: $(STATEDIR)/xorg-font-misc-ethiopic.extract $(STATEDIR)/xorg-font-misc-ethiopic.extract: $(xorg-font-misc-ethiopic_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MISC_ETHIOPIC_DIR)) - @$(call extract, $(XORG_FONT_MISC_ETHIOPIC_SOURCE)) + @$(call extract, XORG_FONT_MISC_ETHIOPIC) @$(call patchin, $(XORG_FONT_MISC_ETHIOPIC)) @$(call touch, $@) diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make index cae8de1e3..a7eb5ef4c 100644 --- a/rules/xorg-font-misc-meltho.make +++ b/rules/xorg-font-misc-meltho.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-misc-meltho.get: $(xorg-font-misc-meltho_get_deps_default) $(XORG_FONT_MISC_MELTHO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MISC_MELTHO_URL)) + @$(call get, XORG_FONT_MISC_MELTHO) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-misc-meltho_extract: $(STATEDIR)/xorg-font-misc-meltho.extract $(STATEDIR)/xorg-font-misc-meltho.extract: $(xorg-font-misc-meltho_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MISC_MELTHO_DIR)) - @$(call extract, $(XORG_FONT_MISC_MELTHO_SOURCE)) + @$(call extract, XORG_FONT_MISC_MELTHO) @$(call patchin, $(XORG_FONT_MISC_MELTHO)) @$(call touch, $@) diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make index 657b59f1e..b9975670a 100644 --- a/rules/xorg-font-misc-misc.make +++ b/rules/xorg-font-misc-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-misc-misc.get: $(xorg-font-misc-misc_get_deps_default) $(XORG_FONT_MISC_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MISC_MISC_URL)) + @$(call get, XORG_FONT_MISC_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-misc-misc_extract: $(STATEDIR)/xorg-font-misc-misc.extract $(STATEDIR)/xorg-font-misc-misc.extract: $(xorg-font-misc-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MISC_MISC_DIR)) - @$(call extract, $(XORG_FONT_MISC_MISC_SOURCE)) + @$(call extract, XORG_FONT_MISC_MISC) @$(call patchin, $(XORG_FONT_MISC_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make index 68434ebdd..e06e6ba51 100644 --- a/rules/xorg-font-mutt-misc.make +++ b/rules/xorg-font-mutt-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-mutt-misc.get: $(xorg-font-mutt-misc_get_deps_default) $(XORG_FONT_MUTT_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_MUTT_MISC_URL)) + @$(call get, XORG_FONT_MUTT_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-mutt-misc_extract: $(STATEDIR)/xorg-font-mutt-misc.extract $(STATEDIR)/xorg-font-mutt-misc.extract: $(xorg-font-mutt-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_MUTT_MISC_DIR)) - @$(call extract, $(XORG_FONT_MUTT_MISC_SOURCE)) + @$(call extract, XORG_FONT_MUTT_MISC) @$(call patchin, $(XORG_FONT_MUTT_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make index 430be8c65..36271c755 100644 --- a/rules/xorg-font-schumacher-misc.make +++ b/rules/xorg-font-schumacher-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-schumacher-misc.get: $(xorg-font-schumacher-misc_get_deps_ $(XORG_FONT_SCHUMACHER_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_SCHUMACHER_MISC_URL)) + @$(call get, XORG_FONT_SCHUMACHER_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-schumacher-misc_extract: $(STATEDIR)/xorg-font-schumacher-misc.extract $(STATEDIR)/xorg-font-schumacher-misc.extract: $(xorg-font-schumacher-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_SCHUMACHER_MISC_DIR)) - @$(call extract, $(XORG_FONT_SCHUMACHER_MISC_SOURCE)) + @$(call extract, XORG_FONT_SCHUMACHER_MISC) @$(call patchin, $(XORG_FONT_SCHUMACHER_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make index c11cdc840..c1fc4ef63 100644 --- a/rules/xorg-font-screen-cyrillic.make +++ b/rules/xorg-font-screen-cyrillic.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-screen-cyrillic.get: $(xorg-font-screen-cyrillic_get_deps_ $(XORG_FONT_SCREEN_CYRILLIC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_SCREEN_CYRILLIC_URL)) + @$(call get, XORG_FONT_SCREEN_CYRILLIC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-screen-cyrillic_extract: $(STATEDIR)/xorg-font-screen-cyrillic.extract $(STATEDIR)/xorg-font-screen-cyrillic.extract: $(xorg-font-screen-cyrillic_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_SCREEN_CYRILLIC_DIR)) - @$(call extract, $(XORG_FONT_SCREEN_CYRILLIC_SOURCE)) + @$(call extract, XORG_FONT_SCREEN_CYRILLIC) @$(call patchin, $(XORG_FONT_SCREEN_CYRILLIC)) @$(call touch, $@) diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make index 6dd2effce..3328e9afb 100644 --- a/rules/xorg-font-sony-misc.make +++ b/rules/xorg-font-sony-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-sony-misc.get: $(xorg-font-sony-misc_get_deps_default) $(XORG_FONT_SONY_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_SONY_MISC_URL)) + @$(call get, XORG_FONT_SONY_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-sony-misc_extract: $(STATEDIR)/xorg-font-sony-misc.extract $(STATEDIR)/xorg-font-sony-misc.extract: $(xorg-font-sony-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_SONY_MISC_DIR)) - @$(call extract, $(XORG_FONT_SONY_MISC_SOURCE)) + @$(call extract, XORG_FONT_SONY_MISC) @$(call patchin, $(XORG_FONT_SONY_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make index 76a39b8db..fcc313230 100644 --- a/rules/xorg-font-sun-misc.make +++ b/rules/xorg-font-sun-misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-sun-misc.get: $(xorg-font-sun-misc_get_deps_default) $(XORG_FONT_SUN_MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_SUN_MISC_URL)) + @$(call get, XORG_FONT_SUN_MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-sun-misc_extract: $(STATEDIR)/xorg-font-sun-misc.extract $(STATEDIR)/xorg-font-sun-misc.extract: $(xorg-font-sun-misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_SUN_MISC_DIR)) - @$(call extract, $(XORG_FONT_SUN_MISC_SOURCE)) + @$(call extract, XORG_FONT_SUN_MISC) @$(call patchin, $(XORG_FONT_SUN_MISC)) @$(call touch, $@) diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make index c2cbbadf9..fe6176958 100644 --- a/rules/xorg-font-util.make +++ b/rules/xorg-font-util.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-util.get: $(xorg-font-util_get_deps_default) $(XORG_FONT_UTIL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_UTIL_URL)) + @$(call get, XORG_FONT_UTIL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-util_extract: $(STATEDIR)/xorg-font-util.extract $(STATEDIR)/xorg-font-util.extract: $(xorg-font-util_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_UTIL_DIR)) - @$(call extract, $(XORG_FONT_UTIL_SOURCE)) + @$(call extract, XORG_FONT_UTIL) @$(call patchin, $(XORG_FONT_UTIL)) @$(call touch, $@) diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make index b7637f4f3..cbcd6f628 100644 --- a/rules/xorg-font-winitzki-cyrillic.make +++ b/rules/xorg-font-winitzki-cyrillic.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-winitzki-cyrillic.get: $(xorg-font-winitzki-cyrillic_get_d $(XORG_FONT_WINITZKI_CYRILLIC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_WINITZKI_CYRILLIC_URL)) + @$(call get, XORG_FONT_WINITZKI_CYRILLIC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-winitzki-cyrillic_extract: $(STATEDIR)/xorg-font-winitzki-cyrillic.ext $(STATEDIR)/xorg-font-winitzki-cyrillic.extract: $(xorg-font-winitzki-cyrillic_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_WINITZKI_CYRILLIC_DIR)) - @$(call extract, $(XORG_FONT_WINITZKI_CYRILLIC_SOURCE)) + @$(call extract, XORG_FONT_WINITZKI_CYRILLIC) @$(call patchin, $(XORG_FONT_WINITZKI_CYRILLIC)) @$(call touch, $@) diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make index 98514f24b..d35bbb11c 100644 --- a/rules/xorg-font-xfree86-type1.make +++ b/rules/xorg-font-xfree86-type1.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-font-xfree86-type1.get: $(xorg-font-xfree86-type1_get_deps_defa $(XORG_FONT_XFREE86_TYPE1_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_FONT_XFREE86_TYPE1_URL)) + @$(call get, XORG_FONT_XFREE86_TYPE1) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-font-xfree86-type1_extract: $(STATEDIR)/xorg-font-xfree86-type1.extract $(STATEDIR)/xorg-font-xfree86-type1.extract: $(xorg-font-xfree86-type1_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_FONT_XFREE86_TYPE1_DIR)) - @$(call extract, $(XORG_FONT_XFREE86_TYPE1_SOURCE)) + @$(call extract, XORG_FONT_XFREE86_TYPE1) @$(call patchin, $(XORG_FONT_XFREE86_TYPE1)) @$(call touch, $@) diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make index f48eec12f..ab76b7db9 100644 --- a/rules/xorg-lib-AppleWM.make +++ b/rules/xorg-lib-AppleWM.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-AppleWM.get: $(xorg-lib-AppleWM_get_deps_default) $(XORG_LIB_APPLEWM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_APPLEWM_URL)) + @$(call get, XORG_LIB_APPLEWM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-AppleWM_extract: $(STATEDIR)/xorg-lib-AppleWM.extract $(STATEDIR)/xorg-lib-AppleWM.extract: $(xorg-lib-AppleWM_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_APPLEWM_DIR)) - @$(call extract, $(XORG_LIB_APPLEWM_SOURCE)) + @$(call extract, XORG_LIB_APPLEWM) @$(call patchin, $(XORG_LIB_APPLEWM)) @$(call touch, $@) diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make index 4d7b98a70..9ac222cd6 100644 --- a/rules/xorg-lib-FS.make +++ b/rules/xorg-lib-FS.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-FS.get: $(xorg-lib-FS_get_deps_default) $(XORG_LIB_FS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_FS_URL)) + @$(call get, XORG_LIB_FS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-FS_extract: $(STATEDIR)/xorg-lib-FS.extract $(STATEDIR)/xorg-lib-FS.extract: $(xorg-lib-FS_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_FS_DIR)) - @$(call extract, $(XORG_LIB_FS_SOURCE)) + @$(call extract, XORG_LIB_FS) @$(call patchin, $(XORG_LIB_FS)) @$(call touch, $@) diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make index 5c4c60920..df3a415fb 100644 --- a/rules/xorg-lib-ICE.make +++ b/rules/xorg-lib-ICE.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-ICE.get: $(xorg-lib-ICE_get_deps_default) $(XORG_LIB_ICE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_ICE_URL)) + @$(call get, XORG_LIB_ICE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-ICE_extract: $(STATEDIR)/xorg-lib-ICE.extract $(STATEDIR)/xorg-lib-ICE.extract: $(xorg-lib-ICE_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_ICE_DIR)) - @$(call extract, $(XORG_LIB_ICE_SOURCE)) + @$(call extract, XORG_LIB_ICE) @$(call patchin, $(XORG_LIB_ICE)) @$(call touch, $@) diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make index 3546a02e3..9c2ccb368 100644 --- a/rules/xorg-lib-SM.make +++ b/rules/xorg-lib-SM.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-SM.get: $(xorg-lib-SM_get_deps_default) $(XORG_LIB_SM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_SM_URL)) + @$(call get, XORG_LIB_SM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-SM_extract: $(STATEDIR)/xorg-lib-SM.extract $(STATEDIR)/xorg-lib-SM.extract: $(xorg-lib-SM_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_SM_DIR)) - @$(call extract, $(XORG_LIB_SM_SOURCE)) + @$(call extract, XORG_LIB_SM) @$(call patchin, $(XORG_LIB_SM)) @$(call touch, $@) diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make index 5e572e14f..5982b9170 100644 --- a/rules/xorg-lib-WindowsWM.make +++ b/rules/xorg-lib-WindowsWM.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-WindowsWM.get: $(xorg-lib-WindowsWM_get_deps_default) $(XORG_LIB_WINDOWSWM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_WINDOWSWM_URL)) + @$(call get, XORG_LIB_WINDOWSWM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-WindowsWM_extract: $(STATEDIR)/xorg-lib-WindowsWM.extract $(STATEDIR)/xorg-lib-WindowsWM.extract: $(xorg-lib-WindowsWM_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_WINDOWSWM_DIR)) - @$(call extract, $(XORG_LIB_WINDOWSWM_SOURCE)) + @$(call extract, XORG_LIB_WINDOWSWM) @$(call patchin, $(XORG_LIB_WINDOWSWM)) @$(call touch, $@) diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make index fc5e2420e..61736640c 100644 --- a/rules/xorg-lib-X11.make +++ b/rules/xorg-lib-X11.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-X11.get: $(xorg-lib-X11_get_deps_default) $(XORG_LIB_X11_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_X11_URL)) + @$(call get, XORG_LIB_X11) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-X11_extract: $(STATEDIR)/xorg-lib-X11.extract $(STATEDIR)/xorg-lib-X11.extract: $(xorg-lib-X11_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_X11_DIR)) - @$(call extract, $(XORG_LIB_X11_SOURCE)) + @$(call extract, XORG_LIB_X11) @$(call patchin, $(XORG_LIB_X11)) @$(call touch, $@) diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make index 1903ca3e4..ed85090c7 100644 --- a/rules/xorg-lib-XScrnSaver.make +++ b/rules/xorg-lib-XScrnSaver.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-XScrnSaver.get: $(xorg-lib-XScrnSaver_get_deps_default) $(XORG_LIB_XSCRNSAVER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XSCRNSAVER_URL)) + @$(call get, XORG_LIB_XSCRNSAVER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-XScrnSaver_extract: $(STATEDIR)/xorg-lib-XScrnSaver.extract $(STATEDIR)/xorg-lib-XScrnSaver.extract: $(xorg-lib-XScrnSaver_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XSCRNSAVER_DIR)) - @$(call extract, $(XORG_LIB_XSCRNSAVER_SOURCE)) + @$(call extract, XORG_LIB_XSCRNSAVER) @$(call patchin, $(XORG_LIB_XSCRNSAVER)) @$(call touch, $@) diff --git a/rules/xorg-lib-XTrap.make b/rules/xorg-lib-XTrap.make index 2811c97b5..6266add4b 100644 --- a/rules/xorg-lib-XTrap.make +++ b/rules/xorg-lib-XTrap.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-XTrap.get: $(xorg-lib-XTrap_get_deps_default) $(XORG_LIB_XTRAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XTRAP_URL)) + @$(call get, XORG_LIB_XTRAP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-XTrap_extract: $(STATEDIR)/xorg-lib-XTrap.extract $(STATEDIR)/xorg-lib-XTrap.extract: $(xorg-lib-XTrap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XTRAP_DIR)) - @$(call extract, $(XORG_LIB_XTRAP_SOURCE)) + @$(call extract, XORG_LIB_XTRAP) @$(call patchin, $(XORG_LIB_XTRAP)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make index 9e4bfddd0..f90af509f 100644 --- a/rules/xorg-lib-Xau.make +++ b/rules/xorg-lib-Xau.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xau.get: $(xorg-lib-Xau_get_deps_default) $(XORG_LIB_XAU_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XAU_URL)) + @$(call get, XORG_LIB_XAU) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xau_extract: $(STATEDIR)/xorg-lib-Xau.extract $(STATEDIR)/xorg-lib-Xau.extract: $(xorg-lib-Xau_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XAU_DIR)) - @$(call extract, $(XORG_LIB_XAU_SOURCE)) + @$(call extract, XORG_LIB_XAU) @$(call patchin, $(XORG_LIB_XAU)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make index b5b26183a..a6a53940b 100644 --- a/rules/xorg-lib-Xaw.make +++ b/rules/xorg-lib-Xaw.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xaw.get: $(xorg-lib-Xaw_get_deps_default) $(XORG_LIB_XAW_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XAW_URL)) + @$(call get, XORG_LIB_XAW) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xaw_extract: $(STATEDIR)/xorg-lib-Xaw.extract $(STATEDIR)/xorg-lib-Xaw.extract: $(xorg-lib-Xaw_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XAW_DIR)) - @$(call extract, $(XORG_LIB_XAW_SOURCE)) + @$(call extract, XORG_LIB_XAW) @$(call patchin, $(XORG_LIB_XAW)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make index ff8725571..d5959ac51 100644 --- a/rules/xorg-lib-Xcomposite.make +++ b/rules/xorg-lib-Xcomposite.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xcomposite.get: $(xorg-lib-Xcomposite_get_deps_default) $(XORG_LIB_XCOMPOSITE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XCOMPOSITE_URL)) + @$(call get, XORG_LIB_XCOMPOSITE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xcomposite_extract: $(STATEDIR)/xorg-lib-Xcomposite.extract $(STATEDIR)/xorg-lib-Xcomposite.extract: $(xorg-lib-Xcomposite_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XCOMPOSITE_DIR)) - @$(call extract, $(XORG_LIB_XCOMPOSITE_SOURCE)) + @$(call extract, XORG_LIB_XCOMPOSITE) @$(call patchin, $(XORG_LIB_XCOMPOSITE)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make index 911a87436..09538c700 100644 --- a/rules/xorg-lib-Xcursor.make +++ b/rules/xorg-lib-Xcursor.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xcursor.get: $(xorg-lib-Xcursor_get_deps_default) $(XORG_LIB_XCURSOR_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XCURSOR_URL)) + @$(call get, XORG_LIB_XCURSOR) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xcursor_extract: $(STATEDIR)/xorg-lib-Xcursor.extract $(STATEDIR)/xorg-lib-Xcursor.extract: $(xorg-lib-Xcursor_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XCURSOR_DIR)) - @$(call extract, $(XORG_LIB_XCURSOR_SOURCE)) + @$(call extract, XORG_LIB_XCURSOR) @$(call patchin, $(XORG_LIB_XCURSOR)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make index 5f27dc8d1..92555a9c9 100644 --- a/rules/xorg-lib-Xdamage.make +++ b/rules/xorg-lib-Xdamage.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xdamage.get: $(xorg-lib-Xdamage_get_deps_default) $(XORG_LIB_XDAMAGE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XDAMAGE_URL)) + @$(call get, XORG_LIB_XDAMAGE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xdamage_extract: $(STATEDIR)/xorg-lib-Xdamage.extract $(STATEDIR)/xorg-lib-Xdamage.extract: $(xorg-lib-Xdamage_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XDAMAGE_DIR)) - @$(call extract, $(XORG_LIB_XDAMAGE_SOURCE)) + @$(call extract, XORG_LIB_XDAMAGE) @$(call patchin, $(XORG_LIB_XDAMAGE)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make index 82bfc22ad..ce7a9253d 100644 --- a/rules/xorg-lib-Xdmcp.make +++ b/rules/xorg-lib-Xdmcp.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xdmcp.get: $(xorg-lib-Xdmcp_get_deps_default) $(XORG_LIB_XDMCP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XDMCP_URL)) + @$(call get, XORG_LIB_XDMCP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xdmcp_extract: $(STATEDIR)/xorg-lib-Xdmcp.extract $(STATEDIR)/xorg-lib-Xdmcp.extract: $(xorg-lib-Xdmcp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XDMCP_DIR)) - @$(call extract, $(XORG_LIB_XDMCP_SOURCE)) + @$(call extract, XORG_LIB_XDMCP) @$(call patchin, $(XORG_LIB_XDMCP)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make index 3fa4dcc87..a0060f735 100644 --- a/rules/xorg-lib-Xevie.make +++ b/rules/xorg-lib-Xevie.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xevie.get: $(xorg-lib-Xevie_get_deps_default) $(XORG_LIB_XEVIE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XEVIE_URL)) + @$(call get, XORG_LIB_XEVIE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xevie_extract: $(STATEDIR)/xorg-lib-Xevie.extract $(STATEDIR)/xorg-lib-Xevie.extract: $(xorg-lib-Xevie_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XEVIE_DIR)) - @$(call extract, $(XORG_LIB_XEVIE_SOURCE)) + @$(call extract, XORG_LIB_XEVIE) @$(call patchin, $(XORG_LIB_XEVIE)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make index afd388e42..1bf5f4532 100644 --- a/rules/xorg-lib-Xext.make +++ b/rules/xorg-lib-Xext.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xext.get: $(xorg-lib-Xext_get_deps_default) $(XORG_LIB_XEXT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XEXT_URL)) + @$(call get, XORG_LIB_XEXT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xext_extract: $(STATEDIR)/xorg-lib-Xext.extract $(STATEDIR)/xorg-lib-Xext.extract: $(xorg-lib-Xext_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XEXT_DIR)) - @$(call extract, $(XORG_LIB_XEXT_SOURCE)) + @$(call extract, XORG_LIB_XEXT) @$(call patchin, $(XORG_LIB_XEXT)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make index 990e3b6a3..6bcd0af24 100644 --- a/rules/xorg-lib-Xfixes.make +++ b/rules/xorg-lib-Xfixes.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xfixes.get: $(xorg-lib-Xfixes_get_deps_default) $(XORG_LIB_XFIXES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XFIXES_URL)) + @$(call get, XORG_LIB_XFIXES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xfixes_extract: $(STATEDIR)/xorg-lib-Xfixes.extract $(STATEDIR)/xorg-lib-Xfixes.extract: $(xorg-lib-Xfixes_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XFIXES_DIR)) - @$(call extract, $(XORG_LIB_XFIXES_SOURCE)) + @$(call extract, XORG_LIB_XFIXES) @$(call patchin, $(XORG_LIB_XFIXES)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make index 4b70d91d4..5424d5a46 100644 --- a/rules/xorg-lib-Xfont.make +++ b/rules/xorg-lib-Xfont.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xfont.get: $(xorg-lib-Xfont_get_deps_default) $(XORG_LIB_XFONT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XFONT_URL)) + @$(call get, XORG_LIB_XFONT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xfont_extract: $(STATEDIR)/xorg-lib-Xfont.extract $(STATEDIR)/xorg-lib-Xfont.extract: $(xorg-lib-Xfont_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XFONT_DIR)) - @$(call extract, $(XORG_LIB_XFONT_SOURCE)) + @$(call extract, XORG_LIB_XFONT) @$(call patchin, $(XORG_LIB_XFONT)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make index 2c8a60eed..563a4fbcc 100644 --- a/rules/xorg-lib-Xfontcache.make +++ b/rules/xorg-lib-Xfontcache.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xfontcache.get: $(xorg-lib-Xfontcache_get_deps_default) $(XORG_LIB_XFONTCACHE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XFONTCACHE_URL)) + @$(call get, XORG_LIB_XFONTCACHE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xfontcache_extract: $(STATEDIR)/xorg-lib-Xfontcache.extract $(STATEDIR)/xorg-lib-Xfontcache.extract: $(xorg-lib-Xfontcache_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XFONTCACHE_DIR)) - @$(call extract, $(XORG_LIB_XFONTCACHE_SOURCE)) + @$(call extract, XORG_LIB_XFONTCACHE) @$(call patchin, $(XORG_LIB_XFONTCACHE)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make index e37846a27..d16eddb37 100644 --- a/rules/xorg-lib-Xft.make +++ b/rules/xorg-lib-Xft.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xft.get: $(xorg-lib-Xft_get_deps_default) $(XORG_LIB_XFT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XFT_URL)) + @$(call get, XORG_LIB_XFT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xft_extract: $(STATEDIR)/xorg-lib-Xft.extract $(STATEDIR)/xorg-lib-Xft.extract: $(xorg-lib-Xft_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XFT_DIR)) - @$(call extract, $(XORG_LIB_XFT_SOURCE)) + @$(call extract, XORG_LIB_XFT) @$(call patchin, $(XORG_LIB_XFT)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make index 36c717552..adae8997a 100644 --- a/rules/xorg-lib-Xi.make +++ b/rules/xorg-lib-Xi.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xi.get: $(xorg-lib-Xi_get_deps_default) $(XORG_LIB_XI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XI_URL)) + @$(call get, XORG_LIB_XI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xi_extract: $(STATEDIR)/xorg-lib-Xi.extract $(STATEDIR)/xorg-lib-Xi.extract: $(xorg-lib-Xi_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XI_DIR)) - @$(call extract, $(XORG_LIB_XI_SOURCE)) + @$(call extract, XORG_LIB_XI) @$(call patchin, $(XORG_LIB_XI)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make index aa9e2acc7..d8e63755a 100644 --- a/rules/xorg-lib-Xinerama.make +++ b/rules/xorg-lib-Xinerama.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xinerama.get: $(xorg-lib-Xinerama_get_deps_default) $(XORG_LIB_XINERAMA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XINERAMA_URL)) + @$(call get, XORG_LIB_XINERAMA) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xinerama_extract: $(STATEDIR)/xorg-lib-Xinerama.extract $(STATEDIR)/xorg-lib-Xinerama.extract: $(xorg-lib-Xinerama_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XINERAMA_DIR)) - @$(call extract, $(XORG_LIB_XINERAMA_SOURCE)) + @$(call extract, XORG_LIB_XINERAMA) @$(call patchin, $(XORG_LIB_XINERAMA)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make index 359ce3490..f7d561432 100644 --- a/rules/xorg-lib-Xmu.make +++ b/rules/xorg-lib-Xmu.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xmu.get: $(xorg-lib-Xmu_get_deps_default) $(XORG_LIB_XMU_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XMU_URL)) + @$(call get, XORG_LIB_XMU) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xmu_extract: $(STATEDIR)/xorg-lib-Xmu.extract $(STATEDIR)/xorg-lib-Xmu.extract: $(xorg-lib-Xmu_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XMU_DIR)) - @$(call extract, $(XORG_LIB_XMU_SOURCE)) + @$(call extract, XORG_LIB_XMU) @$(call patchin, $(XORG_LIB_XMU)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make index b6344e603..4e0ac09ee 100644 --- a/rules/xorg-lib-Xp.make +++ b/rules/xorg-lib-Xp.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xp.get: $(xorg-lib-Xp_get_deps_default) $(XORG_LIB_XP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XP_URL)) + @$(call get, XORG_LIB_XP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xp_extract: $(STATEDIR)/xorg-lib-Xp.extract $(STATEDIR)/xorg-lib-Xp.extract: $(xorg-lib-Xp_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XP_DIR)) - @$(call extract, $(XORG_LIB_XP_SOURCE)) + @$(call extract, XORG_LIB_XP) @$(call patchin, $(XORG_LIB_XP)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make index 7f294c36b..af8f65440 100644 --- a/rules/xorg-lib-Xpm.make +++ b/rules/xorg-lib-Xpm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xpm.get: $(xorg-lib-Xpm_get_deps_default) $(XORG_LIB_XPM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XPM_URL)) + @$(call get, XORG_LIB_XPM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xpm_extract: $(STATEDIR)/xorg-lib-Xpm.extract $(STATEDIR)/xorg-lib-Xpm.extract: $(xorg-lib-Xpm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XPM_DIR)) - @$(call extract, $(XORG_LIB_XPM_SOURCE)) + @$(call extract, XORG_LIB_XPM) @$(call patchin, $(XORG_LIB_XPM)) @$(call touch, $@) diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make index b5a57ac3c..0c648ca26 100644 --- a/rules/xorg-lib-XprintAppUtil.make +++ b/rules/xorg-lib-XprintAppUtil.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-XprintAppUtil.get: $(xorg-lib-XprintAppUtil_get_deps_defaul $(XORG_LIB_XPRINTAPPUTIL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XPRINTAPPUTIL_URL)) + @$(call get, XORG_LIB_XPRINTAPPUTIL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-XprintAppUtil_extract: $(STATEDIR)/xorg-lib-XprintAppUtil.extract $(STATEDIR)/xorg-lib-XprintAppUtil.extract: $(xorg-lib-XprintAppUtil_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XPRINTAPPUTIL_DIR)) - @$(call extract, $(XORG_LIB_XPRINTAPPUTIL_SOURCE)) + @$(call extract, XORG_LIB_XPRINTAPPUTIL) @$(call patchin, $(XORG_LIB_XPRINTAPPUTIL)) @$(call touch, $@) diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make index f5776753f..06c703f15 100644 --- a/rules/xorg-lib-XprintUtil.make +++ b/rules/xorg-lib-XprintUtil.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-XprintUtil.get: $(xorg-lib-XprintUtil_get_deps_default) $(XORG_LIB_XPRINTUTIL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XPRINTUTIL_URL)) + @$(call get, XORG_LIB_XPRINTUTIL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-XprintUtil_extract: $(STATEDIR)/xorg-lib-XprintUtil.extract $(STATEDIR)/xorg-lib-XprintUtil.extract: $(xorg-lib-XprintUtil_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XPRINTUTIL_DIR)) - @$(call extract, $(XORG_LIB_XPRINTUTIL_SOURCE)) + @$(call extract, XORG_LIB_XPRINTUTIL) @$(call patchin, $(XORG_LIB_XPRINTUTIL)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make index aaeb6c3df..4d5bdc5e8 100644 --- a/rules/xorg-lib-Xrandr.make +++ b/rules/xorg-lib-Xrandr.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xrandr.get: $(xorg-lib-Xrandr_get_deps_default) $(XORG_LIB_XRANDR_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XRANDR_URL)) + @$(call get, XORG_LIB_XRANDR) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xrandr_extract: $(STATEDIR)/xorg-lib-Xrandr.extract $(STATEDIR)/xorg-lib-Xrandr.extract: $(xorg-lib-Xrandr_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XRANDR_DIR)) - @$(call extract, $(XORG_LIB_XRANDR_SOURCE)) + @$(call extract, XORG_LIB_XRANDR) @$(call patchin, $(XORG_LIB_XRANDR)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make index 2d1a3efb1..a8de3156b 100644 --- a/rules/xorg-lib-Xrender.make +++ b/rules/xorg-lib-Xrender.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xrender.get: $(xorg-lib-Xrender_get_deps_default) $(XORG_LIB_XRENDER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XRENDER_URL)) + @$(call get, XORG_LIB_XRENDER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xrender_extract: $(STATEDIR)/xorg-lib-Xrender.extract $(STATEDIR)/xorg-lib-Xrender.extract: $(xorg-lib-Xrender_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XRENDER_DIR)) - @$(call extract, $(XORG_LIB_XRENDER_SOURCE)) + @$(call extract, XORG_LIB_XRENDER) @$(call patchin, $(XORG_LIB_XRENDER)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make index 0d2a7fa5e..2c2fcc7fb 100644 --- a/rules/xorg-lib-Xres.make +++ b/rules/xorg-lib-Xres.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xres.get: $(xorg-lib-Xres_get_deps_default) $(XORG_LIB_XRES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XRES_URL)) + @$(call get, XORG_LIB_XRES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xres_extract: $(STATEDIR)/xorg-lib-Xres.extract $(STATEDIR)/xorg-lib-Xres.extract: $(xorg-lib-Xres_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XRES_DIR)) - @$(call extract, $(XORG_LIB_XRES_SOURCE)) + @$(call extract, XORG_LIB_XRES) @$(call patchin, $(XORG_LIB_XRES)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make index 23d61522f..f7ccb73fe 100644 --- a/rules/xorg-lib-Xt.make +++ b/rules/xorg-lib-Xt.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xt.get: $(xorg-lib-Xt_get_deps_default) $(XORG_LIB_XT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XT_URL)) + @$(call get, XORG_LIB_XT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xt_extract: $(STATEDIR)/xorg-lib-Xt.extract $(STATEDIR)/xorg-lib-Xt.extract: $(xorg-lib-Xt_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XT_DIR)) - @$(call extract, $(XORG_LIB_XT_SOURCE)) + @$(call extract, XORG_LIB_XT) @$(call patchin, $(XORG_LIB_XT)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make index 61521df8b..763cb8c7b 100644 --- a/rules/xorg-lib-Xtst.make +++ b/rules/xorg-lib-Xtst.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xtst.get: $(xorg-lib-Xtst_get_deps_default) $(XORG_LIB_XTST_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XTST_URL)) + @$(call get, XORG_LIB_XTST) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xtst_extract: $(STATEDIR)/xorg-lib-Xtst.extract $(STATEDIR)/xorg-lib-Xtst.extract: $(xorg-lib-Xtst_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XTST_DIR)) - @$(call extract, $(XORG_LIB_XTST_SOURCE)) + @$(call extract, XORG_LIB_XTST) @$(call patchin, $(XORG_LIB_XTST)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make index 7f9e748ce..116d04bef 100644 --- a/rules/xorg-lib-Xv.make +++ b/rules/xorg-lib-Xv.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xv.get: $(xorg-lib-Xv_get_deps_default) $(XORG_LIB_XV_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XV_URL)) + @$(call get, XORG_LIB_XV) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xv_extract: $(STATEDIR)/xorg-lib-Xv.extract $(STATEDIR)/xorg-lib-Xv.extract: $(xorg-lib-Xv_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XV_DIR)) - @$(call extract, $(XORG_LIB_XV_SOURCE)) + @$(call extract, XORG_LIB_XV) @$(call patchin, $(XORG_LIB_XV)) @$(call touch, $@) diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make index 67511d788..bfc226c26 100644 --- a/rules/xorg-lib-XvMC.make +++ b/rules/xorg-lib-XvMC.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-XvMC.get: $(xorg-lib-XvMC_get_deps_default) $(XORG_LIB_XVMC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XVMC_URL)) + @$(call get, XORG_LIB_XVMC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-XvMC_extract: $(STATEDIR)/xorg-lib-XvMC.extract $(STATEDIR)/xorg-lib-XvMC.extract: $(xorg-lib-XvMC_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XVMC_DIR)) - @$(call extract, $(XORG_LIB_XVMC_SOURCE)) + @$(call extract, XORG_LIB_XVMC) @$(call patchin, $(XORG_LIB_XVMC)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make index 6c7ed52ad..ad05c5e33 100644 --- a/rules/xorg-lib-Xxf86dga.make +++ b/rules/xorg-lib-Xxf86dga.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xxf86dga.get: $(xorg-lib-Xxf86dga_get_deps_default) $(XORG_LIB_XXF86DGA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XXF86DGA_URL)) + @$(call get, XORG_LIB_XXF86DGA) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xxf86dga_extract: $(STATEDIR)/xorg-lib-Xxf86dga.extract $(STATEDIR)/xorg-lib-Xxf86dga.extract: $(xorg-lib-Xxf86dga_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XXF86DGA_DIR)) - @$(call extract, $(XORG_LIB_XXF86DGA_SOURCE)) + @$(call extract, XORG_LIB_XXF86DGA) @$(call patchin, $(XORG_LIB_XXF86DGA)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make index a2ac36124..6df1d2fdd 100644 --- a/rules/xorg-lib-Xxf86misc.make +++ b/rules/xorg-lib-Xxf86misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xxf86misc.get: $(xorg-lib-Xxf86misc_get_deps_default) $(XORG_LIB_XXF86MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XXF86MISC_URL)) + @$(call get, XORG_LIB_XXF86MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xxf86misc_extract: $(STATEDIR)/xorg-lib-Xxf86misc.extract $(STATEDIR)/xorg-lib-Xxf86misc.extract: $(xorg-lib-Xxf86misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XXF86MISC_DIR)) - @$(call extract, $(XORG_LIB_XXF86MISC_SOURCE)) + @$(call extract, XORG_LIB_XXF86MISC) @$(call patchin, $(XORG_LIB_XXF86MISC)) @$(call touch, $@) diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make index bdff11f88..c04692494 100644 --- a/rules/xorg-lib-Xxf86vm.make +++ b/rules/xorg-lib-Xxf86vm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-Xxf86vm.get: $(xorg-lib-Xxf86vm_get_deps_default) $(XORG_LIB_XXF86VM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XXF86VM_URL)) + @$(call get, XORG_LIB_XXF86VM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-Xxf86vm_extract: $(STATEDIR)/xorg-lib-Xxf86vm.extract $(STATEDIR)/xorg-lib-Xxf86vm.extract: $(xorg-lib-Xxf86vm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XXF86VM_DIR)) - @$(call extract, $(XORG_LIB_XXF86VM_SOURCE)) + @$(call extract, XORG_LIB_XXF86VM) @$(call patchin, $(XORG_LIB_XXF86VM)) @$(call touch, $@) diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make index d28b4bc32..a07369fe3 100644 --- a/rules/xorg-lib-dmx.make +++ b/rules/xorg-lib-dmx.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-dmx.get: $(xorg-lib-dmx_get_deps_default) $(XORG_LIB_DMX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_DMX_URL)) + @$(call get, XORG_LIB_DMX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-dmx_extract: $(STATEDIR)/xorg-lib-dmx.extract $(STATEDIR)/xorg-lib-dmx.extract: $(xorg-lib-dmx_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_DMX_DIR)) - @$(call extract, $(XORG_LIB_DMX_SOURCE)) + @$(call extract, XORG_LIB_DMX) @$(call patchin, $(XORG_LIB_DMX)) @$(call touch, $@) diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make index 55fffab92..c9aec6db3 100644 --- a/rules/xorg-lib-fontenc.make +++ b/rules/xorg-lib-fontenc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-fontenc.get: $(xorg-lib-fontenc_get_deps_default) $(XORG_LIB_FONTENC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_FONTENC_URL)) + @$(call get, XORG_LIB_FONTENC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-fontenc_extract: $(STATEDIR)/xorg-lib-fontenc.extract $(STATEDIR)/xorg-lib-fontenc.extract: $(xorg-lib-fontenc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_FONTENC_DIR)) - @$(call extract, $(XORG_LIB_FONTENC_SOURCE)) + @$(call extract, XORG_LIB_FONTENC) @$(call patchin, $(XORG_LIB_FONTENC)) @$(call touch, $@) diff --git a/rules/xorg-lib-lbxutil.make b/rules/xorg-lib-lbxutil.make index c021f7f55..34aa1c2f1 100644 --- a/rules/xorg-lib-lbxutil.make +++ b/rules/xorg-lib-lbxutil.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-lbxutil.get: $(xorg-lib-lbxutil_get_deps_default) $(XORG_LIB_LBXUTIL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_LBXUTIL_URL)) + @$(call get, XORG_LIB_LBXUTIL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-lbxutil_extract: $(STATEDIR)/xorg-lib-lbxutil.extract $(STATEDIR)/xorg-lib-lbxutil.extract: $(xorg-lib-lbxutil_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_LBXUTIL_DIR)) - @$(call extract, $(XORG_LIB_LBXUTIL_SOURCE)) + @$(call extract, XORG_LIB_LBXUTIL) @$(call patchin, $(XORG_LIB_LBXUTIL)) @$(call touch, $@) diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make index 5070477c2..b2c8439ae 100644 --- a/rules/xorg-lib-oldX.make +++ b/rules/xorg-lib-oldX.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-oldX.get: $(xorg-lib-oldX_get_deps_default) $(XORG_LIB_OLDX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_OLDX_URL)) + @$(call get, XORG_LIB_OLDX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-oldX_extract: $(STATEDIR)/xorg-lib-oldX.extract $(STATEDIR)/xorg-lib-oldX.extract: $(xorg-lib-oldX_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_OLDX_DIR)) - @$(call extract, $(XORG_LIB_OLDX_SOURCE)) + @$(call extract, XORG_LIB_OLDX) @$(call patchin, $(XORG_LIB_OLDX)) @$(call touch, $@) diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make index 1f51f4cbc..eb697c8d8 100644 --- a/rules/xorg-lib-xkbfile.make +++ b/rules/xorg-lib-xkbfile.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-xkbfile.get: $(xorg-lib-xkbfile_get_deps_default) $(XORG_LIB_XKBFILE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XKBFILE_URL)) + @$(call get, XORG_LIB_XKBFILE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-xkbfile_extract: $(STATEDIR)/xorg-lib-xkbfile.extract $(STATEDIR)/xorg-lib-xkbfile.extract: $(xorg-lib-xkbfile_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XKBFILE_DIR)) - @$(call extract, $(XORG_LIB_XKBFILE_SOURCE)) + @$(call extract, XORG_LIB_XKBFILE) @$(call patchin, $(XORG_LIB_XKBFILE)) @$(call touch, $@) diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make index 8a3949b76..c3485720a 100644 --- a/rules/xorg-lib-xkbui.make +++ b/rules/xorg-lib-xkbui.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-xkbui.get: $(xorg-lib-xkbui_get_deps_default) $(XORG_LIB_XKBUI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XKBUI_URL)) + @$(call get, XORG_LIB_XKBUI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-xkbui_extract: $(STATEDIR)/xorg-lib-xkbui.extract $(STATEDIR)/xorg-lib-xkbui.extract: $(xorg-lib-xkbui_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XKBUI_DIR)) - @$(call extract, $(XORG_LIB_XKBUI_SOURCE)) + @$(call extract, XORG_LIB_XKBUI) @$(call patchin, $(XORG_LIB_XKBUI)) @$(call touch, $@) diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make index f12b28c25..46895b72b 100644 --- a/rules/xorg-lib-xtrans.make +++ b/rules/xorg-lib-xtrans.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-lib-xtrans.get: $(xorg-lib-xtrans_get_deps_default) $(XORG_LIB_XTRANS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_LIB_XTRANS_URL)) + @$(call get, XORG_LIB_XTRANS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-lib-xtrans_extract: $(STATEDIR)/xorg-lib-xtrans.extract $(STATEDIR)/xorg-lib-xtrans.extract: $(xorg-lib-xtrans_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_LIB_XTRANS_DIR)) - @$(call extract, $(XORG_LIB_XTRANS_SOURCE)) + @$(call extract, XORG_LIB_XTRANS) @$(call patchin, $(XORG_LIB_XTRANS)) @$(call touch, $@) diff --git a/rules/xorg-proto-applewm.make b/rules/xorg-proto-applewm.make index 4137463b5..aa12a0644 100644 --- a/rules/xorg-proto-applewm.make +++ b/rules/xorg-proto-applewm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-applewm.get: $(xorg-proto-applewm_get_deps_default) $(XORG_PROTO_APPLEWM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_APPLEWM_URL)) + @$(call get, XORG_PROTO_APPLEWM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-applewm_extract: $(STATEDIR)/xorg-proto-applewm.extract $(STATEDIR)/xorg-proto-applewm.extract: $(xorg-proto-applewm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_APPLEWM_DIR)) - @$(call extract, $(XORG_PROTO_APPLEWM_SOURCE)) + @$(call extract, XORG_PROTO_APPLEWM) @$(call patchin, $(XORG_PROTO_APPLEWM)) @$(call touch, $@) diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make index 2cbbbef1a..02ea91a00 100644 --- a/rules/xorg-proto-bigreqs.make +++ b/rules/xorg-proto-bigreqs.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-bigreqs.get: $(xorg-proto-bigreqs_get_deps_default) $(XORG_PROTO_BIGREQS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_BIGREQS_URL)) + @$(call get, XORG_PROTO_BIGREQS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-bigreqs_extract: $(STATEDIR)/xorg-proto-bigreqs.extract $(STATEDIR)/xorg-proto-bigreqs.extract: $(xorg-proto-bigreqs_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_BIGREQS_DIR)) - @$(call extract, $(XORG_PROTO_BIGREQS_SOURCE)) + @$(call extract, XORG_PROTO_BIGREQS) @$(call patchin, $(XORG_PROTO_BIGREQS)) @$(call touch, $@) diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make index 8896a068b..e396abbd0 100644 --- a/rules/xorg-proto-composite.make +++ b/rules/xorg-proto-composite.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-composite.get: $(xorg-proto-composite_get_deps_default) $(XORG_PROTO_COMPOSITE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_COMPOSITE_URL)) + @$(call get, XORG_PROTO_COMPOSITE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-composite_extract: $(STATEDIR)/xorg-proto-composite.extract $(STATEDIR)/xorg-proto-composite.extract: $(xorg-proto-composite_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_COMPOSITE_DIR)) - @$(call extract, $(XORG_PROTO_COMPOSITE_SOURCE)) + @$(call extract, XORG_PROTO_COMPOSITE) @$(call patchin, $(XORG_PROTO_COMPOSITE)) @$(call touch, $@) diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make index 44ed5c6b9..fda05a0da 100644 --- a/rules/xorg-proto-damage.make +++ b/rules/xorg-proto-damage.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-damage.get: $(xorg-proto-damage_get_deps_default) $(XORG_PROTO_DAMAGE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_DAMAGE_URL)) + @$(call get, XORG_PROTO_DAMAGE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-damage_extract: $(STATEDIR)/xorg-proto-damage.extract $(STATEDIR)/xorg-proto-damage.extract: $(xorg-proto-damage_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_DAMAGE_DIR)) - @$(call extract, $(XORG_PROTO_DAMAGE_SOURCE)) + @$(call extract, XORG_PROTO_DAMAGE) @$(call patchin, $(XORG_PROTO_DAMAGE)) @$(call touch, $@) diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make index fc8e350ad..0ca2cb341 100644 --- a/rules/xorg-proto-dmx.make +++ b/rules/xorg-proto-dmx.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-dmx.get: $(xorg-proto-dmx_get_deps_default) $(XORG_PROTO_DMX_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_DMX_URL)) + @$(call get, XORG_PROTO_DMX) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-dmx_extract: $(STATEDIR)/xorg-proto-dmx.extract $(STATEDIR)/xorg-proto-dmx.extract: $(xorg-proto-dmx_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_DMX_DIR)) - @$(call extract, $(XORG_PROTO_DMX_SOURCE)) + @$(call extract, XORG_PROTO_DMX) @$(call patchin, $(XORG_PROTO_DMX)) @$(call touch, $@) diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make index 7a1aa815c..648cd97d0 100644 --- a/rules/xorg-proto-evieext.make +++ b/rules/xorg-proto-evieext.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-evieext.get: $(xorg-proto-evieext_get_deps_default) $(XORG_PROTO_EVIEEXT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_EVIEEXT_URL)) + @$(call get, XORG_PROTO_EVIEEXT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-evieext_extract: $(STATEDIR)/xorg-proto-evieext.extract $(STATEDIR)/xorg-proto-evieext.extract: $(xorg-proto-evieext_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_EVIEEXT_DIR)) - @$(call extract, $(XORG_PROTO_EVIEEXT_SOURCE)) + @$(call extract, XORG_PROTO_EVIEEXT) @$(call patchin, $(XORG_PROTO_EVIEEXT)) @$(call touch, $@) diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make index 687a59708..c3425e2a9 100644 --- a/rules/xorg-proto-fixes.make +++ b/rules/xorg-proto-fixes.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-fixes.get: $(xorg-proto-fixes_get_deps_default) $(XORG_PROTO_FIXES_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_FIXES_URL)) + @$(call get, XORG_PROTO_FIXES) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-fixes_extract: $(STATEDIR)/xorg-proto-fixes.extract $(STATEDIR)/xorg-proto-fixes.extract: $(xorg-proto-fixes_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_FIXES_DIR)) - @$(call extract, $(XORG_PROTO_FIXES_SOURCE)) + @$(call extract, XORG_PROTO_FIXES) @$(call patchin, $(XORG_PROTO_FIXES)) @$(call touch, $@) diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make index 2e8e66d8b..bcc7111e6 100644 --- a/rules/xorg-proto-fontcache.make +++ b/rules/xorg-proto-fontcache.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-fontcache.get: $(xorg-proto-fontcache_get_deps_default) $(XORG_PROTO_FONTCACHE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_FONTCACHE_URL)) + @$(call get, XORG_PROTO_FONTCACHE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-fontcache_extract: $(STATEDIR)/xorg-proto-fontcache.extract $(STATEDIR)/xorg-proto-fontcache.extract: $(xorg-proto-fontcache_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_FONTCACHE_DIR)) - @$(call extract, $(XORG_PROTO_FONTCACHE_SOURCE)) + @$(call extract, XORG_PROTO_FONTCACHE) @$(call patchin, $(XORG_PROTO_FONTCACHE)) @$(call touch, $@) diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make index e60c97fc6..72b4e395b 100644 --- a/rules/xorg-proto-fonts.make +++ b/rules/xorg-proto-fonts.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-fonts.get: $(xorg-proto-fonts_get_deps_default) $(XORG_PROTO_FONTS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_FONTS_URL)) + @$(call get, XORG_PROTO_FONTS) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-fonts_extract: $(STATEDIR)/xorg-proto-fonts.extract $(STATEDIR)/xorg-proto-fonts.extract: $(xorg-proto-fonts_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_FONTS_DIR)) - @$(call extract, $(XORG_PROTO_FONTS_SOURCE)) + @$(call extract, XORG_PROTO_FONTS) @$(call patchin, $(XORG_PROTO_FONTS)) @$(call touch, $@) diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make index 0f266391a..49fe17409 100644 --- a/rules/xorg-proto-gl.make +++ b/rules/xorg-proto-gl.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-gl.get: $(xorg-proto-gl_get_deps_default) $(XORG_PROTO_GL_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_GL_URL)) + @$(call get, XORG_PROTO_GL) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-gl_extract: $(STATEDIR)/xorg-proto-gl.extract $(STATEDIR)/xorg-proto-gl.extract: $(xorg-proto-gl_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_GL_DIR)) - @$(call extract, $(XORG_PROTO_GL_SOURCE)) + @$(call extract, XORG_PROTO_GL) @$(call patchin, $(XORG_PROTO_GL)) @$(call touch, $@) diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make index 35e69a3b7..e367d290c 100644 --- a/rules/xorg-proto-input.make +++ b/rules/xorg-proto-input.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-input.get: $(xorg-proto-input_get_deps_default) $(XORG_PROTO_INPUT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_INPUT_URL)) + @$(call get, XORG_PROTO_INPUT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-input_extract: $(STATEDIR)/xorg-proto-input.extract $(STATEDIR)/xorg-proto-input.extract: $(xorg-proto-input_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_INPUT_DIR)) - @$(call extract, $(XORG_PROTO_INPUT_SOURCE)) + @$(call extract, XORG_PROTO_INPUT) @$(call patchin, $(XORG_PROTO_INPUT)) @$(call touch, $@) diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make index daa636a04..9744121cd 100644 --- a/rules/xorg-proto-kb.make +++ b/rules/xorg-proto-kb.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-kb.get: $(xorg-proto-kb_get_deps_default) $(XORG_PROTO_KB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_KB_URL)) + @$(call get, XORG_PROTO_KB) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-kb_extract: $(STATEDIR)/xorg-proto-kb.extract $(STATEDIR)/xorg-proto-kb.extract: $(xorg-proto-kb_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_KB_DIR)) - @$(call extract, $(XORG_PROTO_KB_SOURCE)) + @$(call extract, XORG_PROTO_KB) @$(call patchin, $(XORG_PROTO_KB)) @$(call touch, $@) diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make index 3ec85c836..baa78308b 100644 --- a/rules/xorg-proto-print.make +++ b/rules/xorg-proto-print.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-print.get: $(xorg-proto-print_get_deps_default) $(XORG_PROTO_PRINT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_PRINT_URL)) + @$(call get, XORG_PROTO_PRINT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-print_extract: $(STATEDIR)/xorg-proto-print.extract $(STATEDIR)/xorg-proto-print.extract: $(xorg-proto-print_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_PRINT_DIR)) - @$(call extract, $(XORG_PROTO_PRINT_SOURCE)) + @$(call extract, XORG_PROTO_PRINT) @$(call patchin, $(XORG_PROTO_PRINT)) @$(call touch, $@) diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make index 8f510baf9..b6f1952f6 100644 --- a/rules/xorg-proto-randr.make +++ b/rules/xorg-proto-randr.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-randr.get: $(xorg-proto-randr_get_deps_default) $(XORG_PROTO_RANDR_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_RANDR_URL)) + @$(call get, XORG_PROTO_RANDR) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-randr_extract: $(STATEDIR)/xorg-proto-randr.extract $(STATEDIR)/xorg-proto-randr.extract: $(xorg-proto-randr_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_RANDR_DIR)) - @$(call extract, $(XORG_PROTO_RANDR_SOURCE)) + @$(call extract, XORG_PROTO_RANDR) @$(call patchin, $(XORG_PROTO_RANDR)) @$(call touch, $@) diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make index 150ee6d82..a54352ea7 100644 --- a/rules/xorg-proto-record.make +++ b/rules/xorg-proto-record.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-record.get: $(xorg-proto-record_get_deps_default) $(XORG_PROTO_RECORD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_RECORD_URL)) + @$(call get, XORG_PROTO_RECORD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-record_extract: $(STATEDIR)/xorg-proto-record.extract $(STATEDIR)/xorg-proto-record.extract: $(xorg-proto-record_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_RECORD_DIR)) - @$(call extract, $(XORG_PROTO_RECORD_SOURCE)) + @$(call extract, XORG_PROTO_RECORD) @$(call patchin, $(XORG_PROTO_RECORD)) @$(call touch, $@) diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make index 3ac477c00..269b40b81 100644 --- a/rules/xorg-proto-render.make +++ b/rules/xorg-proto-render.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-render.get: $(xorg-proto-render_get_deps_default) $(XORG_PROTO_RENDER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_RENDER_URL)) + @$(call get, XORG_PROTO_RENDER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-render_extract: $(STATEDIR)/xorg-proto-render.extract $(STATEDIR)/xorg-proto-render.extract: $(xorg-proto-render_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_RENDER_DIR)) - @$(call extract, $(XORG_PROTO_RENDER_SOURCE)) + @$(call extract, XORG_PROTO_RENDER) @$(call patchin, $(XORG_PROTO_RENDER)) @$(call touch, $@) diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make index bdb8af860..13d59bad6 100644 --- a/rules/xorg-proto-resource.make +++ b/rules/xorg-proto-resource.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-resource.get: $(xorg-proto-resource_get_deps_default) $(XORG_PROTO_RESOURCE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_RESOURCE_URL)) + @$(call get, XORG_PROTO_RESOURCE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-resource_extract: $(STATEDIR)/xorg-proto-resource.extract $(STATEDIR)/xorg-proto-resource.extract: $(xorg-proto-resource_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_RESOURCE_DIR)) - @$(call extract, $(XORG_PROTO_RESOURCE_SOURCE)) + @$(call extract, XORG_PROTO_RESOURCE) @$(call patchin, $(XORG_PROTO_RESOURCE)) @$(call touch, $@) diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make index 7f35dfd7f..386b6bead 100644 --- a/rules/xorg-proto-scrnsaver.make +++ b/rules/xorg-proto-scrnsaver.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-scrnsaver.get: $(xorg-proto-scrnsaver_get_deps_default) $(XORG_PROTO_SCRNSAVER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_SCRNSAVER_URL)) + @$(call get, XORG_PROTO_SCRNSAVER) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-scrnsaver_extract: $(STATEDIR)/xorg-proto-scrnsaver.extract $(STATEDIR)/xorg-proto-scrnsaver.extract: $(xorg-proto-scrnsaver_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_SCRNSAVER_DIR)) - @$(call extract, $(XORG_PROTO_SCRNSAVER_SOURCE)) + @$(call extract, XORG_PROTO_SCRNSAVER) @$(call patchin, $(XORG_PROTO_SCRNSAVER)) @$(call touch, $@) diff --git a/rules/xorg-proto-trap.make b/rules/xorg-proto-trap.make index 52c74e8fb..52b270672 100644 --- a/rules/xorg-proto-trap.make +++ b/rules/xorg-proto-trap.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-trap.get: $(xorg-proto-trap_get_deps_default) $(XORG_PROTO_TRAP_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_TRAP_URL)) + @$(call get, XORG_PROTO_TRAP) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-trap_extract: $(STATEDIR)/xorg-proto-trap.extract $(STATEDIR)/xorg-proto-trap.extract: $(xorg-proto-trap_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_TRAP_DIR)) - @$(call extract, $(XORG_PROTO_TRAP_SOURCE)) + @$(call extract, XORG_PROTO_TRAP) @$(call patchin, $(XORG_PROTO_TRAP)) @$(call touch, $@) diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make index 270b1c9e0..6036e3687 100644 --- a/rules/xorg-proto-video.make +++ b/rules/xorg-proto-video.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-video.get: $(xorg-proto-video_get_deps_default) $(XORG_PROTO_VIDEO_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_VIDEO_URL)) + @$(call get, XORG_PROTO_VIDEO) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-video_extract: $(STATEDIR)/xorg-proto-video.extract $(STATEDIR)/xorg-proto-video.extract: $(xorg-proto-video_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_VIDEO_DIR)) - @$(call extract, $(XORG_PROTO_VIDEO_SOURCE)) + @$(call extract, XORG_PROTO_VIDEO) @$(call patchin, $(XORG_PROTO_VIDEO)) @$(call touch, $@) diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make index e764a7cd3..330e79652 100644 --- a/rules/xorg-proto-windowswm.make +++ b/rules/xorg-proto-windowswm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-windowswm.get: $(xorg-proto-windowswm_get_deps_default) $(XORG_PROTO_WINDOWSWM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_WINDOWSWM_URL)) + @$(call get, XORG_PROTO_WINDOWSWM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-windowswm_extract: $(STATEDIR)/xorg-proto-windowswm.extract $(STATEDIR)/xorg-proto-windowswm.extract: $(xorg-proto-windowswm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_WINDOWSWM_DIR)) - @$(call extract, $(XORG_PROTO_WINDOWSWM_SOURCE)) + @$(call extract, XORG_PROTO_WINDOWSWM) @$(call patchin, $(XORG_PROTO_WINDOWSWM)) @$(call touch, $@) diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make index 6cea9ac36..b6482ed64 100644 --- a/rules/xorg-proto-x.make +++ b/rules/xorg-proto-x.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-x.get: $(xorg-proto-x_get_deps_default) $(XORG_PROTO_X_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_X_URL)) + @$(call get, XORG_PROTO_X) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-x_extract: $(STATEDIR)/xorg-proto-x.extract $(STATEDIR)/xorg-proto-x.extract: $(xorg-proto-x_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_X_DIR)) - @$(call extract, $(XORG_PROTO_X_SOURCE)) + @$(call extract, XORG_PROTO_X) @$(call patchin, $(XORG_PROTO_X)) @$(call touch, $@) diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make index 8d8da6ca4..1eee63469 100644 --- a/rules/xorg-proto-xcmisc.make +++ b/rules/xorg-proto-xcmisc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xcmisc.get: $(xorg-proto-xcmisc_get_deps_default) $(XORG_PROTO_XCMISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XCMISC_URL)) + @$(call get, XORG_PROTO_XCMISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xcmisc_extract: $(STATEDIR)/xorg-proto-xcmisc.extract $(STATEDIR)/xorg-proto-xcmisc.extract: $(xorg-proto-xcmisc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XCMISC_DIR)) - @$(call extract, $(XORG_PROTO_XCMISC_SOURCE)) + @$(call extract, XORG_PROTO_XCMISC) @$(call patchin, $(XORG_PROTO_XCMISC)) @$(call touch, $@) diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make index 703a3839d..2068e0292 100644 --- a/rules/xorg-proto-xext.make +++ b/rules/xorg-proto-xext.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xext.get: $(xorg-proto-xext_get_deps_default) $(XORG_PROTO_XEXT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XEXT_URL)) + @$(call get, XORG_PROTO_XEXT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xext_extract: $(STATEDIR)/xorg-proto-xext.extract $(STATEDIR)/xorg-proto-xext.extract: $(xorg-proto-xext_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XEXT_DIR)) - @$(call extract, $(XORG_PROTO_XEXT_SOURCE)) + @$(call extract, XORG_PROTO_XEXT) @$(call patchin, $(XORG_PROTO_XEXT)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make index 015934b1b..7aaceb5a7 100644 --- a/rules/xorg-proto-xf86bigfont.make +++ b/rules/xorg-proto-xf86bigfont.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86bigfont.get: $(xorg-proto-xf86bigfont_get_deps_defaul $(XORG_PROTO_XF86BIGFONT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86BIGFONT_URL)) + @$(call get, XORG_PROTO_XF86BIGFONT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86bigfont_extract: $(STATEDIR)/xorg-proto-xf86bigfont.extract $(STATEDIR)/xorg-proto-xf86bigfont.extract: $(xorg-proto-xf86bigfont_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86BIGFONT_DIR)) - @$(call extract, $(XORG_PROTO_XF86BIGFONT_SOURCE)) + @$(call extract, XORG_PROTO_XF86BIGFONT) @$(call patchin, $(XORG_PROTO_XF86BIGFONT)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make index c2fa7777a..ba3a950f3 100644 --- a/rules/xorg-proto-xf86dga.make +++ b/rules/xorg-proto-xf86dga.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86dga.get: $(xorg-proto-xf86dga_get_deps_default) $(XORG_PROTO_XF86DGA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86DGA_URL)) + @$(call get, XORG_PROTO_XF86DGA) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86dga_extract: $(STATEDIR)/xorg-proto-xf86dga.extract $(STATEDIR)/xorg-proto-xf86dga.extract: $(xorg-proto-xf86dga_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86DGA_DIR)) - @$(call extract, $(XORG_PROTO_XF86DGA_SOURCE)) + @$(call extract, XORG_PROTO_XF86DGA) @$(call patchin, $(XORG_PROTO_XF86DGA)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make index 96e5bc39f..a80ff0fa9 100644 --- a/rules/xorg-proto-xf86dri.make +++ b/rules/xorg-proto-xf86dri.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86dri.get: $(xorg-proto-xf86dri_get_deps_default) $(XORG_PROTO_XF86DRI_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86DRI_URL)) + @$(call get, XORG_PROTO_XF86DRI) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86dri_extract: $(STATEDIR)/xorg-proto-xf86dri.extract $(STATEDIR)/xorg-proto-xf86dri.extract: $(xorg-proto-xf86dri_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86DRI_DIR)) - @$(call extract, $(XORG_PROTO_XF86DRI_SOURCE)) + @$(call extract, XORG_PROTO_XF86DRI) @$(call patchin, $(XORG_PROTO_XF86DRI)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make index 93b36829b..cae05c9fc 100644 --- a/rules/xorg-proto-xf86misc.make +++ b/rules/xorg-proto-xf86misc.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86misc.get: $(xorg-proto-xf86misc_get_deps_default) $(XORG_PROTO_XF86MISC_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86MISC_URL)) + @$(call get, XORG_PROTO_XF86MISC) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86misc_extract: $(STATEDIR)/xorg-proto-xf86misc.extract $(STATEDIR)/xorg-proto-xf86misc.extract: $(xorg-proto-xf86misc_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86MISC_DIR)) - @$(call extract, $(XORG_PROTO_XF86MISC_SOURCE)) + @$(call extract, XORG_PROTO_XF86MISC) @$(call patchin, $(XORG_PROTO_XF86MISC)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86rush.make b/rules/xorg-proto-xf86rush.make index 449539617..07bffa09e 100644 --- a/rules/xorg-proto-xf86rush.make +++ b/rules/xorg-proto-xf86rush.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86rush.get: $(xorg-proto-xf86rush_get_deps_default) $(XORG_PROTO_XF86RUSH_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86RUSH_URL)) + @$(call get, XORG_PROTO_XF86RUSH) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86rush_extract: $(STATEDIR)/xorg-proto-xf86rush.extract $(STATEDIR)/xorg-proto-xf86rush.extract: $(xorg-proto-xf86rush_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86RUSH_DIR)) - @$(call extract, $(XORG_PROTO_XF86RUSH_SOURCE)) + @$(call extract, XORG_PROTO_XF86RUSH) @$(call patchin, $(XORG_PROTO_XF86RUSH)) @$(call touch, $@) diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make index abbb3d92e..c8e111176 100644 --- a/rules/xorg-proto-xf86vidmode.make +++ b/rules/xorg-proto-xf86vidmode.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xf86vidmode.get: $(xorg-proto-xf86vidmode_get_deps_defaul $(XORG_PROTO_XF86VIDMODE_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XF86VIDMODE_URL)) + @$(call get, XORG_PROTO_XF86VIDMODE) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xf86vidmode_extract: $(STATEDIR)/xorg-proto-xf86vidmode.extract $(STATEDIR)/xorg-proto-xf86vidmode.extract: $(xorg-proto-xf86vidmode_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XF86VIDMODE_DIR)) - @$(call extract, $(XORG_PROTO_XF86VIDMODE_SOURCE)) + @$(call extract, XORG_PROTO_XF86VIDMODE) @$(call patchin, $(XORG_PROTO_XF86VIDMODE)) @$(call touch, $@) diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make index d7f67a029..96b9e02f8 100644 --- a/rules/xorg-proto-xinerama.make +++ b/rules/xorg-proto-xinerama.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xinerama.get: $(xorg-proto-xinerama_get_deps_default) $(XORG_PROTO_XINERAMA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XINERAMA_URL)) + @$(call get, XORG_PROTO_XINERAMA) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xinerama_extract: $(STATEDIR)/xorg-proto-xinerama.extract $(STATEDIR)/xorg-proto-xinerama.extract: $(xorg-proto-xinerama_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XINERAMA_DIR)) - @$(call extract, $(XORG_PROTO_XINERAMA_SOURCE)) + @$(call extract, XORG_PROTO_XINERAMA) @$(call patchin, $(XORG_PROTO_XINERAMA)) @$(call touch, $@) diff --git a/rules/xorg-proto-xproxymanagement.make b/rules/xorg-proto-xproxymanagement.make index bd3ae65a9..e53201471 100644 --- a/rules/xorg-proto-xproxymanagement.make +++ b/rules/xorg-proto-xproxymanagement.make @@ -38,7 +38,7 @@ $(STATEDIR)/xorg-proto-xproxymanagement.get: $(xorg-proto-xproxymanagement_get_d $(XORG_PROTO_XPROXYMANAGEMENT_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_PROTO_XPROXYMANAGEMENT_URL)) + @$(call get, XORG_PROTO_XPROXYMANAGEMENT) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xorg-proto-xproxymanagement_extract: $(STATEDIR)/xorg-proto-xproxymanagement.ext $(STATEDIR)/xorg-proto-xproxymanagement.extract: $(xorg-proto-xproxymanagement_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_PROTO_XPROXYMANAGEMENT_DIR)) - @$(call extract, $(XORG_PROTO_XPROXYMANAGEMENT_SOURCE)) + @$(call extract, XORG_PROTO_XPROXYMANAGEMENT) @$(call patchin, $(XORG_PROTO_XPROXYMANAGEMENT)) @$(call touch, $@) diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 3c07cc381..487d2e621 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -45,7 +45,7 @@ $(STATEDIR)/xorg-server.get: $(xorg-server_get_deps_default) $(XORG_SERVER_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XORG_SERVER_URL)) + @$(call get, XORG_SERVER) # ---------------------------------------------------------------------------- # Extract @@ -56,7 +56,7 @@ xorg-server_extract: $(STATEDIR)/xorg-server.extract $(STATEDIR)/xorg-server.extract: $(xorg-server_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XORG_SERVER_DIR)) - @$(call extract, $(XORG_SERVER_SOURCE)) + @$(call extract, XORG_SERVER) @$(call patchin, $(XORG_SERVER)) @$(call touch, $@) diff --git a/rules/xterm.make b/rules/xterm.make index a681b4aa1..d449efe8c 100644 --- a/rules/xterm.make +++ b/rules/xterm.make @@ -38,7 +38,7 @@ $(STATEDIR)/xterm.get: $(xterm_get_deps_default) $(XTERM_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XTERM_URL)) + @$(call get, XTERM) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xterm_extract: $(STATEDIR)/xterm.extract $(STATEDIR)/xterm.extract: $(xterm_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XTERM_DIR)) - @$(call extract, $(XTERM_SOURCE)) + @$(call extract, XTERM) @$(call patchin, $(XTERM)) @$(call touch, $@) diff --git a/rules/xvkbd.make b/rules/xvkbd.make index 426e55b92..cfdb202ba 100644 --- a/rules/xvkbd.make +++ b/rules/xvkbd.make @@ -38,7 +38,7 @@ $(STATEDIR)/xvkbd.get: $(xvkbd_get_deps_default) $(XVKBD_SOURCE): @$(call targetinfo, $@) - @$(call get, $(XVKBD_URL)) + @$(call get, XVKBD) # ---------------------------------------------------------------------------- # Extract @@ -49,7 +49,7 @@ xvkbd_extract: $(STATEDIR)/xvkbd.extract $(STATEDIR)/xvkbd.extract: $(xvkbd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(XVKBD_DIR)) - @$(call extract, $(XVKBD_SOURCE)) + @$(call extract, XVKBD) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/zebra.make b/rules/zebra.make index cc1d8dae4..78b786091 100644 --- a/rules/zebra.make +++ b/rules/zebra.make @@ -41,7 +41,7 @@ $(STATEDIR)/zebra.get: $(zebra_get_deps_default) $(ZEBRA_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ZEBRA_URL)) + @$(call get, ZEBRA) # ---------------------------------------------------------------------------- # Extract @@ -52,7 +52,7 @@ zebra_extract: $(STATEDIR)/zebra.extract $(STATEDIR)/zebra.extract: $(zebra_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ZEBRA_DIR)) - @$(call extract, $(ZEBRA_SOURCE)) + @$(call extract, ZEBRA) @$(call patchin, $(ZEBRA)) @$(call touch, $@) diff --git a/rules/zlib.make b/rules/zlib.make index 9d26bbeca..8e8d230a1 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -36,7 +36,7 @@ $(STATEDIR)/zlib.get: $(zlib_get_deps_default) $(ZLIB_SOURCE): @$(call targetinfo, $@) - @$(call get, $(ZLIB_URL)) + @$(call get, ZLIB) # ---------------------------------------------------------------------------- # Extract @@ -47,7 +47,7 @@ zlib_extract: $(STATEDIR)/zlib.extract $(STATEDIR)/zlib.extract: $(zlib_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(ZLIB_DIR)) - @$(call extract, $(ZLIB_SOURCE)) + @$(call extract, ZLIB) @$(call touch, $@) # ---------------------------------------------------------------------------- |