diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-07-11 14:06:06 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-07-11 14:06:06 +0000 |
| commit | e1621a4a2a6b1750402d0228cf85920814babc9a (patch) | |
| tree | 427f7759087d6775d41f68513dbb417485d0ee45 | |
| parent | cd599b61144a0f273d2712ffee64ea8e4af2cdbd (diff) | |
Use <package>_VERSION in all <package>.mk instead of <package>_VER
110 files changed, 410 insertions, 387 deletions
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 31afba813..307b4537e 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -3,8 +3,9 @@ # acpid # ############################################################# -ACPID_DIR=$(BUILD_DIR)/acpid-1.0.4 -ACPID_SOURCE=acpid_1.0.4-1.tar.gz +ACPID_VERSION:=1.0.4-1 +ACPID_DIR=$(BUILD_DIR)/acpid-$(ACPID_VERSION) +ACPID_SOURCE=acpid_$(ACPID_VERSION).tar.gz ACPID_SITE=http://ftp.debian.org/debian/pool/main/a/acpid $(DL_DIR)/$(ACPID_SOURCE): diff --git a/package/argus/argus.mk b/package/argus/argus.mk index 17382affc..338df5315 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -3,11 +3,11 @@ # argus # ############################################################# -ARGUS_VER:=3.0.0.rc.34 -ARGUS_SOURCE:=argus_$(ARGUS_VER).orig.tar.gz -ARGUS_PATCH:=argus_$(ARGUS_VER)-1.diff.gz +ARGUS_VERSION:=3.0.0.rc.34 +ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz +ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz ARGUS_SITE:=ftp://ftp.debian.org/debian/pool/main/a/argus/ -ARGUS_DIR:=$(BUILD_DIR)/argus-$(ARGUS_VER) +ARGUS_DIR:=$(BUILD_DIR)/argus-$(ARGUS_VERSION) ARGUS_CAT:=$(ZCAT) ARGUS_BINARY:=bin/argus ARGUS_TARGET_BINARY:=usr/sbin/argus diff --git a/package/at/at.mk b/package/at/at.mk index d40289399..fa960aecf 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -3,10 +3,10 @@ # at # ############################################################# -AT_VER:=3.1.10 -AT_SOURCE:=at_$(AT_VER).tar.gz +AT_VERSION:=3.1.10 +AT_SOURCE:=at_$(AT_VERSION).tar.gz AT_SITE:=http://ftp.debian.org/debian/pool/main/a/at -AT_DIR:=$(BUILD_DIR)/at-$(AT_VER) +AT_DIR:=$(BUILD_DIR)/at-$(AT_VERSION) AT_CAT:=$(ZCAT) AT_TARGET_BINARY:=usr/bin/at AT_BINARY:=at diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index b7ef6fc8f..92427693a 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -3,13 +3,13 @@ # autoconf # ############################################################# -AUTOCONF_VER:=2.61 -AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VER).tar.bz2 +AUTOCONF_VERSION:=2.61 +AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VERSION).tar.bz2 AUTOCONF_SITE:=http://ftp.gnu.org/pub/gnu/autoconf AUTOCONF_CAT:=$(BZCAT) -AUTOCONF_SRC_DIR:=$(TOOL_BUILD_DIR)/autoconf-$(AUTOCONF_VER) -AUTOCONF_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VER) -AUTOCONF_HOST_DIR:=$(TOOL_BUILD_DIR)/autoconf-$(AUTOCONF_VER)-host +AUTOCONF_SRC_DIR:=$(TOOL_BUILD_DIR)/autoconf-$(AUTOCONF_VERSION) +AUTOCONF_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION) +AUTOCONF_HOST_DIR:=$(TOOL_BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)-host AUTOCONF_BINARY:=autoconf AUTOCONF_TARGET_BINARY:=usr/bin/autoconf AUTOCONF:=$(STAGING_DIR)/usr/bin/autoconf diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 4cd85896a..d09f624b7 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -3,13 +3,13 @@ # automake # ############################################################# -AUTOMAKE_VER:=1.10 -AUTOMAKE_SOURCE:=automake-$(AUTOMAKE_VER).tar.bz2 +AUTOMAKE_VERSION:=1.10 +AUTOMAKE_SOURCE:=automake-$(AUTOMAKE_VERSION).tar.bz2 AUTOMAKE_SITE:=http://ftp.gnu.org/pub/gnu/automake AUTOMAKE_CAT:=$(BZCAT) -AUTOMAKE_SRC_DIR:=$(TOOL_BUILD_DIR)/automake-$(AUTOMAKE_VER) -AUTOMAKE_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VER) -AUTOMAKE_HOST_DIR:=$(TOOL_BUILD_DIR)/automake-$(AUTOMAKE_VER)-host +AUTOMAKE_SRC_DIR:=$(TOOL_BUILD_DIR)/automake-$(AUTOMAKE_VERSION) +AUTOMAKE_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION) +AUTOMAKE_HOST_DIR:=$(TOOL_BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-host AUTOMAKE_BINARY:=automake AUTOMAKE_TARGET_BINARY:=usr/bin/automake AUTOMAKE:=$(STAGING_DIR)/usr/bin/automake diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index f70e409bd..8d1179c38 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -10,10 +10,10 @@ # either version 2.1 of the License, or (at your option) any # later version. -AVAHI_VER:=0.6.19 -AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VER) +AVAHI_VERSION:=0.6.19 +AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION) AVAHI_SITE:=http://www.avahi.org/download/ -AVAHI_SOURCE:=avahi-$(AVAHI_VER).tar.gz +AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz AVAHI_CAT:=$(ZCAT) AVAHI_TARGETS:= diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 0dd91fe34..41ec86f3b 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -3,12 +3,12 @@ # berkeley db # ############################################################# -DB_VER:=4.3.29 -DB_SO_VER:=4.3 +DB_VERSION:=4.3.29 +DB_SO_VERSION:=4.3 DB_SITE:=ftp://ftp.sleepycat.com/releases -DB_SOURCE:=db-$(DB_VER).NC.tar.gz -DB_DIR:=$(BUILD_DIR)/db-$(DB_VER).NC -DB_SHARLIB:=libdb-$(DB_SO_VER).so +DB_SOURCE:=db-$(DB_VERSION).NC.tar.gz +DB_DIR:=$(BUILD_DIR)/db-$(DB_VERSION).NC +DB_SHARLIB:=libdb-$(DB_SO_VERSION).so $(DL_DIR)/$(DB_SOURCE): $(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE) @@ -69,7 +69,7 @@ $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB) (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so) -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so* -$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VER).a +$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a cp -dpf $(STAGING_DIR)/include/db.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/ diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 2c21be306..87311dbe8 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -3,11 +3,11 @@ # bind # ############################################################# -BIND_VER:=9.3.2 -BIND_SOURCE:=bind-$(BIND_VER).tar.gz -BIND_SITE:=ftp://ftp.isc.org/isc/bind9/$(BIND_VER) -BIND_DIR1:=$(TOOL_BUILD_DIR)/bind-$(BIND_VER) -BIND_DIR2:=$(BUILD_DIR)/bind-$(BIND_VER) +BIND_VERSION:=9.3.2 +BIND_SOURCE:=bind-$(BIND_VERSION).tar.gz +BIND_SITE:=ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) +BIND_DIR1:=$(TOOL_BUILD_DIR)/bind-$(BIND_VERSION) +BIND_DIR2:=$(BUILD_DIR)/bind-$(BIND_VERSION) BIND_CAT:=$(ZCAT) BIND_BINARY:=bin/named/named BIND_TARGET_BINARY:=usr/sbin/named diff --git a/package/bison/bison.mk b/package/bison/bison.mk index cdc78eadd..2255a832e 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -3,10 +3,10 @@ # bison # ############################################################# -BISON_VER:=2.3 -BISON_SOURCE:=bison-$(BISON_VER).tar.bz2 +BISON_VERSION:=2.3 +BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2 BISON_SITE:=http://ftp.gnu.org/pub/gnu/bison -BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VER) +BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION) BISON_CAT:=$(BZCAT) BISON_BINARY:=src/bison BISON_TARGET_BINARY:=usr/bin/bison diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index de0fcc973..8be30bd46 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -3,10 +3,10 @@ # bzip2 # ############################################################# -BZIP2_VER:=1.0.4 -BZIP2_SOURCE:=bzip2-$(BZIP2_VER).tar.gz -BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VER) -BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VER) +BZIP2_VERSION:=1.0.4 +BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz +BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION) +BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION) BZIP2_CAT:=$(ZCAT) BZIP2_BINARY:=$(BZIP2_DIR)/bzip2 BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore @@ -19,7 +19,7 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE) $(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE) $(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile - $(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.$(BZIP2_VER) \ + $(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.$(BZIP2_VERSION) \ libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so ifneq ($(BR2_LARGEFILE),y) $(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile @@ -29,19 +29,19 @@ endif $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so touch $@ -$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked +$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/ - cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/ + cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/ cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/ - (cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VER) libbz2.so) - (cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1) + (cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so) + (cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1) -$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER) +$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover touch -c $@ @@ -53,10 +53,10 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install rm -f $(TARGET_DIR)/usr/lib/libbz2.a rm -f $(TARGET_DIR)/usr/include/bzlib.h - cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(TARGET_DIR)/usr/lib/ + cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/ (cd $(TARGET_DIR)/usr/lib; \ - ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VER) libbz2.so) + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ + ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so) (cd $(TARGET_DIR)/usr/bin; \ ln -snf bzip2 bunzip2; \ ln -snf bzip2 bzcat; \ diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 092b07f3f..fc2f634d5 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -3,12 +3,12 @@ # coreutils # ############################################################# -COREUTILS_VER:=6.9 -COREUTILS_SOURCE:=coreutils-$(COREUTILS_VER).tar.bz2 +COREUTILS_VERSION:=6.9 +COREUTILS_SOURCE:=coreutils-$(COREUTILS_VERSION).tar.bz2 #COREUTILS_SITE:=ftp://alpha.gnu.org/gnu/coreutils/ COREUTILS_SITE:=http://ftp.gnu.org/pub/gnu/coreutils COREUTILS_CAT:=$(BZCAT) -COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VER) +COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION) COREUTILS_BINARY:=src/vdir COREUTILS_TARGET_BINARY:=bin/vdir BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \ diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index f7ada9105..7e2ecb8df 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -3,11 +3,11 @@ # cvs # ############################################################# -CVS_VER:=1.12.13 -CVS_SOURCE:=cvs_$(CVS_VER).orig.tar.gz -CVS_PATCH:=cvs_$(CVS_VER)-8.diff.gz +CVS_VERSION:=1.12.13 +CVS_SOURCE:=cvs_$(CVS_VERSION).orig.tar.gz +CVS_PATCH:=cvs_$(CVS_VERSION)-8.diff.gz CVS_SITE:=http://ftp.debian.org/debian/pool/main/c/cvs/ -CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VER) +CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VERSION) CVS_CAT:=$(ZCAT) CVS_BINARY:=src/cvs CVS_TARGET_BINARY:=usr/bin/cvs @@ -35,15 +35,15 @@ cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) -mkdir $(CVS_DIR) $(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(CVS_DIR) $(TAR_OPTIONS) - - $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VER)/cvs-$(CVS_VER).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - rm -rf $(CVS_DIR)/cvs-$(CVS_VER) + $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION) $(CONFIG_UPDATE) $(CVS_DIR) - toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VER)\*.patch + toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch ifneq ($(CVS_PATCH),) toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH) if [ -d $(CVS_DIR)/debian/patches ]; then \ (cd $(CVS_DIR)/debian/patches && for i in * ; \ - do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VER)/,+++ cvs-$(CVS_VER)/,' $$i ; \ + do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i ; \ done ; \ ) ; \ toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \* ; \ diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 5ce80493a..25118ef62 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -3,12 +3,12 @@ # dash # ############################################################# -DASH_VER:=0.5.3 -DASH_SOURCE:=dash_$(DASH_VER).orig.tar.gz +DASH_VERSION:=0.5.3 +DASH_SOURCE:=dash_$(DASH_VERSION).orig.tar.gz DASH_SITE:=http://ftp.debian.org/debian/pool/main/d/dash DASH_CAT:=$(ZCAT) -DASH_DIR:=$(BUILD_DIR)/dash-$(DASH_VER) -DASH_PATCH1:=dash_$(DASH_VER)-7.diff.gz +DASH_DIR:=$(BUILD_DIR)/dash-$(DASH_VERSION) +DASH_PATCH1:=dash_$(DASH_VERSION)-7.diff.gz DASH_BINARY:=src/dash DASH_TARGET_BINARY:=bin/dash diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 3a45846ec..3e8cb9595 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -3,10 +3,10 @@ # dbus-glib # ############################################################# -DBUS_GLIB_VER:=0.72 -DBUS_GLIB_SOURCE:=dbus-glib-$(DBUS_GLIB_VER).tar.gz +DBUS_GLIB_VERSION:=0.72 +DBUS_GLIB_SOURCE:=dbus-glib-$(DBUS_GLIB_VERSION).tar.gz DBUS_GLIB_SITE:=http://dbus.freedesktop.org/releases/dbus-glib/ -DBUS_GLIB_DIR:=$(BUILD_DIR)/dbus-glib-$(DBUS_GLIB_VER) +DBUS_GLIB_DIR:=$(BUILD_DIR)/dbus-glib-$(DBUS_GLIB_VERSION) DBUS_GLIB_CAT:=$(ZCAT) DBUS_GLIB_BINARY:=dbus/.libs/dbus-binding-tool DBUS_GLIB_TARGET_BINARY:=usr/bin/dbus-binding-tool diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 4899a70c9..dd07b5611 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -3,11 +3,11 @@ # dhcp # ############################################################# -DHCP_VER:=3.0.5 -DHCP_SOURCE:=dhcp-$(DHCP_VER).tar.gz +DHCP_VERSION:=3.0.5 +DHCP_SOURCE:=dhcp-$(DHCP_VERSION).tar.gz DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp DHCP_CAT:=$(ZCAT) -DHCP_DIR:=$(BUILD_DIR)/dhcp-$(DHCP_VER) +DHCP_DIR:=$(BUILD_DIR)/dhcp-$(DHCP_VERSION) DHCP_SERVER_BINARY:=work.linux-2.2/server/dhcpd DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay DHCP_CLIENT_BINARY:=work.linux-2.2/client/dhclient diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index f58ea955b..42bc32a92 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -3,12 +3,12 @@ # diffutils # ############################################################# -DIFFUTILS_VER=2.8.7 -DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VER).tar.gz +DIFFUTILS_VERSION=2.8.7 +DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VERSION).tar.gz #DIFFUTILS_SITE:=ftp://alpha.gnu.org/gnu/diffutils/ DIFFUTILS_SITE:=http://mirrors.ircam.fr/pub/gnu/alpha/gnu/diffutils DIFFUTILS_CAT:=$(ZCAT) -DIFFUTILS_DIR:=$(BUILD_DIR)/diffutils-$(DIFFUTILS_VER) +DIFFUTILS_DIR:=$(BUILD_DIR)/diffutils-$(DIFFUTILS_VERSION) DIFFUTILS_BINARY:=src/diff DIFFUTILS_TARGET_BINARY:=usr/bin/diff diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 75166d27e..4cf540ad9 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -3,11 +3,11 @@ # distcc # ############################################################# -DISTCC_VER:=2.18.3 -DISTCC_SOURCE:=distcc-$(DISTCC_VER).tar.bz2 +DISTCC_VERSION:=2.18.3 +DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2 DISTCC_CAT:=$(BZCAT) DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/ -DISTCC_DIR:=$(BUILD_DIR)/distcc-$(DISTCC_VER) +DISTCC_DIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION) DISTCC_BINARY:=distcc DISTCC_TARGET_BINARY:=usr/bin/distcc diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 0b425f1d5..daff9f8e2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -3,10 +3,10 @@ # dmalloc # ############################################################# -DMALLOC_VER:=5.4.3 -DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VER).tgz +DMALLOC_VERSION:=5.4.3 +DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VERSION).tgz DMALLOC_SITE:=http://dmalloc.com/releases -DMALLOC_DIR:=$(BUILD_DIR)/dmalloc-$(DMALLOC_VER) +DMALLOC_DIR:=$(BUILD_DIR)/dmalloc-$(DMALLOC_VERSION) DMALLOC_CAT:=$(ZCAT) DMALLOC_BINARY:=dmalloc DMALLOC_TARGET_BINARY:=usr/bin/dmalloc diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 2bf5de8a4..fdedd92a0 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -7,10 +7,10 @@ DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq ifeq ($(filter $(TARGETS),dnsmasq1),) DNSMASQ_UPVER=2.22 -DNSMASQ_VER=dnsmasq2 +DNSMASQ_VERSION=dnsmasq2 else DNSMASQ_UPVER=1.18 -DNSMASQ_VER=dnsmasq1 +DNSMASQ_VERSION=dnsmasq1 endif DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_UPVER).tar.gz DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER) @@ -23,7 +23,7 @@ $(DL_DIR)/$(DNSMASQ_SOURCE): $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE) $(ZCAT) $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \ - $(DNSMASQ_VER)\*.patch + $(DNSMASQ_VERSION)\*.patch touch $(DNSMASQ_DIR)/.source $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 3e5b99164..9f42040a9 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -3,10 +3,10 @@ # dropbear # ############################################################# -DROPBEAR_VER:=0.49 -DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VER).tar.gz +DROPBEAR_VERSION:=0.49 +DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.gz DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/ -DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VER) +DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION) DROPBEAR_CAT:=$(ZCAT) DROPBEAR_BINARY:=dropbearmulti DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index d6ead0ff6..ad7ce6bc2 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -3,10 +3,10 @@ # e2fsprogs # ############################################################# -E2FSPROGS_VER:=1.39 -E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VER).tar.gz +E2FSPROGS_VERSION:=1.39 +E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VERSION).tar.gz E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs -E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VER) +E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_CAT:=$(ZCAT) E2FSPROGS_BINARY:=misc/mke2fs E2FSPROGS_TARGET_BINARY:=sbin/mke2fs diff --git a/package/file/file.mk b/package/file/file.mk index 04166e8e9..97545bf1b 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -3,12 +3,12 @@ # file # ############################################################# -FILE_VER:=4.21 -FILE_SOURCE:=file-$(FILE_VER).tar.gz +FILE_VERSION:=4.21 +FILE_SOURCE:=file-$(FILE_VERSION).tar.gz FILE_SITE:=ftp://ftp.astron.com/pub/file -FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VER) -FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)-host -FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)-target +FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VERSION) +FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VERSION)-host +FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VERSION)-target FILE_CAT:=$(ZCAT) FILE_BINARY:=src/file FILE_TARGET_BINARY:=usr/bin/file diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index d3c5946b8..8eddef103 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -3,12 +3,12 @@ # findutils # ############################################################# -FINDUTILS_VER:=4.2.31 -FINDUTILS_SOURCE:=findutils-$(FINDUTILS_VER).tar.gz +FINDUTILS_VERSION:=4.2.31 +FINDUTILS_SOURCE:=findutils-$(FINDUTILS_VERSION).tar.gz #FINDUTILS_SITE:=ftp://alpha.gnu.org/gnu/findutils FINDUTILS_SITE:=http://ftp.gnu.org/pub/gnu/findutils/ FINDUTILS_CAT:=$(ZCAT) -FINDUTILS_DIR:=$(BUILD_DIR)/findutils-$(FINDUTILS_VER) +FINDUTILS_DIR:=$(BUILD_DIR)/findutils-$(FINDUTILS_VERSION) FINDUTILS_BINARY:=find/find FINDUTILS_TARGET_BINARY:=usr/bin/find diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 7a83c0c77..9628a2f7d 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -3,11 +3,11 @@ # gawk # ############################################################# -GAWK_VER:=3.1.5 -GAWK_SOURCE:=gawk-$(GAWK_VER).tar.bz2 +GAWK_VERSION:=3.1.5 +GAWK_SOURCE:=gawk-$(GAWK_VERSION).tar.bz2 GAWK_SITE:=http://ftp.gnu.org/pub/gnu/gawk GAWK_CAT:=$(BZCAT) -GAWK_DIR:=$(BUILD_DIR)/gawk-$(GAWK_VER) +GAWK_DIR:=$(BUILD_DIR)/gawk-$(GAWK_VERSION) GAWK_BINARY:=gawk GAWK_TARGET_BINARY:=usr/bin/gawk diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 8eb2b0ccf..63bb2248b 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -3,10 +3,10 @@ # gettext # ############################################################# -GETTEXT_VER:=0.16.1 -GETTEXT_SOURCE:=gettext-$(GETTEXT_VER).tar.gz +GETTEXT_VERSION:=0.16.1 +GETTEXT_SOURCE:=gettext-$(GETTEXT_VERSION).tar.gz GETTEXT_SITE:=http://ftp.gnu.org/pub/gnu/gettext -GETTEXT_DIR:=$(BUILD_DIR)/gettext-$(GETTEXT_VER) +GETTEXT_DIR:=$(BUILD_DIR)/gettext-$(GETTEXT_VERSION) GETTEXT_CAT:=$(ZCAT) GETTEXT_BINARY:=gettext-runtime/src/gettext GETTEXT_TARGET_BINARY:=usr/bin/gettext diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 5a1b7d651..5cd4b3fea 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -3,9 +3,10 @@ # grep # ############################################################# -GNUGREP_SOURCE:=grep_2.5.1.ds1.orig.tar.gz +GNUGREP_VERSION:=2.5.1 +GNUGREP_SOURCE:=grep_$(GNUGREP_VERSION).ds1.orig.tar.gz GNUGREP_SITE:=http://ftp.debian.org/debian/pool/main/g/grep/ -GNUGREP_DIR:=$(BUILD_DIR)/grep-2.5.1 +GNUGREP_DIR:=$(BUILD_DIR)/grep-$(GNUGREP_VERSION) GNUGREP_CAT:=$(ZCAT) GNUGREP_BINARY:=src/grep GNUGREP_TARGET_BINARY:=bin/grep @@ -19,7 +20,7 @@ $(GNUGREP_DIR)/.unpacked: $(DL_DIR)/$(GNUGREP_SOURCE) rm -rf $(GNUGREP_DIR).xxx $(GNUGREP_CAT) $(DL_DIR)/$(GNUGREP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - mv $(GNUGREP_DIR) $(GNUGREP_DIR).xxx - $(GNUGREP_CAT) $(GNUGREP_DIR).xxx/grep_2.5.1.tar.gz | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(GNUGREP_CAT) $(GNUGREP_DIR).xxx/grep_$(GNUGREP_VERSION).tar.gz | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -rf $(GNUGREP_DIR).xxx touch $(GNUGREP_DIR)/.unpacked diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 859e1a357..9f4fb8fc4 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -3,11 +3,11 @@ # gzip # ############################################################# -GZIP_VER:=1.3.5 -GZIP_SOURCE:=gzip-$(GZIP_VER).tar.gz +GZIP_VERSION:=1.3.5 +GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz #GZIP_SITE:=ftp://alpha.gnu.org/gnu/gzip GZIP_SITE:=http://mirrors.ircam.fr/pub/gnu/alpha/gnu/gzip -GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VER) +GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VERSION) GZIP_CAT:=$(ZCAT) GZIP_BINARY:=$(GZIP_DIR)/gzip GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 094fe53da..30fc9d04c 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -3,10 +3,10 @@ # hal # ############################################################# -HAL_VER:=0.5.8 -HAL_SOURCE:=hal-$(HAL_VER).tar.gz +HAL_VERSION:=0.5.8 +HAL_SOURCE:=hal-$(HAL_VERSION).tar.gz HAL_SITE:=http://people.freedesktop.org/~david/dist/ -HAL_DIR:=$(BUILD_DIR)/hal-$(HAL_VER) +HAL_DIR:=$(BUILD_DIR)/hal-$(HAL_VERSION) HAL_CAT:=$(ZCAT) HAL_BINARY:=hald/hald HAL_TARGET_BINARY:=usr/sbin/hald diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index e4cb063c9..15b7a5429 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -3,9 +3,10 @@ # hotplug support # ############################################################# -HOTPLUG_SOURCE=package/hotplug/diethotplug-0.5.tar +HOTPLUG_VERSION:=0.5 +HOTPLUG_SOURCE=package/hotplug/diethotplug-$(HOTPLUG_VERSION).tar HOTPLUG_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/ -HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.5 +HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-$(HOTPLUG_VERSION) HOTPLUG_CAT=cat $(HOTPLUG_DIR): $(HOTPLUG_SOURCE) diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index a6db71edc..104fb4601 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -3,10 +3,10 @@ # iostat # ############################################################# -IOSTAT_VER:=2.2 -IOSTAT_SOURCE:=iostat-$(IOSTAT_VER).tar.gz +IOSTAT_VERSION:=2.2 +IOSTAT_SOURCE:=iostat-$(IOSTAT_VERSION).tar.gz IOSTAT_SITE:=http://linux.inet.hr/files -IOSTAT_DIR:=$(BUILD_DIR)/iostat-$(IOSTAT_VER) +IOSTAT_DIR:=$(BUILD_DIR)/iostat-$(IOSTAT_VERSION) IOSTAT_BINARY:=iostat IOSTAT_TARGET_BINARY:=usr/bin/iostat diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index e8127de72..24dbddcfb 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -3,11 +3,11 @@ # iproute2 # ############################################################# -IPROUTE2_VER:=2.6.18 +IPROUTE2_VERSION:=2.6.18 IPROUTE2_STAMP:=061002 -IPROUTE2_SOURCE:=iproute2-$(IPROUTE2_VER)-$(IPROUTE2_STAMP).tar.gz +IPROUTE2_SOURCE:=iproute2-$(IPROUTE2_VERSION)-$(IPROUTE2_STAMP).tar.gz IPROUTE2_SITE:=http://developer.osdl.org/dev/iproute2/download/ -IPROUTE2_DIR:=$(BUILD_DIR)/iproute2-$(IPROUTE2_VER)-$(IPROUTE2_STAMP) +IPROUTE2_DIR:=$(BUILD_DIR)/iproute2-$(IPROUTE2_VERSION)-$(IPROUTE2_STAMP) IPROUTE2_CAT:=$(ZCAT) IPROUTE2_BINARY:=tc/tc IPROUTE2_TARGET_BINARY:=sbin/tc diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 125e1695c..8d5670f48 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -4,10 +4,10 @@ # ############################################################# -IPSEC_TOOLS_VER:=0.6.7 -IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2 +IPSEC_TOOLS_VERSION:=0.6.7 +IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2 IPSEC_TOOLS_CAT:=$(BZCAT) -IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER) +IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VERSION) IPSEC_TOOLS_BINARY_SETKEY:=src/setkey/setkey IPSEC_TOOLS_BINARY_RACOON:=src/racoon/racoon @@ -63,7 +63,7 @@ $(DL_DIR)/$(IPSEC_TOOLS_SOURCE): $(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) $(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VER)\*.patch + toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VERSION)\*.patch $(CONFIG_UPDATE) $(IPSEC_TOOLS_DIR) touch $@ diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 5f59e36b4..02a180010 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -20,9 +20,10 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -JPEG_DIR=$(BUILD_DIR)/jpeg-6b +JPEG_VERSION:=6b +JPEG_DIR=$(BUILD_DIR)/jpeg-$(JPEG_VERSION) JPEG_SITE:=ftp://ftp.uu.net/graphics/jpeg/ -JPEG_SOURCE=jpegsrc.v6b.tar.gz +JPEG_SOURCE=jpegsrc.v$(JPEG_VERSION).tar.gz JPEG_CAT:=$(ZCAT) $(DL_DIR)/$(JPEG_SOURCE): diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 50dbfa539..36f2d8cc5 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -3,11 +3,11 @@ # kexec # ############################################################# -KEXEC_VER:=1.101 -KEXEC_SOURCE:=kexec-tools_$(KEXEC_VER)-kdump10.orig.tar.gz -KEXEC_PATCH:=kexec-tools_$(KEXEC_VER)-kdump10-2.diff.gz +KEXEC_VERSION:=1.101 +KEXEC_SOURCE:=kexec-tools_$(KEXEC_VERSION)-kdump10.orig.tar.gz +KEXEC_PATCH:=kexec-tools_$(KEXEC_VERSION)-kdump10-2.diff.gz KEXEC_SITE:=ftp://ftp.debian.org/debian/pool/main/k/kexec-tools/ -KEXEC_DIR:=$(BUILD_DIR)/kexec-tools-$(KEXEC_VER) +KEXEC_DIR:=$(BUILD_DIR)/kexec-tools-$(KEXEC_VERSION) KEXEC_CAT:=$(ZCAT) KEXEC_BINARY:=kexec KEXEC_TARGET_BINARY:=sbin/kexec diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index 0a0763ace..c7d49b51a 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -3,11 +3,11 @@ # l2tp # ############################################################# -L2TP_VER:=0.70-pre20031121 -L2TP_SOURCE:=l2tpd_$(L2TP_VER).orig.tar.gz -L2TP_PATCH:=l2tpd_$(L2TP_VER)-2.1.diff.gz +L2TP_VERSION:=0.70-pre20031121 +L2TP_SOURCE:=l2tpd_$(L2TP_VERSION).orig.tar.gz +L2TP_PATCH:=l2tpd_$(L2TP_VERSION)-2.1.diff.gz L2TP_SITE:=ftp://ftp.debian.org/debian/pool/main/l/l2tpd/ -L2TP_DIR:=$(BUILD_DIR)/l2tpd-$(L2TP_VER) +L2TP_DIR:=$(BUILD_DIR)/l2tpd-$(L2TP_VERSION) L2TP_CAT:=$(ZCAT) L2TP_BINARY:=l2tpd L2TP_TARGET_BINARY:=usr/sbin/l2tpd diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 7143b5581..9a74c0b2f 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -11,10 +11,10 @@ # either version 2.1 of the License, or (at your option) any # later version. -LIBDAEMON_VER:=0.10 -LIBDAEMON_DIR:=$(BUILD_DIR)/libdaemon-$(LIBDAEMON_VER) +LIBDAEMON_VERSION:=0.10 +LIBDAEMON_DIR:=$(BUILD_DIR)/libdaemon-$(LIBDAEMON_VERSION) LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/ -LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VER).tar.gz +LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz LIBDAEMON_CAT:=$(ZCAT) $(DL_DIR)/$(LIBDAEMON_SOURCE): diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 4876fa999..4f613f288 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -3,10 +3,10 @@ # libelf # ############################################################# -LIBELF_VER=0.8.9 -LIBELF_SOURCE=libelf-$(LIBELF_VER).tar.gz +LIBELF_VERSION=0.8.9 +LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz LIBELF_SITE=http://www.mr511.de/software/ -LIBELF_DIR=$(BUILD_DIR)/libelf-$(LIBELF_VER) +LIBELF_DIR=$(BUILD_DIR)/libelf-$(LIBELF_VERSION) LIBELF_ARCH:=$(ARCH) ifeq ("$(strip $(ARCH))","armeb") @@ -39,22 +39,22 @@ $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.unpacked ); touch $@ -$(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/.configured +$(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VERSION): $(LIBELF_DIR)/.configured $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBELF_DIR) -$(STAGING_DIR)/usr/lib/libelf.a $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VER) +$(STAGING_DIR)/usr/lib/libelf.a $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VERSION) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ instroot=$(STAGING_DIR) -C $(LIBELF_DIR) install ifeq ($(BR2_PACKAGE_LIBELF_HEADERS),y) -$(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER): $(STAGING_DIR)/usr/lib/libelf.a +$(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(STAGING_DIR)/usr/lib/libelf.a $(INSTALL) $(STAGING_DIR)/usr/lib/libelf* $(@D) cp -dpR $(STAGING_DIR)/usr/include/{gelf.h,libelf*} $(TARGET_DIR)/usr/include/ $(STRIP) $@ -libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VER) +libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) else -libelf: uclibc $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VER) +libelf: uclibc $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION) endif libelf-source: $(DL_DIR)/$(LIBELF_SOURCE) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 2c8122780..5867817fd 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -3,10 +3,10 @@ # libevent # ############################################################# -LIBEVENT_VER:=1.2 -LIBEVENT_SOURCE:=libevent-$(LIBEVENT_VER).tar.gz +LIBEVENT_VERSION:=1.2 +LIBEVENT_SOURCE:=libevent-$(LIBEVENT_VERSION).tar.gz LIBEVENT_SITE:=http://monkey.org/~provos/ -LIBEVENT_DIR:=$(BUILD_DIR)/libevent-$(LIBEVENT_VER) +LIBEVENT_DIR:=$(BUILD_DIR)/libevent-$(LIBEVENT_VERSION) LIBEVENT_CAT:=$(ZCAT) LIBEVENT_BINARY:=libevent.la LIBEVENT_TARGET_BINARY:=usr/lib/libevent.so diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 9b738d070..4cd2fc1dd 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -3,10 +3,11 @@ # libglib1.2 # ############################################################# -LIBGLIB12_SOURCE:=glib-1.2.10.tar.gz +LIBGLIB12_VERSION:=1.2.10 +LIBGLIB12_SOURCE:=glib-$(LIBGLIB12_VERSION).tar.gz LIBGLIB12_SITE:=http://ftp.gtk.org/pub/gtk/v1.2 LIBGLIB12_CAT:=$(ZCAT) -LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10 +LIBGLIB12_DIR:=$(BUILD_DIR)/glib-$(LIBGLIB12_VERSION) LIBGLIB12_BINARY:=libglib.a $(DL_DIR)/$(LIBGLIB12_SOURCE): diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index 5fc5e6f87..6e9c14d09 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -3,10 +3,11 @@ # libgtk1.2 # ############################################################# -LIBGTK12_SOURCE:=gtk+-1.2.10.tar.gz +LIBGTK12_VERSION:=1.2.10 +LIBGTK12_SOURCE:=gtk+-$(LIBGTK12_VERSION).tar.gz LIBGTK12_SITE:=http://ftp.gnome.org/pub/gnome/sources/gtk+/1.2 LIBGTK12_CAT:=$(ZCAT) -LIBGTK12_DIR:=$(BUILD_DIR)/gtk+-1.2.10 +LIBGTK12_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK12_VERSION) LIBGTK12_BINARY:=libgtk.a diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index b1f87357c..7e2f7ca87 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -21,10 +21,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -LIBPCAP_VER:=0.9.5 -LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VER) +LIBPCAP_VERSION:=0.9.5 +LIBPCAP_DIR:=$(BUILD_DIR)/libpcap-$(LIBPCAP_VERSION) LIBPCAP_SITE:=http://www.tcpdump.org/release -LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VER).tar.gz +LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz LIBPCAP_CAT:=$(ZCAT) $(DL_DIR)/$(LIBPCAP_SOURCE): diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b70f90550..57610aac5 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -21,10 +21,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -LIBPNG_VER:=1.2.16 -LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VER) +LIBPNG_VERSION:=1.2.16 +LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION) LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng -LIBPNG_SOURCE:=libpng-$(LIBPNG_VER).tar.bz2 +LIBPNG_SOURCE:=libpng-$(LIBPNG_VERSION).tar.bz2 LIBPNG_CAT:=$(BZCAT) $(DL_DIR)/$(LIBPNG_SOURCE): diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index ea4801008..792cc26e5 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -3,10 +3,10 @@ # libsndfile # ############################################################# -LIBSNDFILE_VER:=1.0.17 -LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VER).tar.gz +LIBSNDFILE_VERSION:=1.0.17 +LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VERSION).tar.gz LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile/$(LIBUSB_SOURCE) -LIBSNDFILE_DIR:=$(BUILD_DIR)/libsndfile-$(LIBSNDFILE_VER) +LIBSNDFILE_DIR:=$(BUILD_DIR)/libsndfile-$(LIBSNDFILE_VERSION) LIBSNDFILE_BINARY:=src/.libs/libsndfile.so LIBSNDFILE_TARGET_BINARY:=usr/lib/libsndfile.so diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 1fc266de3..60bf288d6 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -21,10 +21,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -LIBSYSFS_VER:=2.1.0 -LIBSYSFS_DIR:=$(BUILD_DIR)/sysfsutils-$(LIBSYSFS_VER) +LIBSYSFS_VERSION:=2.1.0 +LIBSYSFS_DIR:=$(BUILD_DIR)/sysfsutils-$(LIBSYSFS_VERSION) LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-diag -LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VER).tar.gz +LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz LIBSYSFS_CAT:=$(ZCAT) $(DL_DIR)/$(LIBSYSFS_SOURCE): diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 82f96ae41..57fd31fb5 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -3,13 +3,13 @@ # libtool # ############################################################# -LIBTOOL_VER:=1.5.22 -LIBTOOL_SOURCE:=libtool-$(LIBTOOL_VER).tar.gz +LIBTOOL_VERSION:=1.5.22 +LIBTOOL_SOURCE:=libtool-$(LIBTOOL_VERSION).tar.gz LIBTOOL_SITE:=http://ftp.gnu.org/pub/gnu/libtool LIBTOOL_CAT:=$(ZCAT) -LIBTOOL_SRC_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VER) -LIBTOOL_DIR:=$(BUILD_DIR)/libtool-$(LIBTOOL_VER) -LIBTOOL_HOST_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VER)-host +LIBTOOL_SRC_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VERSION) +LIBTOOL_DIR:=$(BUILD_DIR)/libtool-$(LIBTOOL_VERSION) +LIBTOOL_HOST_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VERSION)-host LIBTOOL_BINARY:=libtool LIBTOOL_TARGET_BINARY:=usr/bin/libtool diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 76eecbc17..609ffe9bd 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -3,10 +3,10 @@ # libusb # ############################################################# -LIBUSB_VER:=0.1.12 -LIBUSB_SOURCE:=libusb-$(LIBUSB_VER).tar.gz +LIBUSB_VERSION:=0.1.12 +LIBUSB_SOURCE:=libusb-$(LIBUSB_VERSION).tar.gz LIBUSB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libusb/ -LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VER) +LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VERSION) LIBUSB_CAT:=$(ZCAT) LIBUSB_BINARY:=usr/lib/libusb.so diff --git a/package/links/links.mk b/package/links/links.mk index f6ce05dee..1d0ad016e 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -3,9 +3,10 @@ # links (text based web browser) # ############################################################# +LINKS_VERSION:=0.99pre9-no-ssl LINKS_SITE:=http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/no-ssl -LINKS_SOURCE:=links-0.99pre9-no-ssl.tar.gz -LINKS_DIR:=$(BUILD_DIR)/links-0.99pre9-no-ssl +LINKS_SOURCE:=links-$(LINKS_VERSION).tar.gz +LINKS_DIR:=$(BUILD_DIR)/links-$(LINKS_VERSION) $(DL_DIR)/$(LINKS_SOURCE): $(WGET) -P $(DL_DIR) $(LINKS_SITE)/$(LINKS_SOURCE) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index ba0456e28..c094d4610 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -20,10 +20,10 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - +LRZSZ_VERSION:=0.12.20 LRZSZ_SITE:=http://www.ohse.de/uwe/releases -LRZSZ_SOURCE:=lrzsz-0.12.20.tar.gz -LRZSZ_DIR:=$(BUILD_DIR)/lrzsz-0.12.20 +LRZSZ_SOURCE:=lrzsz-$(LRZSZ_VERSION).tar.gz +LRZSZ_DIR:=$(BUILD_DIR)/lrzsz-$(LRZSZ_VERSION) $(DL_DIR)/$(LRZSZ_SOURCE): $(WGET) -P $(DL_DIR) $(LRZSZ_SITE)/$(LRZSZ_SOURCE) diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index 8cc3925b5..def7fd20e 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -3,12 +3,12 @@ # ltt # ############################################################# -LTT_VER:=0.9.5a -LTT_SOURCE:=TraceToolkit-$(LTT_VER).tgz +LTT_VERSION:=0.9.5a +LTT_SOURCE:=TraceToolkit-$(LTT_VERSION).tgz LTT_SITE:=http://www.opersys.com/ftp/pub/LTT LTT_CAT:=$(ZCAT) -LTT_DIR1:=$(TOOL_BUILD_DIR)/TraceToolkit-$(LTT_VER:a=) -LTT_DIR2:=$(BUILD_DIR)/TraceToolkit-$(LTT_VER:a=) +LTT_DIR1:=$(TOOL_BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=) +LTT_DIR2:=$(BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=) LTT_BINARY:=Visualizer/tracevisualizer LTT_TARGET_BINARY:=Daemon/tracedaemon diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index e612e0af5..49a426ecd 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -3,12 +3,12 @@ # lzma # ############################################################# -LZMA_VER:=4.32.0beta3 -LZMA_SOURCE:=lzma-$(LZMA_VER).tar.gz +LZMA_VERSION:=4.32.0beta3 +LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz LZMA_CAT:=$(ZCAT) LZMA_SITE:=http://tukaani.org/lzma/ -LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VER) -LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VER) +LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VERSION) +LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VERSION) LZMA_CFLAGS:=$(TARGET_CFLAGS) ifeq ($(BR2_LARGEFILE),y) LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/package/m4/m4.mk b/package/m4/m4.mk index 901d2b013..dbdc6b05e 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -3,12 +3,12 @@ # m4 # ############################################################# -M4_VER:=1.4.9 -M4_SOURCE:=m4-$(M4_VER).tar.bz2 +M4_VERSION:=1.4.9 +M4_SOURCE:=m4-$(M4_VERSION).tar.bz2 M4_CAT:=$(BZCAT) M4_SITE:=http://ftp.gnu.org/pub/gnu/m4 -M4_DIR:=$(BUILD_DIR)/m4-$(M4_VER) -M4_HOST_DIR:=$(TOOL_BUILD_DIR)/m4-$(M4_VER) +M4_DIR:=$(BUILD_DIR)/m4-$(M4_VERSION) +M4_HOST_DIR:=$(TOOL_BUILD_DIR)/m4-$(M4_VERSION) M4_BINARY:=m4 M4_TARGET_BINARY:=usr/bin/m4 diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 98813cc44..6b3b6117a 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -3,10 +3,10 @@ # memtester # ############################################################# -MEMTESTER_VER:=4.0.6 -MEMTESTER_SOURCE:=memtester-$(MEMTESTER_VER).tar.gz +MEMTESTER_VERSION:=4.0.6 +MEMTESTER_SOURCE:=memtester-$(MEMTESTER_VERSION).tar.gz MEMTESTER_SITE:=http://pyropus.ca/software/memtester/old-versions/ -MEMTESTER_DIR:=$(BUILD_DIR)/memtester-$(MEMTESTER_VER) +MEMTESTER_DIR:=$(BUILD_DIR)/memtester-$(MEMTESTER_VERSION) MEMTESTER_BINARY:=memtester MEMTESTER_TARGET_BINARY:=usr/bin/memtester diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 63f258875..eb972d134 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -5,12 +5,12 @@ ############################################################# # Seems to be broken -- topbar icons and such are misplaced etc -#METACITY_VER:=2.17.5 +#METACITY_VERSION:=2.17.5 -METACITY_VER:=2.16.3 -METACITY_SOURCE:=metacity-$(METACITY_VER).tar.bz2 +METACITY_VERSION:=2.16.3 +METACITY_SOURCE:=metacity-$(METACITY_VERSION).tar.bz2 METACITY_SITE:=http://ftp.gnome.org/pub/gnome/sources/metacity/2.16 -METACITY_DIR:=$(BUILD_DIR)/metacity-$(METACITY_VER) +METACITY_DIR:=$(BUILD_DIR)/metacity-$(METACITY_VERSION) METACITY_CAT:=$(BZCAT) METACITY_SOURCE2:=MCity-Clearlooks2.tar.gz diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index 195a49e87..80d54e596 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -25,9 +25,10 @@ # TARGETS # http://microcom.port5.com/m102.tar.gz +MICROCOM_VERSION:=1.02 MICROCOM_SITE:=http://microcom.port5.com/ MICROCOM_SOURCE:=m102.tar.gz -MICROCOM_DIR:=$(BUILD_DIR)/microcom-1.02 +MICROCOM_DIR:=$(BUILD_DIR)/microcom-$(MICROCOM_VERSION) $(DL_DIR)/$(MICROCOM_SOURCE): $(WGET) -P $(DL_DIR) $(MICROCOM_SITE)/$(MICROCOM_SOURCE) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index a51241897..ea4f92037 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -4,13 +4,13 @@ # ############################################################# MICROPERL_MAJ=5 -MICROPERL_VER=$(MICROPERL_MAJ).8.8 -MICROPERL_SOURCE=perl-$(MICROPERL_VER).tar.bz2 +MICROPERL_VERSION=$(MICROPERL_MAJ).8.8 +MICROPERL_SOURCE=perl-$(MICROPERL_VERSION).tar.bz2 MICROPERL_CAT:=$(BZCAT) MICROPERL_SITE=ftp://ftp.cpan.org/pub/CPAN/src/5.0 -MICROPERL_DIR=$(BUILD_DIR)/perl-$(MICROPERL_VER) +MICROPERL_DIR=$(BUILD_DIR)/perl-$(MICROPERL_VERSION) -MICROPERL_MODS_DIR=/usr/lib/perl$(MICROPERL_MAJ)/$(MICROPERL_VER) +MICROPERL_MODS_DIR=/usr/lib/perl$(MICROPERL_MAJ)/$(MICROPERL_VERSION) MICROPERL_MODS=$(subst ",,$(BR2_PACKAGE_MICROPERL_MODULES)) # ") ifeq ($(BR2_PACKAGE_AUTOMAKE),y) diff --git a/package/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index a9ec8dc30..6d8ae2175 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -3,10 +3,10 @@ # mkdosfs # ############################################################# -MKDOSFS_VER:=2.11 -MKDOSFS_SOURCE:=dosfstools-$(MKDOSFS_VER).src.tar.gz +MKDOSFS_VERSION:=2.11 +MKDOSFS_SOURCE:=dosfstools-$(MKDOSFS_VERSION).src.tar.gz MKDOSFS_SITE:=http://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools -MKDOSFS_DIR:=$(BUILD_DIR)/dosfstools-$(MKDOSFS_VER) +MKDOSFS_DIR:=$(BUILD_DIR)/dosfstools-$(MKDOSFS_VERSION) MKDOSFS_CAT:=$(ZCAT) MKDOSFS_BINARY:=mkdosfs/mkdosfs MKDOSFS_TARGET_BINARY:=sbin/mkdosfs diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 2a0769e27..a59805245 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -3,11 +3,12 @@ # modutils # ############################################################# -MODUTILS_SOURCE=modutils-2.4.27.tar.bz2 +MODUTILS_VERSION:=2.4.27 +MODUTILS_SOURCE=modutils-$(MODUTILS_VERSION).tar.bz2 MODUTILS_CAT:=$(BZCAT) MODUTILS_SITE=http://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/ -MODUTILS_DIR1=$(BUILD_DIR)/modutils-2.4.27 -MODUTILS_DIR2=$(TOOL_BUILD_DIR)/modutils-2.4.27 +MODUTILS_DIR1=$(BUILD_DIR)/modutils-$(MODUTILS_VERSION) +MODUTILS_DIR2=$(TOOL_BUILD_DIR)/modutils-$(MODUTILS_VERSION) MODUTILS_BINARY=depmod/depmod MODUTILS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODUTILS_BINARY) diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk index 6b44caf18..aa3f9ca7f 100644 --- a/package/mpatrol/mpatrol.mk +++ b/package/mpatrol/mpatrol.mk @@ -3,8 +3,8 @@ # mpatrol # ############################################################# -MPATROL_VER:=1.4.8 -MPATROL_SOURCE:=mpatrol_$(MPATROL_VER).tar.gz +MPATROL_VERSION:=1.4.8 +MPATROL_SOURCE:=mpatrol_$(MPATROL_VERSION).tar.gz MPATROL_SITE:=http://www.cbmamiga.demon.co.uk/mpatrol/files MPATROL_DIR:=$(BUILD_DIR)/mpatrol MPATROL_CAT:=$(ZCAT) diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index bc55771e8..aad50ee0b 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,9 +4,10 @@ # # ############################################################# -MROUTED_SOURCE:=mrouted_3.9-beta3.orig.tar.gz +MROUTED_VERSION:=3.9-beta3.orig +MROUTED_SOURCE:=mrouted_$(MROUTED_VERSION).tar.gz MROUTED_SITE:=http://ftp.debian.org/debian/pool/non-free/m/mrouted -MROUTED_DIR:=$(BUILD_DIR)/mrouted-3.9-beta3.orig +MROUTED_DIR:=$(BUILD_DIR)/mrouted-$(MROUTED_VERSION) MROUTED_CAT:=$(ZCAT) MROUTED_PATCH:=mrouted_3.9-beta3-1.1.diff.gz MROUTED_BINARY:=mrouted diff --git a/package/nano/nano.mk b/package/nano/nano.mk index ff2818720..0813762fd 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -3,10 +3,10 @@ # nano # ############################################################# -NANO_VER:=1.3.12 -NANO_SOURCE:=nano-$(NANO_VER).tar.gz +NANO_VERSION:=1.3.12 +NANO_SOURCE:=nano-$(NANO_VERSION).tar.gz NANO_SITE:=http://www.nano-editor.org/dist/v1.3/ -NANO_DIR:=$(BUILD_DIR)/nano-$(NANO_VER) +NANO_DIR:=$(BUILD_DIR)/nano-$(NANO_VERSION) NANO_CAT:=$(ZCAT) NANO_BINARY:=src/nano NANO_TARGET_BINARY:=bin/nano diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index d1967f9f3..ed3663bd2 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -23,10 +23,10 @@ # USA # TARGETS -NCURSES_VER:=5.6 +NCURSES_VERSION:=5.6 NCURSES_SITE:=http://ftp.gnu.org/pub/gnu/ncurses -NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VER) -NCURSES_SOURCE:=ncurses-$(NCURSES_VER).tar.gz +NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION) +NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz NCURSES_CAT:=$(ZCAT) ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y) @@ -78,11 +78,11 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched ); touch $@ -$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER): $(NCURSES_DIR)/.configured +$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \ libs panel menu form headers -$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VER): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER) +$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION) $(MAKE1) \ prefix=$(STAGING_DIR)/usr/ \ exec_prefix=$(STAGING_DIR) \ @@ -102,7 +102,7 @@ $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VER): $(NCURSES_DIR)/lib/libncurses.s chmod a-x $(NCURSES_DIR)/lib/libncurses.so* touch -c $@ -$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VER) +$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION) cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/ -cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/usr/share/terminfo/x @@ -134,11 +134,11 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a ) (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h) rm -f $(TARGET_DIR)/lib/libncurses.so - (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VER) libncurses.so) - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER) + (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so) + -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) touch -c $@ -ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER) +ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION) ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index ac30c58e5..61dfb1684 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -3,9 +3,10 @@ # netkitbase # ############################################################# -NETKITBASE_SOURCE:=netkit-base-0.17.tar.gz +NETKITBASE_VERSION:=0.17 +NETKITBASE_SOURCE:=netkit-base-$(NETKITBASE_VERSION).tar.gz NETKITBASE_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-0.17 +NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-$(NETKITBASE_VERSION) NETKITBASE_CAT:=$(ZCAT) NETKITBASE_BINARY:=inetd/inetd NETKITBASE_TARGET_BINARY:=usr/sbin/inetd diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 67d001072..55b8e619f 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -3,9 +3,10 @@ # netkittelnet # ############################################################# -NETKITTELNET_SOURCE:=netkit-telnet-0.17.tar.gz +NETKITTELNET_VERSION:=0.17 +NETKITTELNET_SOURCE:=netkit-telnet-$(NETKITTELNET_VERSION).tar.gz NETKITTELNET_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-0.17 +NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-$(NETKITTELNET_VERSION) NETKITTELNET_CAT:=$(ZCAT) NETKITTELNET_BINARY:=telnetd/telnetd NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index bf9b92cf3..501fe7f70 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -3,10 +3,10 @@ # netplug # ############################################################# -NETPLUG_VER=1.2.9 -NETPLUG_SOURCE=netplug-$(NETPLUG_VER).tar.bz2 +NETPLUG_VERSION=1.2.9 +NETPLUG_SOURCE=netplug-$(NETPLUG_VERSION).tar.bz2 NETPLUG_SITE=http://www.red-bean.com/~bos/netplug -NETPLUG_DIR=$(BUILD_DIR)/netplug-$(NETPLUG_VER) +NETPLUG_DIR=$(BUILD_DIR)/netplug-$(NETPLUG_VERSION) NETPLUG_CAT:=$(BZCAT) NETPLUG_BINARY:=netplugd NETPLUG_TARGET_BINARY:=sbin/netplugd diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 26459f8a9..6ddda8aae 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -3,11 +3,12 @@ # netsnmp # ############################################################# - +NETSNMP_VERSION:=5.1.2 +NETSNMP_PATCH_VERSION:=6.2 NETSNMP_URL:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp/ -NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1.2 -NETSNMP_SOURCE:=net-snmp-5.1.2.tar.gz -NETSNMP_PATCH1:=net-snmp_5.1.2-6.2.diff.gz +NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-$(NETSNMP_VERSION) +NETSNMP_SOURCE:=net-snmp-$(NETSNMP_VERSION).tar.gz +NETSNMP_PATCH1:=net-snmp_$(NETSNMP_VERSION)-$(NETSNMP_PATCH_VERSION).diff.gz NETSNMP_PATCH1_URL:=http://ftp.debian.org/debian/pool/main/n/net-snmp/ $(DL_DIR)/$(NETSNMP_SOURCE): diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 21805d72e..3dc901324 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -3,11 +3,11 @@ # nfs-utils # ############################################################# -NFS_UTILS_VER:=1.0.10 -NFS_UTILS_SOURCE:=nfs-utils-$(NFS_UTILS_VER).tar.gz +NFS_UTILS_VERSION:=1.0.10 +NFS_UTILS_SOURCE:=nfs-utils-$(NFS_UTILS_VERSION).tar.gz NFS_UTILS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/ NFS_UTILS_CAT:=$(ZCAT) -NFS_UTILS_DIR:=$(BUILD_DIR)/nfs-utils-$(NFS_UTILS_VER) +NFS_UTILS_DIR:=$(BUILD_DIR)/nfs-utils-$(NFS_UTILS_VERSION) NFS_UTILS_BINARY:=utils/nfsd/nfsd NFS_UTILS_TARGET_BINARY:=usr/sbin/rpc.nfsd diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 209f4eac6..21fda42d9 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -3,10 +3,10 @@ # openssh # ############################################################# - +OPENSSH_VERSION:=3.9p1 OPENSSH_SITE:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.9p1 -OPENSSH_SOURCE:=openssh-3.9p1.tar.gz +OPENSSH_DIR:=$(BUILD_DIR)/openssh-$(OPENSSH_VERSION) +OPENSSH_SOURCE:=openssh-$(OPENSSH_VERSION).tar.gz $(DL_DIR)/$(OPENSSH_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSSH_SITE)/$(OPENSSH_SOURCE) diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 61d5f727e..22684c57d 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -5,11 +5,11 @@ ############################################################# # TARGETS -OPENSSL_VER:=0.9.7e +OPENSSL_VERSION:=0.9.7e OPENSSL_SITE:=http://www.openssl.org/source -OPENSSL_SOURCE:=openssl-$(OPENSSL_VER).tar.gz +OPENSSL_SOURCE:=openssl-$(OPENSSL_VERSION).tar.gz OPENSSL_CAT:=$(ZCAT) -OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VER) +OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VERSION) OPENSSL_TARGET_ARCH:= ifeq ($(BR2_i386),y) diff --git a/package/patch/patch.mk b/package/patch/patch.mk index 6871d80b0..84e35285b 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -3,10 +3,11 @@ # patch # ############################################################# -GNUPATCH_SOURCE:=patch_2.5.9.orig.tar.gz +GNUPATCH_VERSION:=2.5.9 +GNUPATCH_SOURCE:=patch_$(GNUPATCH_VERSION).orig.tar.gz GNUPATCH_SITE:=http://ftp.debian.org/debian/pool/main/p/patch GNUPATCH_CAT:=$(ZCAT) -GNUPATCH_DIR:=$(BUILD_DIR)/patch-2.5.9 +GNUPATCH_DIR:=$(BUILD_DIR)/patch-$(GNUPATCH_VERSION) GNUPATCH_BINARY:=patch GNUPATCH_TARGET_BINARY:=usr/bin/patch diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 032207804..eb5cf80e5 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -3,11 +3,11 @@ # pciutils # ############################################################# -PCIUTILS_VER:=2.1.11 -PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VER).tar.gz +PCIUTILS_VERSION:=2.1.11 +PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VERSION).tar.gz PCIUTILS_CAT:=$(ZCAT) PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci -PCIUTILS_DIR:=$(BUILD_DIR)/pciutils-$(PCIUTILS_VER) +PCIUTILS_DIR:=$(BUILD_DIR)/pciutils-$(PCIUTILS_VERSION) # Yet more targets... PCIIDS_SITE:=http://pciids.sourceforge.net/ diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index 61f855943..b19f6ddfc 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -3,10 +3,10 @@ # pkgconfig # ############################################################# -PKGCONFIG_VER:=0.21 -PKGCONFIG_SOURCE:=pkg-config-$(PKGCONFIG_VER).tar.gz +PKGCONFIG_VERSION:=0.21 +PKGCONFIG_SOURCE:=pkg-config-$(PKGCONFIG_VERSION).tar.gz PKGCONFIG_SITE:=http://pkgconfig.freedesktop.org/releases/ -PKGCONFIG_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VER) +PKGCONFIG_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_CAT:=$(ZCAT) PKGCONFIG_BINARY:=pkg-config PKGCONFIG_TARGET_BINARY:=usr/bin/pkg-config diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 677b914e7..bba0eead5 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -3,10 +3,10 @@ # portmap # ############################################################# -PORTMAP_VER:=5b -PORTMAP_SOURCE:=portmap_$(PORTMAP_VER)eta.tar.gz +PORTMAP_VERSION:=5b +PORTMAP_SOURCE:=portmap_$(PORTMAP_VERSION)eta.tar.gz PORTMAP_SITE:=ftp://ftp.porcupine.org/pub/security/ -PORTMAP_DIR:=$(BUILD_DIR)/portmap_$(PORTMAP_VER)eta +PORTMAP_DIR:=$(BUILD_DIR)/portmap_$(PORTMAP_VERSION)eta PORTMAP_CAT:=$(ZCAT) PORTMAP_BINARY:=portmap PORTMAP_TARGET_BINARY:=sbin/portmap diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 6cd92aea4..f1fa2a295 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -3,10 +3,10 @@ # procps # ############################################################# -PROCPS_VER:=3.2.5 -PROCPS_SOURCE:=procps-$(PROCPS_VER).tar.gz +PROCPS_VERSION:=3.2.5 +PROCPS_SOURCE:=procps-$(PROCPS_VERSION).tar.gz PROCPS_SITE:=http://procps.sourceforge.net/ -PROCPS_DIR:=$(BUILD_DIR)/procps-$(PROCPS_VER) +PROCPS_DIR:=$(BUILD_DIR)/procps-$(PROCPS_VERSION) PROCPS_BINARY:=ps/ps PROCPS_TARGET_BINARY:=usr/bin/vmstat diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 4906cd0bc..311dc79fb 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -3,10 +3,10 @@ # psmisc # ############################################################# -PSMISC_VER:=22.2 -PSMISC_SOURCE:=psmisc-$(PSMISC_VER).tar.gz +PSMISC_VERSION:=22.2 +PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc -PSMISC_DIR:=$(BUILD_DIR)/psmisc-$(PSMISC_VER) +PSMISC_DIR:=$(BUILD_DIR)/psmisc-$(PSMISC_VERSION) PSMISC_BINARY:=src/killall PSMISC_TARGET_BINARY:=bin/killall diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index 22a189fd0..822e74485 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -15,7 +15,7 @@ # ###################################################################### -QTOPIA4_VER:=4.2.2 +QTOPIA4_VERSION:=4.2.2 QTOPIA4_CAT:=$(ZCAT) BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME))) @@ -27,18 +27,18 @@ BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPI ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),) QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME) -QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VER).tar.gz -QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER) -QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VER) +QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VERSION).tar.gz +QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION) +QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION) else # Good, good, we are free: QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source/ -QTOPIA4_SOURCE:=qtopia-core-opensource-src-$(QTOPIA4_VER).tar.gz -QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER) -QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VER) +QTOPIA4_SOURCE:=qtopia-core-opensource-src-$(QTOPIA4_VERSION).tar.gz +QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VERSION) +QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VERSION) endif @@ -160,18 +160,18 @@ endif ); touch $(QTOPIA4_TARGET_DIR)/.configured -$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/.configured +$(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/.configured $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -C $(QTOPIA4_TARGET_DIR) sub-src -$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) +$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ INSTALL_ROOT=$(STAGING_DIR) \ -C $(QTOPIA4_TARGET_DIR) \ sub-src-install_subtargets-ordered \ install_qmake install_mkspecs -$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER) +$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION) mkdir -p $(TARGET_DIR)/usr/lib/fonts touch $(TARGET_DIR)/usr/lib/fonts/fontdir cp -a $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts @@ -182,7 +182,7 @@ $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(STAGING_DIR)/usr/lib/libQtC -rm $(TARGET_DIR)/usr/lib/*Sql* # Nor Svg -rm $(TARGET_DIR)/usr/lib/*Svg* - -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VER) + -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VERSION) ################################# # @@ -245,17 +245,17 @@ endif ); touch $(QTOPIA4_HOST_DIR)/.configured -$(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/.configured +$(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/.configured $(TARGET_CONFIGURE_OPTS) $(MAKE) \ -C $(QTOPIA4_HOST_DIR) -$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) +$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -C $(QTOPIA4_HOST_DIR) install qtopia4: uclibc zlib $(QTOPIA4_TSLIB_DEP) \ - $(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) \ - $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER) + $(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION) \ + $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION) qtopia4-clean: -$(MAKE) -C $(QTOPIA4_HOST_DIR) clean diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index e2b66ddc9..eb9cd7372 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -3,10 +3,10 @@ # quagga suite # ############################################################# -QUAGGA_VER:=0.99.7 -QUAGGA_SOURCE:=quagga-$(QUAGGA_VER).tar.gz +QUAGGA_VERSION:=0.99.7 +QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz QUAGGA_SITE:=http://www.quagga.net/download -QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VER) +QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VERSION) QUAGGA_CAT:=$(ZCAT) QUAGGA_CONFIGURE:= diff --git a/package/raidtools/raidtools.mk b/package/raidtools/raidtools.mk index 9dc3ca121..2026576d2 100644 --- a/package/raidtools/raidtools.mk +++ b/package/raidtools/raidtools.mk @@ -3,9 +3,10 @@ # raidtools2 # ############################################################# -RAIDTOOLS2_SOURCE:=raidtools2-1.00.3.tar.gz +RAIDTOOLS2_VERSION:=1.00.3 +RAIDTOOLS2_SOURCE:=raidtools2-$(RAIDTOOLS2_VERSION).tar.gz RAIDTOOLS2_SITE:= -RAIDTOOLS2_DIR:=$(BUILD_DIR)/raidtools2-1.00.3 +RAIDTOOLS2_DIR:=$(BUILD_DIR)/raidtools2-$(RAIDTOOLS2_VERSION) RAIDTOOLS2_CAT:=$(ZCAT) RAIDTOOLS2_BINARY:=mkraid RAIDTOOLS2_TARGET_BINARY:=sbin/mkraid diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 0043419e5..655543b23 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -3,10 +3,10 @@ # build GNU readline # ############################################################# -READLINE_VER:=5.1 +READLINE_VERSION:=5.1 READLINE_SITE:=ftp://ftp.cwru.edu/pub/bash -READLINE_SOURCE:=readline-$(READLINE_VER).tar.gz -READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VER) +READLINE_SOURCE:=readline-$(READLINE_VERSION).tar.gz +READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VERSION) READLINE_CAT:=$(ZCAT) READLINE_BINARY:=libhistory.a READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index c22c8e6dc..89f33f1c3 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -3,10 +3,10 @@ # rsync # ############################################################# -RSYNC_VER:=2.6.9 -RSYNC_SOURCE:=rsync-$(RSYNC_VER).tar.gz +RSYNC_VERSION:=2.6.9 +RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/ -RSYNC_DIR:=$(BUILD_DIR)/rsync-$(RSYNC_VER) +RSYNC_DIR:=$(BUILD_DIR)/rsync-$(RSYNC_VERSION) RSYNC_CAT:=$(ZCAT) RSYNC_BINARY:=rsync RSYNC_TARGET_BINARY:=usr/bin/rsync diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 7fef9a5a2..40f8e9376 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -3,9 +3,10 @@ # ruby # ############################################################# -RUBY_SOURCE:=ruby-1.8.2.tar.gz +RUBY_VERSION:=1.8.2 +RUBY_SOURCE:=ruby-$(RUBY_VERSION).tar.gz RUBY_SITE:=ftp://ftp.ruby-lang.org/pub/ruby/1.8 -RUBY_DIR:=$(BUILD_DIR)/ruby-1.8.2 +RUBY_DIR:=$(BUILD_DIR)/ruby-$(RUBY_VERSION) RUBY_CAT:=$(ZCAT) RUBY_BINARY:=ruby RUBY_TARGET_BINARY:=usr/bin/ruby diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 5098d2d9d..e355bf896 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -3,10 +3,10 @@ # samba # ############################################################# -SAMBA_VER:=3.0.23d -SAMBA_SOURCE:=samba-$(SAMBA_VER).tar.gz +SAMBA_VERSION:=3.0.23d +SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz SAMBA_SITE:=ftp://us4.samba.org/pub/samba/old-versions/ -SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VER)/source +SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source SAMBA_CAT:=$(ZCAT) SAMBA_BINARY:=bin/smbd SAMBA_TARGET_BINARY:=usr/sbin/smbd diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 24b7036c9..867bacbc5 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -3,12 +3,12 @@ # sed # ############################################################# -SED_VER:=4.1.5 -SED_SOURCE:=sed-$(SED_VER).tar.gz +SED_VERSION:=4.1.5 +SED_SOURCE:=sed-$(SED_VERSION).tar.gz SED_SITE:=http://ftp.gnu.org/pub/gnu/sed SED_CAT:=$(ZCAT) -SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER) -SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER) +SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VERSION) +SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION) SED_BINARY:=sed/sed SED_TARGET_BINARY:=bin/sed ifeq ($(strip $(BR2_LARGEFILE)),y) diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index 0e09aa80d..88980934f 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -3,10 +3,11 @@ # sfdisk support # ############################################################# -SFDISK_SOURCE=sfdisk.tar.bz2 +SFDISK_VERSION:= +SFDISK_SOURCE=sfdisk$(SFDISK_VERSION).tar.bz2 SFDISK_CAT:=$(BZCAT) SFDISK_SITE:=http://www.uclibc.org/ -SFDISK_DIR=$(BUILD_DIR)/sfdisk +SFDISK_DIR=$(BUILD_DIR)/sfdisk$(SFDISK_VERSION) $(DL_DIR)/$(SFDISK_SOURCE): $(WGET) -P $(DL_DIR) $(SFDISK_SITE)/$(SFDISK_SOURCE) diff --git a/package/slang/slang.mk b/package/slang/slang.mk index fd96cebab..daaf0c6c9 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -3,10 +3,11 @@ # slang # ############################################################# -SLANG_SOURCE=slang-1.4.5-mini.tar.bz2 +SLANG_VERSION:=1.4.5 +SLANG_SOURCE=slang-$(SLANG_VERSION)-mini.tar.bz2 SLANG_CAT:=$(BZCAT) SLANG_SITE:=http://www.uclibc.org/ -SLANG_DIR=$(BUILD_DIR)/slang-1.4.5-mini +SLANG_DIR=$(BUILD_DIR)/slang-$(SLANG_VERSION)-mini ifeq ($(BR2_LARGEFILE),y) SLANG_CFLAGS=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index b666ba3b3..e9a88df1c 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -3,10 +3,10 @@ # smartmontools # ############################################################# -SMARTMONTOOLS_VER:=5.33 -SMARTMONTOOLS_SOURCE:=smartmontools-$(SMARTMONTOOLS_VER).tar.gz +SMARTMONTOOLS_VERSION:=5.33 +SMARTMONTOOLS_SOURCE:=smartmontools-$(SMARTMONTOOLS_VERSION).tar.gz SMARTMONTOOLS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools -SMARTMONTOOLS_DIR:=$(BUILD_DIR)/smartmontools-$(SMARTMONTOOLS_VER) +SMARTMONTOOLS_DIR:=$(BUILD_DIR)/smartmontools-$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_CAT:=$(ZCAT) SMARTMONTOOLS_BINARY:=smartctl SMARTMONTOOLS_BINARY2:=smartd diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 35a23d2cf..8106d9d87 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -3,11 +3,11 @@ # strace # ############################################################# -STRACE_VER:=4.5.15 -STRACE_SOURCE:=strace-$(STRACE_VER).tar.bz2 +STRACE_VERSION:=4.5.15 +STRACE_SOURCE:=strace-$(STRACE_VERSION).tar.bz2 STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace STRACE_CAT:=$(BZCAT) -STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VER) +STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VERSION) BR2_STRACE_CFLAGS:= ifeq ($(BR2_LARGEFILE),) diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 8ce852781..09e5f8226 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -3,11 +3,11 @@ # stunnel # ############################################################# -STUNNEL_VER:=4.16 -STUNNEL_SOURCE:=stunnel-$(STUNNEL_VER).tar.gz +STUNNEL_VERSION:=4.16 +STUNNEL_SOURCE:=stunnel-$(STUNNEL_VERSION).tar.gz STUNNEL_SITE:=http://www.stunnel.org/download/stunnel/src STUNNEL_CAT:=$(ZCAT) -STUNNEL_DIR:=$(BUILD_DIR)/stunnel-$(STUNNEL_VER) +STUNNEL_DIR:=$(BUILD_DIR)/stunnel-$(STUNNEL_VERSION) $(DL_DIR)/$(STUNNEL_SOURCE): $(WGET) -P $(DL_DIR) $(STUNNEL_SITE)/$(STUNNEL_SOURCE) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 02db27580..1ab156fcf 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,10 +4,10 @@ # ############################################################# -SUDO_VER:=1.6.8p12 -SUDO_SOURCE:=sudo-$(SUDO_VER).tar.gz +SUDO_VERSION:=1.6.8p12 +SUDO_SOURCE:=sudo-$(SUDO_VERSION).tar.gz SUDO_SITE:=http://www.courtesan.com/sudo/dist -SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VER) +SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VERSION) SUDO_UNZIP:=$(ZCAT) $(DL_DIR)/$(SUDO_SOURCE): diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 1836fa0d4..f34fb3f3d 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -3,10 +3,10 @@ # sysklogd # ############################################################# -SYSKLOGD_VER:=1.4.1 -SYSKLOGD_SOURCE:=sysklogd-$(SYSKLOGD_VER).tar.gz +SYSKLOGD_VERSION:=1.4.1 +SYSKLOGD_SOURCE:=sysklogd-$(SYSKLOGD_VERSION).tar.gz SYSKLOGD_SITE:=http://www.infodrom.org/projects/sysklogd/download -SYSKLOGD_DIR:=$(BUILD_DIR)/sysklogd-$(SYSKLOGD_VER) +SYSKLOGD_DIR:=$(BUILD_DIR)/sysklogd-$(SYSKLOGD_VERSION) SYSKLOGD_SYSLOGD_BINARY:=syslogd SYSKLOGD_KLOGD_BINARY:=klogd SYSKLOGD_BINARY:=$(SYSKLOGD_KLOGD_BINARY) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 70e9ab50b..bb234327e 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -3,10 +3,10 @@ # sysvinit # ############################################################# -SYSVINIT_VER:=2.86 -SYSVINIT_SOURCE:=sysvinit-$(SYSVINIT_VER).tar.gz +SYSVINIT_VERSION:=2.86 +SYSVINIT_SOURCE:=sysvinit-$(SYSVINIT_VERSION).tar.gz SYSVINIT_SITE:=ftp://ftp.cistron.nl/pub/people/miquels/software -SYSVINIT_DIR:=$(BUILD_DIR)/sysvinit-$(SYSVINIT_VER) +SYSVINIT_DIR:=$(BUILD_DIR)/sysvinit-$(SYSVINIT_VERSION) SYSVINIT_CAT:=$(ZCAT) SYSVINIT_BINARY:=src/init SYSVINIT_TARGET_BINARY:=bin/init diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 24596df47..0641969cd 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -3,10 +3,10 @@ # tar # ############################################################# -GNUTAR_VER:=1.18 -GNUTAR_SOURCE:=tar-$(GNUTAR_VER).tar.bz2 +GNUTAR_VERSION:=1.18 +GNUTAR_SOURCE:=tar-$(GNUTAR_VERSION).tar.bz2 GNUTAR_SITE:=http://ftp.gnu.org/gnu/tar/ -GNUTAR_DIR:=$(BUILD_DIR)/tar-$(GNUTAR_VER) +GNUTAR_DIR:=$(BUILD_DIR)/tar-$(GNUTAR_VERSION) GNUTAR_CAT:=$(BZCAT) GNUTAR_BINARY:=src/tar GNUTAR_TARGET_BINARY:=bin/tar diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 9c60e7ee8..fb4b52327 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -6,10 +6,10 @@ # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org> # Copyright (C) 2002 by Tim Riker <Tim@Rikers.org> -TCPDUMP_VER:=3.9.5 -TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VER) +TCPDUMP_VERSION:=3.9.5 +TCPDUMP_DIR:=$(BUILD_DIR)/tcpdump-$(TCPDUMP_VERSION) TCPDUMP_SITE:=http://www.tcpdump.org/release -TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VER).tar.gz +TCPDUMP_SOURCE:=tcpdump-$(TCPDUMP_VERSION).tar.gz TCPDUMP_CAT:=$(ZCAT) $(DL_DIR)/$(TCPDUMP_SOURCE): diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 52d6b94c6..695001dd3 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -3,10 +3,10 @@ # tftpd # ############################################################# -TFTP_HPA_VER:=0.40 -TFTP_HPA_SOURCE:=tftp-hpa-$(TFTP_HPA_VER).tar.bz2 +TFTP_HPA_VERSION:=0.40 +TFTP_HPA_SOURCE:=tftp-hpa-$(TFTP_HPA_VERSION).tar.bz2 TFTP_HPA_SITE:=http://www.kernel.org/pub/software/network/tftp/ -TFTP_HPA_DIR:=$(BUILD_DIR)/tftp-hpa-$(TFTP_HPA_VER) +TFTP_HPA_DIR:=$(BUILD_DIR)/tftp-hpa-$(TFTP_HPA_VERSION) TFTP_HPA_CAT:=$(BZCAT) TFTP_HPA_BINARY:=tftpd/tftpd TFTP_HPA_TARGET_BINARY:=usr/sbin/in.tftpd diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index f9fbc667d..58a1f9d38 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -3,10 +3,10 @@ # thttpd # ############################################################# -THTTPD_VER:=2.25b -THTTPD_SOURCE:=thttpd-$(THTTPD_VER).tar.gz +THTTPD_VERSION:=2.25b +THTTPD_SOURCE:=thttpd-$(THTTPD_VERSION).tar.gz THTTPD_SITE:=http://www.acme.com/software/thttpd/ -THTTPD_DIR:=$(BUILD_DIR)/thttpd-$(THTTPD_VER) +THTTPD_DIR:=$(BUILD_DIR)/thttpd-$(THTTPD_VERSION) THTTPD_CAT:=$(ZCAT) THTTPD_BINARY:=thttpd THTTPD_TARGET_BINARY:=sbin/thttpd diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 018c64540..57baf682d 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -3,10 +3,10 @@ # tiff # ############################################################# -TIFF_VER:=3.8.2 -TIFF_DIR:=$(BUILD_DIR)/tiff-$(TIFF_VER) +TIFF_VERSION:=3.8.2 +TIFF_DIR:=$(BUILD_DIR)/tiff-$(TIFF_VERSION) TIFF_SITE:=ftp://ftp.remotesensing.org/libtiff -TIFF_SOURCE:=tiff-$(TIFF_VER).tar.gz +TIFF_SOURCE:=tiff-$(TIFF_VERSION).tar.gz TIFF_CAT:=$(ZCAT) $(DL_DIR)/$(TIFF_SOURCE): @@ -55,16 +55,16 @@ $(TIFF_DIR)/libtiff/.libs/libtiff.a: $(TIFF_DIR)/.configured $(MAKE) -C $(TIFF_DIR) touch -c $(TIFF_DIR)/libtiff/.libs/libtiff.a -$(STAGING_DIR)/lib/libtiff.so.$(TIFF_VER): $(TIFF_DIR)/libtiff/.libs/libtiff.a +$(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(TIFF_DIR)/libtiff/.libs/libtiff.a $(MAKE) DESTDIR=$(STAGING_DIR) -C $(TIFF_DIR) install $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libtiff.la - touch -c $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VER) + touch -c $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION) -$(TARGET_DIR)/lib/libtiff.so.$(TIFF_VER): $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VER) +$(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION) cp -dpf $(STAGING_DIR)/lib/libtiff.so* $(TARGET_DIR)/lib/ - -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VER) + -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) -tiff: uclibc zlib jpeg $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VER) +tiff: uclibc zlib jpeg $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION) tiff-clean: -$(MAKE) -C $(TIFF_DIR) clean diff --git a/package/tinylogin/tinylogin.mk b/package/tinylogin/tinylogin.mk index 73d385711..ac435ed3f 100644 --- a/package/tinylogin/tinylogin.mk +++ b/package/tinylogin/tinylogin.mk @@ -4,6 +4,7 @@ # ############################################################# # Enable this to use the tinylogin daily snapshot +TINYLOGIN_VERSION:=1.4 USE_TINYLOGIN_SNAPSHOT=true ifeq ($(USE_TINYLOGIN_SNAPSHOT),true) @@ -12,8 +13,8 @@ TINYLOGIN_DIR:=$(BUILD_DIR)/tinylogin TINYLOGIN_SOURCE:=tinylogin-snapshot.tar.bz2 TINYLOGIN_SITE:=http://tinylogin.busybox.net/downloads/snapshots else -TINYLOGIN_DIR:=$(BUILD_DIR)/tinylogin-1.4 -TINYLOGIN_SOURCE:=tinylogin-1.4.tar.bz2 +TINYLOGIN_DIR:=$(BUILD_DIR)/tinylogin-$(TINYLOGIN_VERSION) +TINYLOGIN_SOURCE:=tinylogin-$(TINYLOGIN_VERSION).tar.bz2 TINYLOGIN_SITE:=http://tinylogin.busybox.net/downloads endif TINYLOGIN_CAT:=$(BZCAT) diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index 6011e6fcf..d1f4afc79 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -45,11 +45,11 @@ TINYX_LIBS:=ICE X11 Xext Xpm # # Where resources are found. # - -TINYX_DIR:=$(BUILD_DIR)/xc-011010 +TINYX_VERSION:=011010 +TINYX_DIR:=$(BUILD_DIR)/xc-$(TINYX_VERSION) TINYX_LDIR:=$(TINYX_DIR)/lib TINYX_PROGS:=$(TINYX_DIR)/programs -TINYX_SOURCE:=xc-011010.tar.bz2 +TINYX_SOURCE:=xc-$(TINYX_VERSION).tar.bz2 TINYX_SITE:= http://intimate.handhelds.org/jacques/ TINYX_CF:=$(TINYX_DIR)/config/cf # diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 42f272dad..0b6bf2c63 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -1,6 +1,7 @@ +TN5250_VERSION:=0.16.4 TN5250_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tn5250 -TN5250_DIR:=$(BUILD_DIR)/tn5250-0.16.4 -TN5250_SOURCE:=tn5250-0.16.4.tar.gz +TN5250_DIR:=$(BUILD_DIR)/tn5250-$(TN5250_VERSION) +TN5250_SOURCE:=tn5250-$(TN5250_VERSION).tar.gz TN5250_CAT:=$(ZCAT) $(DL_DIR)/$(TN5250_SOURCE): diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk index d22f74c9f..e24566052 100644 --- a/package/ttcp/ttcp.mk +++ b/package/ttcp/ttcp.mk @@ -4,9 +4,10 @@ # ############################################################# # +TTCP_VERSION:= TTCP_SOURCE_URL=http://ftp.sunet.se/pub/network/monitoring/ttcp -TTCP_SOURCE=ttcp.c -TTCP_BUILD_DIR=$(BUILD_DIR)/ttcp +TTCP_SOURCE=ttcp$(TTCP_VERSION).c +TTCP_BUILD_DIR=$(BUILD_DIR)/ttcp$(TTCP_VERSION) $(DL_DIR)/$(TTCP_SOURCE): $(WGET) -P $(DL_DIR) $(TTCP_SOURCE_URL)/$(TTCP_SOURCE) diff --git a/package/udhcp/udhcp.mk b/package/udhcp/udhcp.mk index 006a0d6c6..ff9b28248 100644 --- a/package/udhcp/udhcp.mk +++ b/package/udhcp/udhcp.mk @@ -20,10 +20,10 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - -UDHCP_SOURCE:=udhcp-0.9.8.tar.gz +UDHCP_VERSION:=0.9.8 +UDHCP_SOURCE:=udhcp-$(UDHCP_VERSION).tar.gz UDHCP_SITE:=http://udhcp.busybox.net/downloads/ -UDHCP_DIR:=$(BUILD_DIR)/udhcp-0.9.8 +UDHCP_DIR:=$(BUILD_DIR)/udhcp-$(UDHCP_VERSION) $(DL_DIR)/$(UDHCP_SOURCE): $(WGET) -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE) diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk index e28034dc0..318cbf718 100644 --- a/package/uemacs/uemacs.mk +++ b/package/uemacs/uemacs.mk @@ -3,11 +3,11 @@ # uemacs # ############################################################# -UEMACS_VER:=4.0.15-lt -UEMACS_SOURCE:=em-$(UEMACS_VER).tar.bz2 +UEMACS_VERSION:=4.0.15-lt +UEMACS_SOURCE:=em-$(UEMACS_VERSION).tar.bz2 UEMACS_CAT:=$(BZCAT) UEMACS_SITE:=ftp://ftp.kernel.org/pub/software/editors/uemacs/ -UEMACS_DIR:=$(BUILD_DIR)/em-$(UEMACS_VER) +UEMACS_DIR:=$(BUILD_DIR)/em-$(UEMACS_VERSION) UEMACS_BINARY:=em UEMACS_TARGET_BINARY:=usr/bin/emacs diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 447cb5a68..d80110622 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -3,10 +3,10 @@ # usbutils # ############################################################# -USBUTILS_VER:=0.72 -USBUTILS_SOURCE:=usbutils-$(USBUTILS_VER).tar.gz +USBUTILS_VERSION:=0.72 +USBUTILS_SOURCE:=usbutils-$(USBUTILS_VERSION).tar.gz USBUTILS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-usb/ -USBUTILS_DIR:=$(BUILD_DIR)/usbutils-$(USBUTILS_VER) +USBUTILS_DIR:=$(BUILD_DIR)/usbutils-$(USBUTILS_VERSION) USBUTILS_CAT:=$(ZCAT) USBUTILS_BINARY:=lsusb USBUTILS_TARGET_BINARY:=usr/sbin/lsusb diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 161c173c2..1d0cf7fc8 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -3,10 +3,10 @@ # util-linux # ############################################################# -UTIL-LINUX_VER:=2.12r -UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VER).tar.bz2 +UTIL-LINUX_VERSION:=2.12r +UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2 UTIL-LINUX_SITE:=http://www.kernel.org/pub/linux/utils/util-linux -UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VER) +UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION) UTIL-LINUX_CAT:=$(BZCAT) UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 3c5092cf6..04f249f04 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -6,9 +6,10 @@ # to enable that within busybox # ############################################################# -VTUN_SOURCE:=vtun-2.6.tar.gz +VTUN_VERSION:=2.6 +VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/ -VTUN_DIR:=$(BUILD_DIR)/vtun-2.6 +VTUN_DIR:=$(BUILD_DIR)/vtun-$(VTUN_VERSION) VTUN_CAT:=$(ZCAT) VTUN_BINARY:=vtund VTUN_TARGET_BINARY:=usr/sbin/vtund diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 834a3f900..eb3219f5c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -3,10 +3,10 @@ # wget # ############################################################# -WGET_VER:=1.10.2 -WGET_SOURCE:=wget-$(WGET_VER).tar.gz +WGET_VERSION:=1.10.2 +WGET_SOURCE:=wget-$(WGET_VERSION).tar.gz WGET_SITE:=http://ftp.gnu.org/pub/gnu/wget -WGET_DIR:=$(BUILD_DIR)/wget-$(WGET_VER) +WGET_DIR:=$(BUILD_DIR)/wget-$(WGET_VERSION) WGET_CAT:=$(ZCAT) WGET_BINARY:=src/wget WGET_TARGET_BINARY:=bin/wget diff --git a/package/which/which.mk b/package/which/which.mk index 60d59b104..548e65743 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -3,10 +3,10 @@ # which # ############################################################# -WHICH_VER:=2.16 -WHICH_SOURCE:=which-$(WHICH_VER).tar.gz +WHICH_VERSION:=2.16 +WHICH_SOURCE:=which-$(WHICH_VERSION).tar.gz WHICH_SITE:=http://www.xs4all.nl/~carlo17/which/ -WHICH_DIR:=$(BUILD_DIR)/which-$(WHICH_VER) +WHICH_DIR:=$(BUILD_DIR)/which-$(WHICH_VERSION) WHICH_CAT:=$(ZCAT) WHICH_BINARY:=which WHICH_TARGET_BINARY:=bin/which diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index 477af50ce..f56c06d15 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -2,13 +2,14 @@ # # wipe # -# http://abaababa.ouvaton.org/wipe/wipe-0.20.tar.gz +# http://abaababa.ouvaton.org/wipe/wipe-$(WIPE_VERSION).tar.gz ############################################################# -WIPE_SOURCE:=wipe-0.20.tar.gz +WIPE_VERSION:=0.20 +WIPE_SOURCE:=wipe-$(WIPE_VERSION).tar.gz #WIPE_PATCH:=wipe_0.2-19.diff.gz WIPE_SITE:=http://abaababa.ouvaton.org/wipe WIPE_CAT:=$(ZCAT) -WIPE_DIR:=$(BUILD_DIR)/wipe-0.20 +WIPE_DIR:=$(BUILD_DIR)/wipe-$(WIPE_VERSION) WIPE_BINARY:=wipe WIPE_TARGET_BINARY:=bin/wipe diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk index d820b0e27..c89643331 100644 --- a/package/wireless-tools/wireless-tools.mk +++ b/package/wireless-tools/wireless-tools.mk @@ -8,12 +8,12 @@ # which is available in 28-pre3 and later... # Jean II # v28.pre3 -> earliest possible -WIRELESS_TOOLS_VER:=28 +WIRELESS_TOOLS_VERSION:=28 WIRELESS_TOOLS_SUBVER:= WIRELESS_TOOLS_SOURCE_URL:=http://pcmcia-cs.sourceforge.net/ftp/contrib -WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VER)$(WIRELESS_TOOLS_SUBVER).tar.gz -WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VER) +WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VERSION)$(WIRELESS_TOOLS_SUBVER).tar.gz +WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VERSION) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE): $(WGET) -P $(DL_DIR) $(WIRELESS_TOOLS_SOURCE_URL)/$(WIRELESS_TOOLS_SOURCE) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index b7bbf34ec..0c17c0946 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -3,11 +3,11 @@ # xfsprogs # ############################################################# -XFSPROGS_VER:=2.7.11 -XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VER).src.tar.gz +XFSPROGS_VERSION:=2.7.11 +XFSPROGS_SOURCE=xfsprogs-$(XFSPROGS_VERSION).src.tar.gz #XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/cmd_tars XFSPROGS_SITE=ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ -XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VER) +XFSPROGS_DIR=$(BUILD_DIR)/xfsprogs-$(XFSPROGS_VERSION) XFSPROGS_CAT:=$(ZCAT) XFSPROGS_BINARY:=mkfs/mkfs.xfs XFSPROGS_TARGET_BINARY:=sbin/mkfs.xfs diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 8456274ea..88f59897f 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -3,11 +3,11 @@ # zlib # ############################################################# -ZLIB_VER:=1.2.3 -ZLIB_SOURCE:=zlib-$(ZLIB_VER).tar.bz2 +ZLIB_VERSION:=1.2.3 +ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2 ZLIB_CAT:=$(BZCAT) ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng -ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VER) +ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VERSION) ZLIB_CFLAGS:=-fPIC ifeq ($(BR2_LARGEFILE),y) ZLIB_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -35,37 +35,37 @@ $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched ) touch $@ -$(ZLIB_DIR)/libz.so.$(ZLIB_VER): $(ZLIB_DIR)/.configured +$(ZLIB_DIR)/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/.configured $(MAKE) -C $(ZLIB_DIR) all libz.a - touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VER) + touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION) -$(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER): $(ZLIB_DIR)/libz.so.$(ZLIB_VER) +$(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION) cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/ cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/ cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/ cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/ - ln -sf libz.so.$(ZLIB_VER) $(STAGING_DIR)/usr/lib/libz.so.1 - chmod a-x $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER) + ln -sf libz.so.$(ZLIB_VERSION) $(STAGING_DIR)/usr/lib/libz.so.1 + chmod a-x $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) touch -c $@ -$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VER): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER) +$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) mkdir -p $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libz.so* touch -c $@ -$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VER) +$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/ rm -f $(TARGET_DIR)/lib/libz.so $(TARGET_DIR)/usr/lib/libz.so - ln -sf libz.so.$(ZLIB_VER) $(TARGET_DIR)/usr/lib/libz.so + ln -sf libz.so.$(ZLIB_VERSION) $(TARGET_DIR)/usr/lib/libz.so touch -c $@ zlib-headers: $(TARGET_DIR)/usr/lib/libz.a -zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VER) +zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION) zlib-source: $(DL_DIR)/$(ZLIB_SOURCE) |