From: Michael Tremer Date: Tue, 3 Feb 2009 15:16:40 +0000 (+0100) Subject: Renamed some fields... X-Git-Tag: v3.0-alpha1~37^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8985a698fce1b64f9857d025d93afa2541a30736;p=ipfire-3.x.git Renamed some fields... --- diff --git a/lfs/Config b/lfs/Config index 8a7c59e38..c0f750666 100644 --- a/lfs/Config +++ b/lfs/Config @@ -13,7 +13,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -97,8 +97,8 @@ define DO_PKG_INFO @echo "LICENSE=\"$(LICENSE)\"" @echo "MAINTAINER=\"$(MAINTAINER)\"" @echo "NAME=\"$(PKG_NAME)\"" - @echo "VERSION=\"$(VER)\"" - @echo "RELEASE=\"$(PKG_VER)\"" + @echo "VERSION=\"$(PKG_VER)\"" + @echo "RELEASE=\"$(PKG_REL)\"" @echo "SHORT=\"$(value SHORT_DESC)\"" @echo "URL=\"$(URL)\"" endef diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain index 61865cb9c..0e61d9a4b 100644 --- a/lfs/adjust-toolchain +++ b/lfs/adjust-toolchain @@ -25,8 +25,8 @@ include Config PKG_NAME = adjust-toolchain -VER = -PKG_VER = -1 +PKG_VER = +PKG_REL = -1 THISAPP = $(PKG_NAME) diff --git a/lfs/attr b/lfs/attr index ab07420c6..0d59a82da 100644 --- a/lfs/attr +++ b/lfs/attr @@ -25,10 +25,10 @@ include Config PKG_NAME = attr -VER = 2.4.41 -PKG_VER = 0 +PKG_VER = 2.4.41 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/aufs b/lfs/aufs index 6bc3c37a5..e89910395 100644 --- a/lfs/aufs +++ b/lfs/aufs @@ -25,10 +25,10 @@ include Config PKG_NAME = aufs -VER = 20081012 -PKG_VER = 0 +PKG_VER = 20081012 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(PKG_NAME) diff --git a/lfs/autoconf b/lfs/autoconf index ac907e239..43ee816b9 100644 --- a/lfs/autoconf +++ b/lfs/autoconf @@ -25,10 +25,10 @@ include Config PKG_NAME = autoconf -VER = 2.62 -PKG_VER = 0 +PKG_VER = 2.62 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/automake b/lfs/automake index 8ce6172ea..1dc9839d1 100644 --- a/lfs/automake +++ b/lfs/automake @@ -25,10 +25,10 @@ include Config PKG_NAME = automake -VER = 1.10.2 -PKG_VER = 0 +PKG_VER = 1.10.2 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/avahi b/lfs/avahi index b93964b7e..c0ca6339a 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -25,10 +25,10 @@ include Config PKG_NAME = avahi -VER = 0.6.24 -PKG_VER = 0 +PKG_VER = 0.6.24 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/bash b/lfs/bash index 58dc04e0f..1aa568c84 100644 --- a/lfs/bash +++ b/lfs/bash @@ -25,10 +25,10 @@ include Config PKG_NAME = bash -VER = 3.2 -PKG_VER = 0 +PKG_VER = 3.2 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -57,7 +57,7 @@ endef objects = $(DL_FILE) \ $(THISAPP)-fixes-9.patch \ - $(PKG_NAME)-doc-$(VER).tar.gz \ + $(PKG_NAME)-doc-$(PKG_VER).tar.gz \ $(THISAPP)-arc4random-1.patch \ $(THISAPP)-rng.patch @@ -114,7 +114,7 @@ ifeq "$(STAGE)" "toolchain" endif ifeq "$(STAGE)" "base" - cd $(DIR_APP) && tar -xvf $(DIR_DL)/$(PKG_NAME)-doc-$(VER).tar.gz + cd $(DIR_APP) && tar -xvf $(DIR_DL)/$(PKG_NAME)-doc-$(PKG_VER).tar.gz cd $(DIR_APP) && sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(THISAPP)|" \ Makefile.in cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-arc4random-1.patch diff --git a/lfs/bc b/lfs/bc index fe83d9c3f..eda67064a 100644 --- a/lfs/bc +++ b/lfs/bc @@ -25,10 +25,10 @@ include Config PKG_NAME = bc -VER = 1.06 -PKG_VER = 0 +PKG_VER = 1.06 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/beep b/lfs/beep index e5014b8bc..0e07695b4 100644 --- a/lfs/beep +++ b/lfs/beep @@ -25,9 +25,9 @@ include Config PKG_NAME = beep -VER = 1.2.2 +PKG_VER = 1.2.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/berkeley b/lfs/berkeley index 423221be2..f136fb600 100644 --- a/lfs/berkeley +++ b/lfs/berkeley @@ -25,10 +25,10 @@ include Config PKG_NAME = db -VER = 4.7.25 -PKG_VER = 0 +PKG_VER = 4.7.25 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/bind b/lfs/bind index 4233b5b79..723807c40 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,10 +25,10 @@ include Config PKG_NAME = bind -VER = 9.4.1-P1 -PKG_VER = 0 +PKG_VER = 9.4.1-P1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/binutils b/lfs/binutils index c8ccbcdc0..4efbce1c6 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -25,10 +25,10 @@ include Config PKG_NAME = binutils -VER = 2.19.1 -PKG_VER = 0 +PKG_VER = 2.19.1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/bison b/lfs/bison index 89afb3e88..f951072ef 100644 --- a/lfs/bison +++ b/lfs/bison @@ -25,10 +25,10 @@ include Config PKG_NAME = bison -VER = 2.4 -PKG_VER = 0 +PKG_VER = 2.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/bootutils b/lfs/bootutils index f7654e752..b9dae0bbc 100644 --- a/lfs/bootutils +++ b/lfs/bootutils @@ -25,10 +25,10 @@ include Config PKG_NAME = bootutils -VER = 0.0.8 -PKG_VER = 0 +PKG_VER = 0.0.8 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/br2684ctl b/lfs/br2684ctl index 88215bfb6..8a47dec95 100644 --- a/lfs/br2684ctl +++ b/lfs/br2684ctl @@ -25,9 +25,9 @@ include Config PKG_NAME = br2684ctl -VER = ipfire-1 +PKG_VER = ipfire-1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(PKG_NAME) diff --git a/lfs/bridge-utils b/lfs/bridge-utils index 153d4f9c5..58f7b0459 100644 --- a/lfs/bridge-utils +++ b/lfs/bridge-utils @@ -25,10 +25,10 @@ include Config PKG_NAME = bridge-utils -VER = 1.2 -PKG_VER = 0 +PKG_VER = 1.2 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/bzip2 b/lfs/bzip2 index 24c3eaba1..1efefbe1e 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -25,10 +25,10 @@ include Config PKG_NAME = bzip2 -VER = 1.0.5 -PKG_VER = 0 +PKG_VER = 1.0.5 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cairo b/lfs/cairo index efe32ccd0..df5127e7d 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -25,10 +25,10 @@ include Config PKG_NAME = cairo -VER = 1.8.4 -PKG_VER = 0 +PKG_VER = 1.8.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ccache b/lfs/ccache index 73c80d192..8222375df 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -25,10 +25,10 @@ include Config PKG_NAME = ccache -VER = 2.4 -PKG_VER = 0 +PKG_VER = 2.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cdrtools b/lfs/cdrtools index de4323fc8..a91f36b08 100644 --- a/lfs/cdrtools +++ b/lfs/cdrtools @@ -25,10 +25,10 @@ include Config PKG_NAME = cdrtools -VER = 2.01 -PKG_VER = 0 +PKG_VER = 2.01 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/collectd b/lfs/collectd index f616861ef..7c4879990 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -25,10 +25,10 @@ include Config PKG_NAME = collectd -VER = 4.5.0 -PKG_VER = 0 +PKG_VER = 4.5.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/coreutils b/lfs/coreutils index 38630a958..e60690345 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -25,10 +25,10 @@ include Config PKG_NAME = coreutils -VER = 7.0 -PKG_VER = 0 +PKG_VER = 7.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cpio b/lfs/cpio index de25c7f7e..daca7525b 100644 --- a/lfs/cpio +++ b/lfs/cpio @@ -25,10 +25,10 @@ include Config PKG_NAME = cpio -VER = 2.9 -PKG_VER = 0 +PKG_VER = 2.9 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cracklib b/lfs/cracklib index e1a361023..eb81e9310 100644 --- a/lfs/cracklib +++ b/lfs/cracklib @@ -25,10 +25,10 @@ include Config PKG_NAME = cracklib -VER = 2.8.12 -PKG_VER = 0 +PKG_VER = 2.8.12 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/curl b/lfs/curl index 32e7d995d..d6858c839 100644 --- a/lfs/curl +++ b/lfs/curl @@ -25,9 +25,9 @@ include Config PKG_NAME = curl -VER = 7.16.3 +PKG_VER = 7.16.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 6039486d1..1d446e46e 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -25,10 +25,10 @@ include Config PKG_NAME = cyrus-sasl -VER = 2.1.22 -PKG_VER = 0 +PKG_VER = 2.1.22 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/dbus b/lfs/dbus index ed8bbfa76..5246ad084 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -25,10 +25,10 @@ include Config PKG_NAME = dbus -VER = 1.2.1 -PKG_VER = 0 +PKG_VER = 1.2.1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/dbus-glib b/lfs/dbus-glib index dd1d9b1d2..16bcba52a 100644 --- a/lfs/dbus-glib +++ b/lfs/dbus-glib @@ -25,10 +25,10 @@ include Config PKG_NAME = dbus-glib -VER = 0.78 -PKG_VER = 0 +PKG_VER = 0.78 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/dhcp b/lfs/dhcp index 42756087e..57acbe563 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -25,10 +25,10 @@ include Config PKG_NAME = dhcp -VER = 4.1.0 -PKG_VER = 0 +PKG_VER = 4.1.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/diffutils b/lfs/diffutils index 9d547d72c..9e270216c 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -25,10 +25,10 @@ include Config PKG_NAME = diffutils -VER = 2.8.1 -PKG_VER = 0 +PKG_VER = 2.8.1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/directfb b/lfs/directfb index d6e558ae2..7d85fbd42 100644 --- a/lfs/directfb +++ b/lfs/directfb @@ -25,10 +25,10 @@ include Config PKG_NAME = DirectFB -VER = 1.0.1 -PKG_VER = 0 +PKG_VER = 1.0.1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/distcc b/lfs/distcc index 9a4ce2e43..9bdc08354 100644 --- a/lfs/distcc +++ b/lfs/distcc @@ -25,10 +25,10 @@ include Config PKG_NAME = distcc -VER = 3.0 -PKG_VER = 0 +PKG_VER = 3.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/dnsmasq b/lfs/dnsmasq index 512754d61..ce5b0750c 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -25,10 +25,10 @@ include Config PKG_NAME = dnsmasq -VER = 2.40 -PKG_VER = 0 +PKG_VER = 2.40 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 7c209cad9..1cfc1384b 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -25,10 +25,10 @@ include Config PKG_NAME = e2fsprogs -VER = 1.41.4 -PKG_VER = 0 +PKG_VER = 1.41.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/etherwake b/lfs/etherwake index 5afe5aece..fe397d678 100644 --- a/lfs/etherwake +++ b/lfs/etherwake @@ -25,9 +25,9 @@ include Config PKG_NAME = etherwake -VER = 1.09 +PKG_VER = 1.09 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/eventlog b/lfs/eventlog index 4d043490a..930a992a1 100644 --- a/lfs/eventlog +++ b/lfs/eventlog @@ -25,10 +25,10 @@ include Config PKG_NAME = eventlog -VER = 0.2.9 -PKG_VER = 0 +PKG_VER = 0.2.9 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/expat b/lfs/expat index 8fc0c450f..74e6cfb2e 100644 --- a/lfs/expat +++ b/lfs/expat @@ -25,10 +25,10 @@ include Config PKG_NAME = expat -VER = 2.0.1 -PKG_VER = 0 +PKG_VER = 2.0.1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate index 32d8ace96..d7b8779d2 100644 --- a/lfs/ez-ipupdate +++ b/lfs/ez-ipupdate @@ -25,9 +25,9 @@ include Config PKG_NAME = ez-ipupdate -VER = 3.0.11b8 +PKG_VER = 3.0.11b8 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/fcron b/lfs/fcron index 057aaac0d..0425951ac 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -25,10 +25,10 @@ include Config PKG_NAME = fcron -VER = 3.0.4 -PKG_VER = 0 +PKG_VER = 3.0.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).src.tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/file b/lfs/file index 202b2ce7c..33988859e 100644 --- a/lfs/file +++ b/lfs/file @@ -25,10 +25,10 @@ include Config PKG_NAME = file -VER = 4.24 -PKG_VER = 0 +PKG_VER = 4.24 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/findutils b/lfs/findutils index a5d672d3d..6487e69b4 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -25,10 +25,10 @@ include Config PKG_NAME = findutils -VER = 4.4.0 -PKG_VER = 0 +PKG_VER = 4.4.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/flex b/lfs/flex index 13945eebf..d165d6c92 100644 --- a/lfs/flex +++ b/lfs/flex @@ -25,10 +25,10 @@ include Config PKG_NAME = flex -VER = 2.5.35 -PKG_VER = 0 +PKG_VER = 2.5.35 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/fontconfig b/lfs/fontconfig index 39b5398f5..ca8f60900 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -25,10 +25,10 @@ include Config PKG_NAME = fontconfig -VER = 2.6.0 -PKG_VER = 0 +PKG_VER = 2.6.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/freetype b/lfs/freetype index 030a64392..c80e8f8d6 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -25,10 +25,10 @@ include Config PKG_NAME = freetype -VER = 2.3.4 -PKG_VER = 0 +PKG_VER = 2.3.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gawk b/lfs/gawk index e610dd6eb..c2a0bdda1 100644 --- a/lfs/gawk +++ b/lfs/gawk @@ -25,10 +25,10 @@ include Config PKG_NAME = gawk -VER = 3.1.6 -PKG_VER = 0 +PKG_VER = 3.1.6 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gcc b/lfs/gcc index 7854a360b..05923a8e6 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -25,10 +25,10 @@ include Config PKG_NAME = gcc -VER = 4.3.3 -PKG_VER = 0 +PKG_VER = 4.3.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gdb b/lfs/gdb index f43faefef..a4256c03c 100644 --- a/lfs/gdb +++ b/lfs/gdb @@ -25,10 +25,10 @@ include Config PKG_NAME = gdb -VER = 6.8 -PKG_VER = 0 +PKG_VER = 6.8 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gettext b/lfs/gettext index bdf3dc5ab..1a7281ccd 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -25,10 +25,10 @@ include Config PKG_NAME = gettext -VER = 0.17 -PKG_VER = 0 +PKG_VER = 0.17 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/glib2 b/lfs/glib2 index c57cc58ec..ac8b9ca2d 100644 --- a/lfs/glib2 +++ b/lfs/glib2 @@ -25,10 +25,10 @@ include Config PKG_NAME = glib -VER = 2.18.3 -PKG_VER = 0 +PKG_VER = 2.18.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/glibc b/lfs/glibc index d17a12644..63d2ef09f 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -25,10 +25,10 @@ include Config PKG_NAME = glibc -VER = 2.9 -PKG_VER = 0 +PKG_VER = 2.9 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -62,7 +62,7 @@ CXXFLAGS = ############################################################################### objects = $(DL_FILE) \ - $(PKG_NAME)-libidn-$(VER).tar.bz2 \ + $(PKG_NAME)-libidn-$(PKG_VER).tar.bz2 \ $(THISAPP)-pt_pax-1.patch \ $(THISAPP)-strlcpy_strlcat-1.patch \ $(THISAPP)-asprintf_reset2null-1.patch \ @@ -98,8 +98,8 @@ $(OBJECT): $(objects) @mkdir $(DIR_SRC)/glibc-build # Extracting libidn - cd $(DIR_APP) && $(EXTRACTOR) $(DIR_DL)/$(PKG_NAME)-libidn-$(VER).tar.bz2 - cd $(DIR_APP) && mv -v $(PKG_NAME)-libidn-$(VER) libidn + cd $(DIR_APP) && $(EXTRACTOR) $(DIR_DL)/$(PKG_NAME)-libidn-$(PKG_VER).tar.bz2 + cd $(DIR_APP) && mv -v $(PKG_NAME)-libidn-$(PKG_VER) libidn # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is # unknown whether this is a bash bug or a Glibc problem. Disable diff --git a/lfs/gmp b/lfs/gmp index 0148b2cff..66099bf88 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -25,9 +25,9 @@ include Config PKG_NAME = gmp -VER = 4.2.4 +PKG_VER = 4.2.4 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gnupg2 b/lfs/gnupg2 index 4b7e8c1f4..78abc0528 100644 --- a/lfs/gnupg2 +++ b/lfs/gnupg2 @@ -25,10 +25,10 @@ include Config PKG_NAME = gnupg -VER = 2.0.8 -PKG_VER = 0 +PKG_VER = 2.0.8 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/grep b/lfs/grep index c5fd34eaa..bfbbe8230 100644 --- a/lfs/grep +++ b/lfs/grep @@ -25,10 +25,10 @@ include Config PKG_NAME = grep -VER = 2.5.3 -PKG_VER = 0 +PKG_VER = 2.5.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/groff b/lfs/groff index c431ccb37..93e9be528 100644 --- a/lfs/groff +++ b/lfs/groff @@ -25,10 +25,10 @@ include Config PKG_NAME = groff -VER = 1.18.1.4 -PKG_VER = 0 +PKG_VER = 1.18.1.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/grub b/lfs/grub index 3ed798775..d2cf72d10 100644 --- a/lfs/grub +++ b/lfs/grub @@ -25,10 +25,10 @@ include Config PKG_NAME = grub -VER = 0.97 -PKG_VER = 0 +PKG_VER = 0.97 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/gzip b/lfs/gzip index 6cb041bd4..b9238cb7a 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -25,10 +25,10 @@ include Config PKG_NAME = gzip -VER = 1.3.12 -PKG_VER = 0 +PKG_VER = 1.3.12 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/hal b/lfs/hal index a577a31cd..39805c06c 100644 --- a/lfs/hal +++ b/lfs/hal @@ -25,10 +25,10 @@ include Config PKG_NAME = hal -VER = 0.5.12rc1 -PKG_VER = 0 +PKG_VER = 0.5.12rc1 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/hal-info b/lfs/hal-info index 7e2afd7e5..c1eaad700 100644 --- a/lfs/hal-info +++ b/lfs/hal-info @@ -25,10 +25,10 @@ include Config PKG_NAME = hal-info -VER = 20081219 -PKG_VER = 0 +PKG_VER = 20081219 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/hdparm b/lfs/hdparm index bf8f29f57..cfa9572e1 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -25,10 +25,10 @@ include Config PKG_NAME = hdparm -VER = 9.6 -PKG_VER = 0 +PKG_VER = 9.6 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/htop b/lfs/htop index 4c715cf81..df68fea0d 100644 --- a/lfs/htop +++ b/lfs/htop @@ -25,12 +25,12 @@ include Config PKG_NAME = htop -VER = 0.7 +PKG_VER = 0.7 EXTRA = yes DEBUG = no -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/iana-etc b/lfs/iana-etc index b9540ef7c..6520373e2 100644 --- a/lfs/iana-etc +++ b/lfs/iana-etc @@ -25,9 +25,9 @@ include Config PKG_NAME = iana-etc -VER = 2.30 +PKG_VER = 2.30 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/initd-tools b/lfs/initd-tools index a38457a09..c71d97ec1 100644 --- a/lfs/initd-tools +++ b/lfs/initd-tools @@ -25,9 +25,9 @@ include Config PKG_NAME = initd-tools -VER = 0.1.3 +PKG_VER = 0.1.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/initramfs b/lfs/initramfs index 7dc6e7ca3..96c300215 100644 --- a/lfs/initramfs +++ b/lfs/initramfs @@ -25,9 +25,9 @@ include Config PKG_NAME = initramfs -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/initscripts b/lfs/initscripts index db5a98a70..f16f31806 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -25,7 +25,7 @@ include Config PKG_NAME = initscripts -VER = ipfire +PKG_VER = ipfire THISAPP = $(PKG_NAME) DIR_APP = $(DIR_SOURCE)/$(THISAPP) diff --git a/lfs/intltool b/lfs/intltool index 99aae1547..cad425afc 100644 --- a/lfs/intltool +++ b/lfs/intltool @@ -25,10 +25,10 @@ include Config PKG_NAME = intltool -VER = 0.40.5 -PKG_VER = 0 +PKG_VER = 0.40.5 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/iproute2 b/lfs/iproute2 index 4e8fd7384..ebf19e7bf 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -25,9 +25,9 @@ include Config PKG_NAME = iproute2 -VER = 2.6.28 +PKG_VER = 2.6.28 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/iptables b/lfs/iptables index 339fe3ddc..b7531a2f3 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -25,9 +25,9 @@ include Config PKG_NAME = iptables -VER = 1.4.2 +PKG_VER = 1.4.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/iputils b/lfs/iputils index 1c22d9876..6d23701c4 100644 --- a/lfs/iputils +++ b/lfs/iputils @@ -25,9 +25,9 @@ include Config PKG_NAME = iputils -VER = s20071127 +PKG_VER = s20071127 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/kbd b/lfs/kbd index 9e022ce14..4f05c611b 100644 --- a/lfs/kbd +++ b/lfs/kbd @@ -25,9 +25,9 @@ include Config PKG_NAME = kbd -VER = 1.15 +PKG_VER = 1.15 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/l7-protocols b/lfs/l7-protocols index afba9e5df..26b49532f 100644 --- a/lfs/l7-protocols +++ b/lfs/l7-protocols @@ -25,9 +25,9 @@ include Config PKG_NAME = l7-protocols -VER = 2007-11-22 +PKG_VER = 2007-11-22 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/less b/lfs/less index 6f7a18212..9526c349c 100644 --- a/lfs/less +++ b/lfs/less @@ -25,9 +25,9 @@ include Config PKG_NAME = less -VER = 418 +PKG_VER = 418 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libaal b/lfs/libaal index e96db1e09..40cddc373 100644 --- a/lfs/libaal +++ b/lfs/libaal @@ -25,9 +25,9 @@ include Config PKG_NAME = libaal -VER = 1.0.5 +PKG_VER = 1.0.5 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libart b/lfs/libart index b9e33f1dc..0fc5d4056 100644 --- a/lfs/libart +++ b/lfs/libart @@ -25,9 +25,9 @@ include Config PKG_NAME = libart_lgpl -VER = 2.3.19 +PKG_VER = 2.3.19 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libassuan b/lfs/libassuan index 1364c9aad..510ff39d3 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -25,10 +25,10 @@ include Config PKG_NAME = libassuan -VER = 1.0.4 -PKG_VER = 0 +PKG_VER = 1.0.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libcap2 b/lfs/libcap2 index 1caece974..f68f9b687 100644 --- a/lfs/libcap2 +++ b/lfs/libcap2 @@ -25,9 +25,9 @@ include Config PKG_NAME = libcap -VER = 2.10 +PKG_VER = 2.10 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libdaemon b/lfs/libdaemon index 7ba25398a..945cdc402 100644 --- a/lfs/libdaemon +++ b/lfs/libdaemon @@ -25,10 +25,10 @@ include Config PKG_NAME = libdaemon -VER = 0.13 -PKG_VER = 0 +PKG_VER = 0.13 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 779502581..a143c7a9a 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -25,10 +25,10 @@ include Config PKG_NAME = libgcrypt -VER = 1.2.4 -PKG_VER = 0 +PKG_VER = 1.2.4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 415aa1e36..4a9647dc1 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -25,10 +25,10 @@ include Config PKG_NAME = libgpg-error -VER = 1.5 -PKG_VER = 0 +PKG_VER = 1.5 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libidn b/lfs/libidn index 48ee16e7c..dec8fb52e 100644 --- a/lfs/libidn +++ b/lfs/libidn @@ -25,9 +25,9 @@ include Config PKG_NAME = libidn -VER = 0.6.14 +PKG_VER = 0.6.14 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libjpeg b/lfs/libjpeg index 46d584849..12616d7ad 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -25,11 +25,11 @@ include Config PKG_NAME = libjpeg -VER = 6b +PKG_VER = 6b -THISAPP = $(PKG_NAME)-$(VER) -DL_FILE = jpegsrc.v$(VER).tar.gz -DIR_APP = $(DIR_SRC)/jpeg-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) +DL_FILE = jpegsrc.v$(PKG_VER).tar.gz +DIR_APP = $(DIR_SRC)/jpeg-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/libksba b/lfs/libksba index 11610964e..dda97e9ab 100644 --- a/lfs/libksba +++ b/lfs/libksba @@ -25,10 +25,10 @@ include Config PKG_NAME = libksba -VER = 1.0.2 -PKG_VER = 0 +PKG_VER = 1.0.2 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index b9ef79281..df1a1ea7f 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -25,9 +25,9 @@ include Config PKG_NAME = libnetfilter_conntrack -VER = 0.0.98 +PKG_VER = 0.0.98 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libnetfilter_log b/lfs/libnetfilter_log index 5a6b52e01..3491b20bc 100644 --- a/lfs/libnetfilter_log +++ b/lfs/libnetfilter_log @@ -25,9 +25,9 @@ include Config PKG_NAME = libnetfilter_log -VER = 0.0.14 +PKG_VER = 0.0.14 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue index 13ff7e8af..120d1f24e 100644 --- a/lfs/libnetfilter_queue +++ b/lfs/libnetfilter_queue @@ -25,9 +25,9 @@ include Config PKG_NAME = libnetfilter_queue -VER = 0.0.16 +PKG_VER = 0.0.16 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 9b934b215..1fadec4fb 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -25,9 +25,9 @@ include Config PKG_NAME = libnfnetlink -VER = 0.0.40 +PKG_VER = 0.0.40 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libpcap b/lfs/libpcap index 6e6a9c42c..488af1ffc 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -25,9 +25,9 @@ include Config PKG_NAME = libpcap -VER = 1.0.0 +PKG_VER = 1.0.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libpng b/lfs/libpng index 8324d667d..61570d590 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -25,9 +25,9 @@ include Config PKG_NAME = libpng -VER = 1.2.34 +PKG_VER = 1.2.34 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libtiff b/lfs/libtiff index 38855bb83..ae534940e 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -25,11 +25,11 @@ include Config PKG_NAME = libtiff -VER = 3.8.2 +PKG_VER = 3.8.2 -THISAPP = $(PKG_NAME)-$(VER) -DL_FILE = tiff-$(VER).tar.gz -DIR_APP = $(DIR_SRC)/tiff-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) +DL_FILE = tiff-$(PKG_VER).tar.gz +DIR_APP = $(DIR_SRC)/tiff-$(PKG_VER) DEPS = libjpeg diff --git a/lfs/libtool b/lfs/libtool index dd0d02856..23c41171d 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -25,9 +25,9 @@ include Config PKG_NAME = libtool -VER = 2.2.6a +PKG_VER = 2.2.6a -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(PKG_NAME)-2.2.6 diff --git a/lfs/libusb b/lfs/libusb index 002c2ddf9..8d2497eee 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -25,9 +25,9 @@ include Config PKG_NAME = libusb -VER = 1.0.0 +PKG_VER = 1.0.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libusb-compat b/lfs/libusb-compat index 2f8a29ab7..134691d58 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -25,9 +25,9 @@ include Config PKG_NAME = libusb -VER = 0.1.12 +PKG_VER = 0.1.12 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libuser b/lfs/libuser index 83e77f5bf..3e6fcc045 100644 --- a/lfs/libuser +++ b/lfs/libuser @@ -25,9 +25,9 @@ include Config PKG_NAME = libuser -VER = 0.56.9 +PKG_VER = 0.56.9 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libxml2 b/lfs/libxml2 index 4b9d6b1bd..f423c7591 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -25,9 +25,9 @@ include Config PKG_NAME = libxml2 -VER = 2.7.2 +PKG_VER = 2.7.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/libxslt b/lfs/libxslt index 766aabad2..2b4ceae34 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -25,9 +25,9 @@ include Config PKG_NAME = libxslt -VER = 1.1.24 +PKG_VER = 1.1.24 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/lighttpd b/lfs/lighttpd index a67f9f950..70a812ef5 100644 --- a/lfs/lighttpd +++ b/lfs/lighttpd @@ -25,9 +25,9 @@ include Config PKG_NAME = lighttpd -VER = 1.4.19 +PKG_VER = 1.4.19 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/linux b/lfs/linux index c085b0e9d..42a923bed 100644 --- a/lfs/linux +++ b/lfs/linux @@ -25,10 +25,10 @@ include Config PKG_NAME = linux -VER = 2.6.27.10 -PKG_VER = 0 +PKG_VER = 2.6.27.10 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -55,12 +55,12 @@ CFLAGS = CXXFLAGS = LOCALVERSION = -ipfire1 -FULLVER = $(VER)$(LOCALVERSION) +FULLPKG_VER= $(PKG_VER)$(LOCALVERSION) # Patches -GRSEC_PATCH = grsecurity-2.1.12-$(VER)-200812271347.patch +GRSEC_PATCH = grsecurity-2.1.12-$(PKG_VER)-200812271347.patch OCF_PATCH = ocf-linux-26-20080917.patch -REISER4_PATCH = reiser4-for-$(VER).patch +REISER4_PATCH = reiser4-for-$(PKG_VER).patch SQUASHFS_PATCH = $(THISAPP)-squashfs3.4-1.patch H12Y_PATCH = linux-h12y-mmio-quirks.patch diff --git a/lfs/linux-atm b/lfs/linux-atm index 383597890..f50be10f9 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -25,9 +25,9 @@ include Config PKG_NAME = linux-atm -VER = 2.4.1 +PKG_VER = 2.4.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/lm-sensors b/lfs/lm-sensors index 0a0ffa781..b402a0b1d 100644 --- a/lfs/lm-sensors +++ b/lfs/lm-sensors @@ -25,9 +25,9 @@ include Config PKG_NAME = lm_sensors -VER = 3.0.0 +PKG_VER = 3.0.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/logrotate b/lfs/logrotate index 93c714842..6c24e9b9b 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -25,9 +25,9 @@ include Config PKG_NAME = logrotate -VER = 3.7.7 +PKG_VER = 3.7.7 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/lsof b/lfs/lsof index acfbff2e4..832c8d51c 100644 --- a/lfs/lsof +++ b/lfs/lsof @@ -25,9 +25,9 @@ include Config PKG_NAME = lsof -VER = 4.78 +PKG_VER = 4.78 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/lzma b/lfs/lzma index e7ef6fca2..69920c5fa 100644 --- a/lfs/lzma +++ b/lfs/lzma @@ -25,9 +25,9 @@ include Config PKG_NAME = lzma -VER = 457 +PKG_VER = 457 -THISAPP = $(PKG_NAME)$(VER) +THISAPP = $(PKG_NAME)$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/lzo b/lfs/lzo index 4f6114cef..81cc64935 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -25,9 +25,9 @@ include Config PKG_NAME = lzo -VER = 2.03 +PKG_VER = 2.03 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/m4 b/lfs/m4 index af23bf9a0..c14064320 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -25,9 +25,9 @@ include Config PKG_NAME = m4 -VER = 1.4.11 +PKG_VER = 1.4.11 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/make b/lfs/make index 5e93f5da0..05676e3b3 100644 --- a/lfs/make +++ b/lfs/make @@ -25,9 +25,9 @@ include Config PKG_NAME = make -VER = 3.81 +PKG_VER = 3.81 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/man-db b/lfs/man-db index d93fb1187..7e4d0c832 100644 --- a/lfs/man-db +++ b/lfs/man-db @@ -25,9 +25,9 @@ include Config PKG_NAME = man-db -VER = 2.5.3 +PKG_VER = 2.5.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/man-pages b/lfs/man-pages index 21d570304..9484fcf1e 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -25,9 +25,9 @@ include Config PKG_NAME = man-pages -VER = 3.17 +PKG_VER = 3.17 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/mc b/lfs/mc index 25cbf0c5f..c961ccc2d 100644 --- a/lfs/mc +++ b/lfs/mc @@ -25,13 +25,13 @@ include Config PKG_NAME = mc -VER = 4.6.1 +PKG_VER = 4.6.1 EXTRA = yes DEBUG = no DEPS = glib2 slang -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/memtest86+ b/lfs/memtest86+ index 08bb857bb..e745cd163 100644 --- a/lfs/memtest86+ +++ b/lfs/memtest86+ @@ -25,9 +25,9 @@ include Config PKG_NAME = memtest86+ -VER = 2.11 +PKG_VER = 2.11 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/mingetty b/lfs/mingetty index 45dcaad08..2c630e73a 100644 --- a/lfs/mingetty +++ b/lfs/mingetty @@ -25,9 +25,9 @@ include Config PKG_NAME = mingetty -VER = 1.08 +PKG_VER = 1.08 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/miniupnpd b/lfs/miniupnpd index 83d3fac7c..0ca13e852 100644 --- a/lfs/miniupnpd +++ b/lfs/miniupnpd @@ -25,10 +25,10 @@ include Config PKG_NAME = miniupnpd -VER = 20081009 -PKG_VER = 0 +PKG_VER = 20081009 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/mkinitramfs b/lfs/mkinitramfs index 8fb3079d6..a94fad5d9 100644 --- a/lfs/mkinitramfs +++ b/lfs/mkinitramfs @@ -25,9 +25,9 @@ include Config PKG_NAME = mkinitramfs -VER = ipfire +PKG_VER = ipfire -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DIR_APP = $(DIR_SOURCE)/$(PKG_NAME) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/module-init-tools b/lfs/module-init-tools index 1241d6010..f4a035d76 100644 --- a/lfs/module-init-tools +++ b/lfs/module-init-tools @@ -25,9 +25,9 @@ include Config PKG_NAME = module-init-tools -VER = 3.5 +PKG_VER = 3.5 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/mpfr b/lfs/mpfr index cf701a27e..fa0a936aa 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -25,9 +25,9 @@ include Config PKG_NAME = mpfr -VER = 2.4.0 +PKG_VER = 2.4.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/nano b/lfs/nano index 10e8f3142..ee9632673 100644 --- a/lfs/nano +++ b/lfs/nano @@ -25,13 +25,13 @@ include Config PKG_NAME = nano -VER = 2.0.7 +PKG_VER = 2.0.7 EXTRA = yes DEBUG = no DEPS = slang -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/nasm b/lfs/nasm index 4937b2fac..b0748f129 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -25,9 +25,9 @@ include Config PKG_NAME = nasm -VER = 2.02 +PKG_VER = 2.02 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ncurses b/lfs/ncurses index c6b6a7896..215380b80 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -25,9 +25,9 @@ include Config PKG_NAME = ncurses -VER = 5.7 +PKG_VER = 5.7 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/newt b/lfs/newt index c10ee2984..6fc0415a4 100644 --- a/lfs/newt +++ b/lfs/newt @@ -25,9 +25,9 @@ include Config PKG_NAME = newt -VER = 0.52.10 +PKG_VER = 0.52.10 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/noip b/lfs/noip index d51f3336b..b4bd2bd14 100644 --- a/lfs/noip +++ b/lfs/noip @@ -25,9 +25,9 @@ include Config PKG_NAME = noip -VER = 2.1.7 +PKG_VER = 2.1.7 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/nss_ldap b/lfs/nss_ldap index bbe602a52..6f18278ea 100644 --- a/lfs/nss_ldap +++ b/lfs/nss_ldap @@ -25,9 +25,9 @@ include Config PKG_NAME = nss_ldap -VER = 262 +PKG_VER = 262 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ntp b/lfs/ntp index a1a96fd7e..3c1de5cd9 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -25,9 +25,9 @@ include Config PKG_NAME = ntp -VER = 4.2.4p0 +PKG_VER = 4.2.4p0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/openldap b/lfs/openldap index 8f19537cc..3b86dd908 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -25,9 +25,9 @@ include Config PKG_NAME = openldap -VER = 2.4.12 +PKG_VER = 2.4.12 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tgz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/openssh b/lfs/openssh index dd2ba09d7..8f4c73ace 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -25,9 +25,9 @@ include Config PKG_NAME = openssh -VER = 5.1p1 +PKG_VER = 5.1p1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/openssl b/lfs/openssl index 9c79b9441..4f6adfd2e 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -25,9 +25,9 @@ include Config PKG_NAME = openssl -VER = 0.9.8j +PKG_VER = 0.9.8j -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pam b/lfs/pam index 081d4a353..5be258ba8 100644 --- a/lfs/pam +++ b/lfs/pam @@ -25,9 +25,9 @@ include Config PKG_NAME = Linux-PAM -VER = 1.0.1 +PKG_VER = 1.0.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -66,7 +66,7 @@ ifeq "$(PASS)" "1" --libdir=/lib \ --sbindir=/lib/security \ --enable-securedir=/lib/security \ - --docdir=/usr/share/doc/Linux-PAM-$(VER) \ + --docdir=/usr/share/doc/Linux-PAM-$(PKG_VER) \ --enable-read-both-confs cd $(DIR_APP) && make $(PARALLELISMFLAGS) diff --git a/lfs/pam_ldap b/lfs/pam_ldap index c4e10b659..e0d33cbbf 100644 --- a/lfs/pam_ldap +++ b/lfs/pam_ldap @@ -25,9 +25,9 @@ include Config PKG_NAME = pam_ldap -VER = 184 +PKG_VER = 184 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pango b/lfs/pango index 4be13a5ed..b14c49235 100644 --- a/lfs/pango +++ b/lfs/pango @@ -25,9 +25,9 @@ include Config PKG_NAME = pango -VER = 1.22.3 +PKG_VER = 1.22.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/parted b/lfs/parted index 42cbb236d..b2078417d 100644 --- a/lfs/parted +++ b/lfs/parted @@ -25,9 +25,9 @@ include Config PKG_NAME = parted -VER = 1.8.8 +PKG_VER = 1.8.8 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/patch b/lfs/patch index 9b0801120..8bfdbc7dc 100644 --- a/lfs/patch +++ b/lfs/patch @@ -25,9 +25,9 @@ include Config PKG_NAME = patch -VER = 2.5.9 +PKG_VER = 2.5.9 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pax-utils b/lfs/pax-utils index 7ff93ed46..d570ecaa9 100644 --- a/lfs/pax-utils +++ b/lfs/pax-utils @@ -25,10 +25,10 @@ include Config PKG_NAME = pax-utils -VER = 0.1.19 -PKG_VER = 0 +PKG_VER = 0.1.19 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/paxctl b/lfs/paxctl index 2f3acd781..a195364ee 100644 --- a/lfs/paxctl +++ b/lfs/paxctl @@ -25,9 +25,9 @@ include Config PKG_NAME = paxctl -VER = 0.5 +PKG_VER = 0.5 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/paxtest b/lfs/paxtest index 67ab7c548..86bc48c0f 100644 --- a/lfs/paxtest +++ b/lfs/paxtest @@ -25,10 +25,10 @@ include Config PKG_NAME = paxtest -VER = 0.9.7-pre4 -PKG_VER = 0 +PKG_VER = 0.9.7-pre4 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pciutils b/lfs/pciutils index f5659cecf..797715e0d 100644 --- a/lfs/pciutils +++ b/lfs/pciutils @@ -25,9 +25,9 @@ include Config PKG_NAME = pciutils -VER = 3.0.3 +PKG_VER = 3.0.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pcre b/lfs/pcre index 8fd4ed90b..8a758596d 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -25,9 +25,9 @@ include Config PKG_NAME = pcre -VER = 7.8 +PKG_VER = 7.8 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -60,7 +60,7 @@ $(OBJECT) : ./configure \ $(CONFIGURE_ARCH) \ --prefix=/usr \ - --docdir=/usr/share/doc/pcre-$(VER) \ + --docdir=/usr/share/doc/pcre-$(PKG_VER) \ --enable-utf8 \ --enable-pcregrep-libz \ --enable-pcregrep-libbz2 \ diff --git a/lfs/perl b/lfs/perl index f5e84c46d..9394c2cc8 100644 --- a/lfs/perl +++ b/lfs/perl @@ -25,9 +25,9 @@ include Config PKG_NAME = perl -VER = 5.10.0 +PKG_VER = 5.10.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/perl-xml-parser b/lfs/perl-xml-parser index 3b7b13ff2..36ce31c21 100644 --- a/lfs/perl-xml-parser +++ b/lfs/perl-xml-parser @@ -25,9 +25,9 @@ include Config PKG_NAME = XML-Parser -VER = 2.34 +PKG_VER = 2.34 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pinentry b/lfs/pinentry index c05725eee..5d11b6768 100644 --- a/lfs/pinentry +++ b/lfs/pinentry @@ -25,10 +25,10 @@ include Config PKG_NAME = pinentry -VER = 0.7.3 -PKG_VER = 0 +PKG_VER = 0.7.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pixman b/lfs/pixman index 19d6ce3d3..b47fc3f24 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -25,9 +25,9 @@ include Config PKG_NAME = pixman -VER = 0.13.2 +PKG_VER = 0.13.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pkg-config b/lfs/pkg-config index 98260ac93..948c710dc 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -25,9 +25,9 @@ include Config PKG_NAME = pkg-config -VER = 0.22 +PKG_VER = 0.22 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pomona b/lfs/pomona index 407af4a6b..39b815773 100644 --- a/lfs/pomona +++ b/lfs/pomona @@ -25,7 +25,7 @@ include Config PKG_NAME = pomona -VER = ipfire +PKG_VER = ipfire THISAPP = $(PKG_NAME) DIR_APP = $(DIR_SOURCE)/$(THISAPP) diff --git a/lfs/popt b/lfs/popt index faf15389a..281e80b4a 100644 --- a/lfs/popt +++ b/lfs/popt @@ -25,9 +25,9 @@ include Config PKG_NAME = popt -VER = 1.14 +PKG_VER = 1.14 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ppp b/lfs/ppp index 551da9d17..3c834dfbf 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -25,9 +25,9 @@ include Config PKG_NAME = ppp -VER = 2.4.4 +PKG_VER = 2.4.4 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/procps b/lfs/procps index 562b1cf7f..a81da1f86 100644 --- a/lfs/procps +++ b/lfs/procps @@ -25,9 +25,9 @@ include Config PKG_NAME = procps -VER = 3.2.7 +PKG_VER = 3.2.7 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/psmisc b/lfs/psmisc index 2397f9278..b384fa34c 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -25,9 +25,9 @@ include Config PKG_NAME = psmisc -VER = 22.6 +PKG_VER = 22.6 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pth b/lfs/pth index 30a4eaec0..39b2f4e55 100644 --- a/lfs/pth +++ b/lfs/pth @@ -25,10 +25,10 @@ include Config PKG_NAME = pth -VER = 2.0.7 -PKG_VER = 0 +PKG_VER = 2.0.7 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pychecker b/lfs/pychecker index f963ac58c..dfa800613 100644 --- a/lfs/pychecker +++ b/lfs/pychecker @@ -25,10 +25,10 @@ include Config PKG_NAME = pychecker -VER = 0.8.17 -PKG_VER = 0 +PKG_VER = 0.8.17 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/pyfire b/lfs/pyfire index 058f667e3..dfa87ff42 100644 --- a/lfs/pyfire +++ b/lfs/pyfire @@ -25,9 +25,9 @@ include Config PKG_NAME = pyfire -VER = 0.99.1 +PKG_VER = 0.99.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DIR_APP = $(DIR_SOURCE)/$(PKG_NAME) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/python b/lfs/python index ed17af83e..3ad52783b 100644 --- a/lfs/python +++ b/lfs/python @@ -25,9 +25,9 @@ include Config PKG_NAME = Python -VER = 2.6.1 +PKG_VER = 2.6.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/python-IPy b/lfs/python-IPy index d3903fb0b..b6ae8cbdb 100644 --- a/lfs/python-IPy +++ b/lfs/python-IPy @@ -25,9 +25,9 @@ include Config PKG_NAME = IPy -VER = 0.62 +PKG_VER = 0.62 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/python-dbus b/lfs/python-dbus index 18273507f..38bc79583 100644 --- a/lfs/python-dbus +++ b/lfs/python-dbus @@ -25,9 +25,9 @@ include Config PKG_NAME = dbus-python -VER = 0.82.4 +PKG_VER = 0.82.4 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/python-netfilter_conntrack b/lfs/python-netfilter_conntrack index c6f9e97ac..3b6c07eb1 100644 --- a/lfs/python-netfilter_conntrack +++ b/lfs/python-netfilter_conntrack @@ -25,9 +25,9 @@ include Config PKG_NAME = pynetfilter_conntrack -VER = 0.4.2 +PKG_VER = 0.4.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/python-parted b/lfs/python-parted index f87146d1b..214cd8cfa 100644 --- a/lfs/python-parted +++ b/lfs/python-parted @@ -25,9 +25,9 @@ include Config PKG_NAME = pyparted -VER = 1.8.9 +PKG_VER = 1.8.9 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/python-urlgrabber b/lfs/python-urlgrabber index 861153009..3d8727d4d 100644 --- a/lfs/python-urlgrabber +++ b/lfs/python-urlgrabber @@ -25,9 +25,9 @@ include Config PKG_NAME = urlgrabber -VER = 3.1.0 +PKG_VER = 3.1.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/quagga b/lfs/quagga index 6e437657d..629723610 100644 --- a/lfs/quagga +++ b/lfs/quagga @@ -25,10 +25,10 @@ include Config PKG_NAME = quagga -VER = 0.99.11 -PKG_VER = 0 +PKG_VER = 0.99.11 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/readline b/lfs/readline index 7d7fba127..cd833d998 100644 --- a/lfs/readline +++ b/lfs/readline @@ -25,9 +25,9 @@ include Config PKG_NAME = readline -VER = 5.2 +PKG_VER = 5.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 800dfdca1..098950f13 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -25,9 +25,9 @@ include Config PKG_NAME = reiser4progs -VER = 1.0.7 +PKG_VER = 1.0.7 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs index c2d52f1c8..6af1d08ad 100644 --- a/lfs/reiserfsprogs +++ b/lfs/reiserfsprogs @@ -25,9 +25,9 @@ include Config PKG_NAME = reiserfsprogs -VER = 3.6.21 +PKG_VER = 3.6.21 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/rp-pppoe b/lfs/rp-pppoe index f41e5aa18..510bf1239 100644 --- a/lfs/rp-pppoe +++ b/lfs/rp-pppoe @@ -25,9 +25,9 @@ include Config PKG_NAME = rp-pppoe -VER = 3.8 +PKG_VER = 3.8 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/rrdtool b/lfs/rrdtool index d39716af6..1a8959770 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -25,9 +25,9 @@ include Config PKG_NAME = rrdtool -VER = 1.3.1 +PKG_VER = 1.3.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/screen b/lfs/screen index 37d718fea..06beaccfe 100644 --- a/lfs/screen +++ b/lfs/screen @@ -25,9 +25,9 @@ include Config PKG_NAME = screen -VER = 4.0.3 +PKG_VER = 4.0.3 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/scripts b/lfs/scripts index a91462988..3bec7a2c2 100644 --- a/lfs/scripts +++ b/lfs/scripts @@ -25,9 +25,9 @@ include Config PKG_NAME = scripts -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/sed b/lfs/sed index 94218e878..d71249978 100644 --- a/lfs/sed +++ b/lfs/sed @@ -25,9 +25,9 @@ include Config PKG_NAME = sed -VER = 4.1.5 +PKG_VER = 4.1.5 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/shadow b/lfs/shadow index eb3293dd6..2d045ad8b 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -25,9 +25,9 @@ include Config PKG_NAME = shadow -VER = 4.1.2.2 +PKG_VER = 4.1.2.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/slang b/lfs/slang index f719336c8..daba30c11 100644 --- a/lfs/slang +++ b/lfs/slang @@ -25,9 +25,9 @@ include Config PKG_NAME = slang -VER = 2.1.4 +PKG_VER = 2.1.4 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -64,9 +64,9 @@ $(OBJECT) : --prefix=/usr \ --sysconfdir=/etc cd $(DIR_APP) && make #$(PARALLELISMFLAGS) - cd $(DIR_APP) && make install_doc_dir=/usr/share/doc/slang-$(VER) \ - SLSH_DOC_DIR=/usr/share/doc/slang-$(VER)/slsh install-all - chmod -v 755 /usr/lib/libslang.so.$(VER) /usr/lib/slang/v2/modules/*.so + cd $(DIR_APP) && make install_doc_dir=/usr/share/doc/slang-$(PKG_VER) \ + SLSH_DOC_DIR=/usr/share/doc/slang-$(PKG_VER)/slsh install-all + chmod -v 755 /usr/lib/libslang.so.$(PKG_VER) /usr/lib/slang/v2/modules/*.so $(PYTHON_COMPILE) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/smartmontools b/lfs/smartmontools index da60dd256..1a30a37a4 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -25,9 +25,9 @@ include Config PKG_NAME = smartmontools -VER = 5.37 +PKG_VER = 5.37 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/splashy b/lfs/splashy index f32d495ab..9a8edba14 100644 --- a/lfs/splashy +++ b/lfs/splashy @@ -25,9 +25,9 @@ include Config PKG_NAME = splashy -VER = 0.3.11 +PKG_VER = 0.3.11 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/sqlite b/lfs/sqlite index 764ae0611..17ce8de23 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -25,9 +25,9 @@ include Config PKG_NAME = sqlite -VER = 3.5.2 +PKG_VER = 3.5.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/squashfs b/lfs/squashfs index 5ecb40dd0..40eca11fc 100644 --- a/lfs/squashfs +++ b/lfs/squashfs @@ -25,9 +25,9 @@ include Config PKG_NAME = squashfs -VER = 3.4 +PKG_VER = 3.4 -THISAPP = $(PKG_NAME)$(VER) +THISAPP = $(PKG_NAME)$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/squid b/lfs/squid index 73a3235ef..84a0b3b04 100644 --- a/lfs/squid +++ b/lfs/squid @@ -25,12 +25,12 @@ include Config PKG_NAME = squid -VER = 3.0.STABLE8 +PKG_VER = 3.0.STABLE8 EXTRA = yes DEBUG = no -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/stage1 b/lfs/stage1 index 49ecb331b..d60581aae 100644 --- a/lfs/stage1 +++ b/lfs/stage1 @@ -25,9 +25,9 @@ include Config PKG_NAME = stage1 -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/stage2 b/lfs/stage2 index 12f0c3d88..53ba0e55c 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -25,9 +25,9 @@ include Config PKG_NAME = stage2 -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/stage3 b/lfs/stage3 index 684e2f2f0..713707237 100644 --- a/lfs/stage3 +++ b/lfs/stage3 @@ -25,9 +25,9 @@ include Config PKG_NAME = stage3 -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/stage4 b/lfs/stage4 index 57d1fe64e..de229b085 100644 --- a/lfs/stage4 +++ b/lfs/stage4 @@ -25,9 +25,9 @@ include Config PKG_NAME = stage4 -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/stage5 b/lfs/stage5 index da8a25919..c20a28b74 100644 --- a/lfs/stage5 +++ b/lfs/stage5 @@ -25,9 +25,9 @@ include Config PKG_NAME = stage5 -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/strace b/lfs/strace index 5e62f328c..581a60003 100644 --- a/lfs/strace +++ b/lfs/strace @@ -25,9 +25,9 @@ include Config PKG_NAME = strace -VER = 4.5.18 +PKG_VER = 4.5.18 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/strip b/lfs/strip index c865c6390..48cb5c0c9 100644 --- a/lfs/strip +++ b/lfs/strip @@ -25,9 +25,9 @@ include Config PKG_NAME = strip -VER = LFS +PKG_VER = LFS -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) WHAT = -mount -type f -not -path '.$(TOOLS_DIR)*' \ diff --git a/lfs/strongswan b/lfs/strongswan index 7b25ce87e..8e2a8711a 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -25,9 +25,9 @@ include Config PKG_NAME = strongswan -VER = 4.2.11 +PKG_VER = 4.2.11 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/sudo b/lfs/sudo index 852e71cd3..5e0d95844 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -25,9 +25,9 @@ include Config PKG_NAME = sudo -VER = 1.7.0 +PKG_VER = 1.7.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/sysfsutils b/lfs/sysfsutils index 85416eeac..77a4bafc9 100644 --- a/lfs/sysfsutils +++ b/lfs/sysfsutils @@ -25,9 +25,9 @@ include Config PKG_NAME = sysfsutils -VER = 2.1.0 +PKG_VER = 2.1.0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/syslinux b/lfs/syslinux index 9c9e3f2c2..0f81b7327 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -25,9 +25,9 @@ include Config PKG_NAME = syslinux -VER = 3.73 +PKG_VER = 3.73 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/syslog-ng b/lfs/syslog-ng index 19098b4d3..e0e4559f0 100644 --- a/lfs/syslog-ng +++ b/lfs/syslog-ng @@ -25,10 +25,10 @@ include Config PKG_NAME = syslog-ng -VER = 2.1.3 -PKG_VER = 0 +PKG_VER = 2.1.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/sysvinit b/lfs/sysvinit index 3bb98f83b..d2ff8b335 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -25,9 +25,9 @@ include Config PKG_NAME = sysvinit -VER = 2.86 +PKG_VER = 2.86 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/tar b/lfs/tar index 8f647d2cb..06d1f3ab1 100644 --- a/lfs/tar +++ b/lfs/tar @@ -25,9 +25,9 @@ include Config PKG_NAME = tar -VER = 1.20 +PKG_VER = 1.20 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/tcpdump b/lfs/tcpdump index eb9156c75..b050676e5 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -25,10 +25,10 @@ include Config PKG_NAME = tcpdump -VER = 4.0.0 -PKG_VER = 0 +PKG_VER = 4.0.0 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/test-toolchain b/lfs/test-toolchain index 6c0287d83..57657d69d 100644 --- a/lfs/test-toolchain +++ b/lfs/test-toolchain @@ -25,8 +25,8 @@ include Config PKG_NAME = test-toolchain -VER = -PKG_VER = -1 +PKG_VER = +PKG_REL = -1 THISAPP = $(PKG_NAME) diff --git a/lfs/texinfo b/lfs/texinfo index 8b1687aa3..eb871c83b 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -25,9 +25,9 @@ include Config PKG_NAME = texinfo -VER = 4.13a +PKG_VER = 4.13a -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(PKG_NAME)-4.13 diff --git a/lfs/udev b/lfs/udev index 25b701001..1cd0c9c62 100644 --- a/lfs/udev +++ b/lfs/udev @@ -25,9 +25,9 @@ include Config PKG_NAME = udev -VER = 136 +PKG_VER = 136 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/ulogd2 b/lfs/ulogd2 index ab4b6ff8c..e3ddac9bb 100644 --- a/lfs/ulogd2 +++ b/lfs/ulogd2 @@ -25,9 +25,9 @@ include Config PKG_NAME = ulogd2 -VER = 20080119 +PKG_VER = 20080119 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/usbutils b/lfs/usbutils index 2e66f9a99..a467ee480 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -25,9 +25,9 @@ include Config PKG_NAME = usbutils -VER = 0.73 +PKG_VER = 0.73 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng index e4c81508f..8db90ebf4 100644 --- a/lfs/util-linux-ng +++ b/lfs/util-linux-ng @@ -25,9 +25,9 @@ include Config PKG_NAME = util-linux-ng -VER = 2.14.1 +PKG_VER = 2.14.1 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/vim b/lfs/vim index ae008fa7f..58df0376a 100644 --- a/lfs/vim +++ b/lfs/vim @@ -25,9 +25,9 @@ include Config PKG_NAME = vim -VER = 7.2 +PKG_VER = 7.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(PKG_NAME)72 diff --git a/lfs/vlan b/lfs/vlan index 56510036a..28beca9b0 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -25,9 +25,9 @@ include Config PKG_NAME = vlan -VER = 1.9 +PKG_VER = 1.9 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(PKG_NAME) diff --git a/lfs/webinterface b/lfs/webinterface index d634d8839..ee81dc70c 100644 --- a/lfs/webinterface +++ b/lfs/webinterface @@ -25,10 +25,10 @@ include Config PKG_NAME = webinterface -VER = ipfire -PKG_VER = 0 +PKG_VER = ipfire +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DIR_APP = $(DIR_SOURCE)/web OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) diff --git a/lfs/which b/lfs/which index 90c998108..6e959fe83 100644 --- a/lfs/which +++ b/lfs/which @@ -25,9 +25,9 @@ include Config PKG_NAME = which -VER = 2.20 +PKG_VER = 2.20 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/whois b/lfs/whois index 5f297c0e8..9cc6ac9d1 100644 --- a/lfs/whois +++ b/lfs/whois @@ -25,9 +25,9 @@ include Config PKG_NAME = whois -VER = 4.7.26 +PKG_VER = 4.7.26 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 98c50276b..a45421e63 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -25,9 +25,9 @@ include Config PKG_NAME = xfsprogs -VER = 2.10.2 +PKG_VER = 2.10.2 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP)-1.tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) diff --git a/lfs/zlib b/lfs/zlib index a1c50e937..a454f1359 100644 --- a/lfs/zlib +++ b/lfs/zlib @@ -25,10 +25,10 @@ include Config PKG_NAME = zlib -VER = 1.2.3 -PKG_VER = 0 +PKG_VER = 1.2.3 +PKG_REL = 0 -THISAPP = $(PKG_NAME)-$(VER) +THISAPP = $(PKG_NAME)-$(PKG_VER) DL_FILE = $(THISAPP)-autotools-1.tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -104,7 +104,7 @@ ifeq "$(STAGE)" "base" cd $(DIR_APP) && make install cd $(DIR_APP) && cp -pfv zconf.h zlib.h /usr/include rm -v /lib/libz.so - ln -sfv ../../lib/libz.so.$(VER) /usr/lib/libz.so + ln -sfv ../../lib/libz.so.$(PKG_VER) /usr/lib/libz.so endif @rm -rf $(DIR_APP) diff --git a/tools/make-constants b/tools/make-constants index e7d6b55fa..7554bffb1 100644 --- a/tools/make-constants +++ b/tools/make-constants @@ -35,7 +35,7 @@ CONFIG_ROOT=/etc/$SNAME NICE=10 # Read in kernel version -KVER=$(grep --max-count=1 VER lfs/linux | awk '{ print $3 }' | tr -d '\n'; grep --max-count=1 LOCALVERSION lfs/linux | awk '{ print $3 }' | tail -1) +KVER=$(grep --max-count=1 PKG_VER lfs/linux | awk '{ print $3 }' | tr -d '\n'; grep --max-count=1 LOCALVERSION lfs/linux | awk '{ print $3 }' | tail -1) # Read in machine type MACHINE_REAL=$(uname -m)