Renamed some fields...

diff --git a/lfs/Config b/lfs/Config
index 8a7c59e38792dabe6688389fe1af63d54bb1bb5b..c0f750666e07d1f55d2ed3195a29a22ac48d9974 100644 (file)
--- 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 61865cb9cd215d5d89155945c6c280fd65e31efc..0e61d9a4b4b43ac305c01f20b757ad0b807c01ed 100644 (file)
--- 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 ab07420c621d10ea691cba59b64abd33c5348e3c..0d59a82da620f2dae800bd3a2bf4f3808ca3bd9e 100644 (file)
--- 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 6bc3c37a5269bd2a461ec54c4afca7fb8f583082..e899103954dbe9c37e9ebc159ca5ad2312fd46bb 100644 (file)
--- 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 ac907e239077288d20e8c5c4b37d0bb0f64a5c1f..43ee816b90af1581fae811a959404f1f10714479 100644 (file)
--- 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 8ce6172ead0c1be973cf3da4c106e7aea9458ae6..1dc9839d1116ece3b13a1948143010d532c71299 100644 (file)
--- 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 b93964b7e3c738a383d6bf1741323d6e2fbfaf43..c0ca6339ad1db178d3f9beee50df0eb80c991b18 100644 (file)
--- 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 58dc04e0f27629d43d873b72beba30899266d44e..1aa568c84b84a343118dab0d43654677fdd02cf1 100644 (file)
--- 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 fe83d9c3f113761d421633766aab8df062655dc1..eda67064afc6c5976707d6b6c0073c0b202fd3e1 100644 (file)
--- 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 e5014b8bc275835e680f0874c9defb6e48f3d0f8..0e07695b484fb1058c018d1037538aa1d0914a07 100644 (file)
--- 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 423221be28fd10844474968fd74ce7b27005eaac..f136fb6002fa551633bb0bda8c25cb34ec4616fa 100644 (file)
--- 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 4233b5b79ad4208f5a67dbe07fffbebe3ba8b80a..723807c409ce13100c2316cb943c104b9aa0b20f 100644 (file)
--- 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 c8ccbcdc0cd111be8762a5b22d422d421bd8f48a..4efbce1c60133dcc2a535eccb43ada3c6dddd190 100644 (file)
--- 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 89afb3e88112f6c09eac0ea5deb95c2e60a3099c..f951072ef7bda88e7545d33b758651147512726b 100644 (file)
--- 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 f7654e7525affab66d3116625d4d1e9ed2cda928..b9dae0bbcf02ef86b7bc537c7fe19dbe48f02d4f 100644 (file)
--- 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 88215bfb6c9b9af47254d6f26620c375f1199899..8a47dec954418fdb114e9bc2ca4f9805626a19bf 100644 (file)
--- 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 153d4f9c55a4b7b908884e08fae78c855cab88a5..58f7b0459c0d1efa330198a33de6a87f20a581c6 100644 (file)
--- 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 24c3eaba1e3b054fb8f726d8f37a5b8ecb159d3e..1efefbe1e5d8cf73467c0376c1d78a8dd56d2648 100644 (file)
--- 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 efe32ccd0f8bd201ac82d0957afd2f01f32dac7e..df5127e7d199b9b068e8d8a1c64e53288401a87f 100644 (file)
--- 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 73c80d1923a95647ae220586bd2f21f1057f74cf..8222375dffe286c0a53251ae5a6d23e0a6104600 100644 (file)
--- 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 de4323fc88595d9c25e73cc3a313bcc835a6f58c..a91f36b085fe35e87724a424021b13d6d25960cf 100644 (file)
--- 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 f616861ef7be4d5f405795430690d13713a41acc..7c487999078b6e27d67e9604e624bae4cadbcb41 100644 (file)
--- 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 38630a95882e7611733ba6b8377bff14cf40e9ab..e606903450134ff3a696eb26436c334df15a683d 100644 (file)
--- 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 de25c7f7ea7c2a62506b66dc9203a76b5c95b2dd..daca7525be9b13a631ee2a6b9849a0563b4fd8a0 100644 (file)
--- 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 e1a36102383f1578d8b3eaed81784cd12b942a7f..eb81e9310cf3f8431b0d463942b59f577c531bd7 100644 (file)
--- 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 32e7d995d14a0f8dac51cb043bd3412941114888..d6858c83985b69d8fd2262032338d0c274e255d0 100644 (file)
--- 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 6039486d18e79308b5ccf22c0731cbdd538b2526..1d446e46e42a4f395ace0ad39b94c6219317641c 100644 (file)
--- 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 ed8bbfa76640ea4567e6f6a2c445e873e03b52a0..5246ad0847c4d98eb556453119e440e472e22d44 100644 (file)
--- 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 dd1d9b1d213d5596e0549c92bc7786f69c987aae..16bcba52abeb3b57481c8df0f1630a967de90d82 100644 (file)
--- 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 42756087ef1fd1ae014316671c2f8e06ca7ae213..57acbe563a2616fe7345ba5fd2ae67cdedaef85d 100644 (file)
--- 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 9d547d72c064efeab815bea6a57b7cdb56521cc6..9e270216c58a9a60a4240d8471ff90be7185211b 100644 (file)
--- 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 d6e558ae25800bf44c81bfe007d74dbdf233884a..7d85fbd4243f7e6ec907944e3bad6b52b78a79c8 100644 (file)
--- 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 9a4ce2e43269e4ebbead725c826690f09ee9d506..9bdc0835486c742fa29cb28e5294e90903b55a4c 100644 (file)
--- 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 512754d617e185de3b764fb18749cbbc68046ea8..ce5b0750cf9d117a04048425c273616db4e0e3ef 100644 (file)
--- 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 7c209cad9251df15040d8f06d116c426ba0f2b38..1cfc1384bc7d0c4f342f6ba092169e56673f4c26 100644 (file)
--- 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 5afe5aece7d6b9badaef71e6f8349faf122d6ccb..fe397d67870ff2c243e699458c3c16621856ca69 100644 (file)
--- 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 4d043490a455b50b47b1dcad0ff6e120489ba92c..930a992a10235cf5cded6bc116e0d482609827ef 100644 (file)
--- 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 8fc0c450fde59c88d6e33d559ea22b7cb6fdfea7..74e6cfb2e4a391ae68bf83a29326cc467ddf938e 100644 (file)
--- 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 32d8ace96982255884e0541cd3231e4fccc9cadb..d7b8779d226a8011916f085d5efd9841d4f6aec6 100644 (file)
--- 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 057aaac0db3cf7a02b14a7db6b8f7a71782417ae..0425951ac0e9761b59371671ff3419a57c9c19d1 100644 (file)
--- 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 202b2ce7c8f2a6e7dcaa2b80626cd8da8c3a737e..33988859e2854201a218bee3e38c9d8eab0fbb6c 100644 (file)
--- 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 a5d672d3d1fb19fcadeb6eec329e2ec9337a5fcd..6487e69b44b907312ab061802f013b7de4ba21e0 100644 (file)
--- 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 13945eebf79a15d8b71eead2df706e8963b6ce77..d165d6c925cf155cd668e9b28a53a8e0b6ac8387 100644 (file)
--- 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 39b5398f543811261d943a273b536ceb8a615fcf..ca8f6090074af2ab6a61501bee556f99d6366d99 100644 (file)
--- 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 030a64392ec51dc42126ee7911c2b8750b08bbaa..c80e8f8d6259d8a8b9c51b8bfd53bf78671f7806 100644 (file)
--- 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 e610dd6eb98f9391bed42e957ed9c9be9087260c..c2a0bdda1e7bd2a28f4b57717e41073455871152 100644 (file)
--- 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 7854a360b1b719f3cc9d7dd4d538a4dfe7ed8bad..05923a8e6c00a1aed26ac680acc7f0fc8bea60cc 100644 (file)
--- 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 f43faefefd084f368de3f958462c9ebe2de202b4..a4256c03c5cc6e99e5aac64a349f4d82da3d6969 100644 (file)
--- 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 bdf3dc5ab581b7dbe364ee8faf1b2f6fff6eae18..1a7281ccdd4b448dfd8f4f2eeda629e5fdb3935f 100644 (file)
--- 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 c57cc58ec80747d365efd230c92488f4794e2ec2..ac8b9ca2de5ace7f836237f79d4a7248763f307b 100644 (file)
--- 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 d17a126445229a5aa2c3fb8cf0ceaa5969caf020..63d2ef09f6aacf9c69364f9606c400979a4f4eac 100644 (file)
--- 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 0148b2cffd1aff128b635dea75aa8cc7bf9f574c..66099bf88faa524758cc9d921f5e0fc509829dad 100644 (file)
--- 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 4b7e8c1f4dee942dd9c1d52695f9eebb2394b77b..78abc05282ae76a30c02d328619e1a0190368a75 100644 (file)
--- 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 c5fd34eaabce1db077525b6268ed337b257caf56..bfbbe8230d953315f2172ad4533223704b7bb864 100644 (file)
--- 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 c431ccb37ed61445cd51b700f6912ffb1d761013..93e9be528dbbc056b693703ccd7ee5ac0af9b441 100644 (file)
--- 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 3ed7987759303a8300819ddda0f657a4957e6ead..d2cf72d10b3221552fdff9fd6c2862ece776e09e 100644 (file)
--- 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 6cb041bd4496feaa38090417003529c5d0d62ca0..b9238cb7acf6e737d6500bd964bcec1740c80707 100644 (file)
--- 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 a577a31cda9d1649d0732d5e179f21fbc840b804..39805c06cdf8cf1af2639e78cc3ccd75c3feae7d 100644 (file)
--- 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 7e2afd7e550814775821ae2b36f683f9911a5065..c1eaad700880c47a56f6e619a16048f8a1dea03b 100644 (file)
--- 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 bf8f29f57b6a84fa8e4c201f6842f22d65ea69fc..cfa9572e17abd0c0e2181ab1021f140fdb123f55 100644 (file)
--- 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 4c715cf81805da2acdfd0a632eb1c13b3fc6cdcd..df68fea0d902e02cdda56fe1197b778b2b1802e5 100644 (file)
--- 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 b9540ef7c551884e3c9886323eac3f495db79c24..6520373e2902a5beb30a24b31f7ac11fbe754b3e 100644 (file)
--- 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 a38457a0967642d5e59eaa2824ad9dc9803bdeb8..c71d97ec12e0bb294fc9f6fbd3ec3a928c51707a 100644 (file)
--- 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 7dc6e7ca3cbde9aadea06f98b9a43f480b33648d..96c300215405f9b257e7286676f29abbe44b35c8 100644 (file)
--- 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 db5a98a70a0255dbcf90f1dd92d465293109ceb9..f16f31806f8da60d670d71839022a100c6e5aa7b 100644 (file)
--- 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 99aae154762f72ecdfabccac651e848f30fc1d1c..cad425afce7b828c3b665f2865158f6069f100fd 100644 (file)
--- 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 4e8fd73847f559705ffaf982c8c54da48b5ff5ac..ebf19e7bfd917afeb01ebca344ee0ff0d3f9dee3 100644 (file)
--- 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 339fe3ddcf7a1fe11409539a4130aebc721a1227..b7531a2f3606eb2af83bd856eaca98470380c499 100644 (file)
--- 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 1c22d9876fbe0e06f8f272e077ec1b03f251bf24..6d23701c4562624a3e95d8d3f3cff9e4d6a1413b 100644 (file)
--- 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 9e022ce14f03f3a08af02547523b29b0eca4c4e4..4f05c611ba79f22d30d9aeba08269fa1974571af 100644 (file)
--- 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 afba9e5df03a900b33428dfd9ef3e58bf1835ff4..26b49532ff5849b5f7ef1d0280cc15a8f662f2c8 100644 (file)
--- 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 6f7a18212e2dcc41cdee4ca17ff9978c02287de1..9526c349ce896c1f0d0ab91aba16ab308f03269f 100644 (file)
--- 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 e96db1e0989ad8b830d961d91c5981efb4e7b3d8..40cddc373803b05d3ef61aa02d8b49e53228dc6d 100644 (file)
--- 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 b9e33f1dc2412a41266e4faddf16e7bed58861df..0fc5d405649ca30070960e819c6806292ffe784d 100644 (file)
--- 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 1364c9aadd0bfdad1e267cbcc9c33e9cbce23b70..510ff39d39a2f7e7868275fd39b5337837464a11 100644 (file)
--- 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 1caece974ca2efb15067a4317c217ada64c4cd7c..f68f9b687f0e5359f360bc262e99e4004c912bef 100644 (file)
--- 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 7ba25398aca9bc06b5da68792c8b5dccfabb2689..945cdc4029434214f7e4dc712e81116153087a62 100644 (file)
--- 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 7795025814dc7a5418f6213aaaecbfaf72221bb7..a143c7a9ada88c1a8efc8a63ec3db47afa983d38 100644 (file)
--- 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 415aa1e36ce4e4d9dd79ea55d607156922313d2f..4a9647dc1d972323c41900d1ca3bc9a11870aa3e 100644 (file)
--- 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 48ee16e7c5dcceed0ae442ad5c588d7bf773caa5..dec8fb52e2f2031158c3bbd1bd4f0642de5763a5 100644 (file)
--- 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 46d584849c97b5fbf175e5e6ff09b7ffadb786cf..12616d7adc23363874182644c982225cd1ca2841 100644 (file)
--- 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 11610964ea6c9210dae26a87a82e659bc6b3b7bf..dda97e9ab752963f2116dc203edad461cbecf2d4 100644 (file)
--- 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 b9ef792813b684ad71b16547969864859f65a315..df1a1ea7f886235328a19fbd3749ee6fca9d04cb 100644 (file)
--- 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 5a6b52e01b625bc843e6b9519f9ef07abf48ff6b..3491b20bcdb5ba5e909b722adb6059b1b5be074f 100644 (file)
--- 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 13ff7e8af8ff735e25c3b183b4cc390e573a38b5..120d1f24eb20cd5eb6aafa57d01a00204bbc3355 100644 (file)
--- 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 9b934b2154d79b0b2e9318b2b885c2ce72401e8d..1fadec4fb56aca9cdf09f8fd5b47bb4eb7cee61a 100644 (file)
--- 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 6e6a9c42c122b8963a261690f5bd64f7da04bcb0..488af1ffc6aff3717176d9c324938bbf7fd036bc 100644 (file)
--- 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 8324d667dcf99f8272f65945df6e268b6bbd7929..61570d590ec97d2d5f56020b530a8d26ca6e23e0 100644 (file)
--- 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 38855bb83f521f2894a9b912a8426646fc73d66c..ae534940ec8d8784b7065c4df9fc4997e9541bb1 100644 (file)
--- 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 dd0d028564dfe5518fd0ffcb9f9202e3f9b680ab..23c41171d9e3338a1ed5a955d38e92ab6f1d742c 100644 (file)
--- 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 002c2ddf9c68a56109ba66a7a1b29ae35b02a045..8d2497eeea50e426035aa491dc862117911e5902 100644 (file)
--- 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 2f8a29ab7531de7f359b2c0684833e31299bb390..134691d58a7457eab00df5a04aa34a9254aa1513 100644 (file)
--- 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 83e77f5bfa0512e2e3e11f37242427be5e911e58..3e6fcc045d6c9fed28677c8f6bed854a9eb714c5 100644 (file)
--- 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 4b9d6b1bd3ccc594261ce0c044c07e088f801fb1..f423c7591edaafe64c0dc92db5f12298e07caaa8 100644 (file)
--- 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 766aabad23eb3e8062eeb902f0f1a3aedf4a6969..2b4ceae342bff781534b37e488b4753908ff4d13 100644 (file)
--- 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 a67f9f95070e993602a829b0d26d7545be254133..70a812ef584f1f7dd5cdaee880b53cea069f37db 100644 (file)
--- 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 c085b0e9df571e15631fc9162363ddc37ac16cef..42a923bed71f147ead7909668dc30fd0a41051d7 100644 (file)
--- 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 3835978901461fb68268eb01a8c49d8280f82a89..f50be10f9827cf4a454762622cd54cfca816f972 100644 (file)
--- 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 0a0ffa7819fa80edeebf4035b68b08b87a924a3c..b402a0b1de1956c26020ccd0cde7242b571a1210 100644 (file)
--- 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 93c714842d2e182c1cd5aa1e58e757e2c7ade103..6c24e9b9b203b00bdad29061882798bf6d2e1389 100644 (file)
--- 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 acfbff2e4dea34613533f36906903fdef9f2f7e2..832c8d51cc70987a5bad84137093e2567f0806dc 100644 (file)
--- 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 e7ef6fca273de5aa4f6e4826ccbb5c4a0c1e2186..69920c5fa798bf54455334a1f5ca919abadfdb52 100644 (file)
--- 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 4f6114cefb8038b8a4a6b33a66b6436e00a23809..81cc64935c497a078f4f87d900704fbc934988ff 100644 (file)
--- 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 af23bf9a0fa73cd44448191f7ca341ef21644779..c14064320501594381d05d28dc07643814daacbe 100644 (file)
--- 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 5e93f5da0aee5927329aa3430af06398c6ea132c..05676e3b30cdb42364c3da22137ce0df9837d314 100644 (file)
--- 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 d93fb118725b8780c2b6412a147d2ce5bbd9f285..7e4d0c83258132b640a20fab09611c705f1b5ea4 100644 (file)
--- 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 21d57030406d98ad759d1685be35fc3cab365261..9484fcf1ece9d6a2a9ba8e4c4d143c5a46691645 100644 (file)
--- 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 25cbf0c5f59f526b7f15e30471fb7c26c0ed25c1..c961ccc2d6d546edd15d9d8ae9b96aeda05623f7 100644 (file)
--- 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 08bb857bbd820a40f50623685386c0186aad01b8..e745cd163c5d934a62705f1689cf6e2d9264d695 100644 (file)
--- 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 45dcaad08d3a34a45be0136d33f00eb2a47f5645..2c630e73a129e1adeb7862fba23a7f04f8f02390 100644 (file)
--- 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 83d3fac7c29c70fdf63645ec9e6a595c6668600b..0ca13e852b6a9fc860a571168249b611c352cf98 100644 (file)
--- 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 8fb3079d6aa52fb5163e151260f9f1ea82b2bcca..a94fad5d9ab8d60c1a44dd06db8af4d9dc9ebd4c 100644 (file)
--- 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 1241d6010772f40cf08b8d920e6a0ad6d1ea3ddb..f4a035d761c2e47aade5b3096e3e5de472f7eab1 100644 (file)
--- 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 cf701a27e157e3f2f1b7c1457112591e202bb918..fa0a936aa250d54f14f263f8a77151a00baa4173 100644 (file)
--- 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 10e8f3142270449c878a27d4b2bf36052db8204e..ee963267314823a9d471f552fb823a9afc378ce4 100644 (file)
--- 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 4937b2fac72f968fb5ece5fd5d4729901a8917dd..b0748f129279909758be4bc431a59e2244369592 100644 (file)
--- 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 c6b6a7896b3afa8248f96ccd603b758fbb01256e..215380b80f1852066b82368816ec3872c1b69075 100644 (file)
--- 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 c10ee2984acb7a7a9636e6065b6b5ec81550154f..6fc0415a4f4fa5035298aa8c90537769cc2e58bc 100644 (file)
--- 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 d51f3336bf18c1cb735a7c9646eb5830ea59d829..b4bd2bd145ae0914f16884bbf3cffcdf39b94878 100644 (file)
--- 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 bbe602a5225472446a5718122107dd3af8f1b950..6f18278ea58a63574d43915e0b87785cf0ab39c2 100644 (file)
--- 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 a1a96fd7ec5158e2f12a8b7e7493237e5d234dbc..3c1de5cd9b3ab4656819c01974f3869ae6364807 100644 (file)
--- 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 8f19537cc850616df0cf43b3e93d910685f158a7..3b86dd908f1b7cdac252ac0aa3117067938b81da 100644 (file)
--- 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 dd2ba09d7e288c770d7e591fe2246bb731afaa57..8f4c73acea295c7d6d98fb0a6138921a2516a6bc 100644 (file)
--- 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 9c79b944144431544255d2b7e29a1fbc1074970c..4f6adfd2e382e98505f626b535d372f0bd6fb7be 100644 (file)
--- 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 081d4a353309819878045e74337a1f4148924d80..5be258ba8946eb787649adc6254d5083abc5e5a1 100644 (file)
--- 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 c4e10b6599074c33781ea06ae02c94d531732645..e0d33cbbf5681c7356ae3a0af41f8451a5ee3898 100644 (file)
--- 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 4be13a5ed15cd1ad0108dec176baaa2360da61b4..b14c49235cf71518ea0aa8339371b32cd8ad24e3 100644 (file)
--- 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 42cbb236ddcd3eb1f1ecc2e9e5e31c7dcaae15f6..b2078417d7ecd1e2d8b6146f3ee1003346cbc2d9 100644 (file)
--- 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 9b0801120a1923400e7e290e0c82e7c13069aad9..8bfdbc7dc0f6661efb61164605fb55b4d08cf2e8 100644 (file)
--- 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 7ff93ed46730e00eead87fef6dd24d99afa1bb4b..d570ecaa9fed1bd3529c903d90028c16b6dbfb75 100644 (file)
--- 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 2f3acd781c114864c42581b056ef124edabcc169..a195364eec2eedf2395751c5e81e32e2ac1a1710 100644 (file)
--- 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 67ab7c548b35e73aa98ee3827f9bc499bb637076..86bc48c0fd58d2d32051424b46ef91fa87c6bd8d 100644 (file)
--- 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 f5659cecfb1852defe678619c11963cc1732fba8..797715e0d959a32db523e00a9d79c1f61ab8111e 100644 (file)
--- 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 8fd4ed90b13d776553241d90b409508f3d5aef9f..8a758596dd16759268e2eb2688a255628fec9610 100644 (file)
--- 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 f5e84c46d561cd2c6d9fe11ac3fd063d885ab80b..9394c2cc820bc593096814850cd923e7a3cab749 100644 (file)
--- 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 3b7b13ff2e96c2e6dfbe1d2d216246a8796fd918..36ce31c2188ac106c5d76ed7df2b60275c0f1795 100644 (file)
--- 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 c05725eeea4c7271ffbde6a1528928ea38e8c3ae..5d11b6768c88b439a5a641a2b05d767dfbadf79d 100644 (file)
--- 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 19d6ce3d3188cf28998bb60c10759df22a4f1da8..b47fc3f2456da351a85593dca5a6eb6dc69bed30 100644 (file)
--- 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 98260ac938e0c1200f5d2e4bcc2db3f52ca344ee..948c710dcbf9ced1e1e35c2071fe576cfbb2ea9a 100644 (file)
--- 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 407af4a6bc75e58db4650fff97a93cf6740de5e6..39b81577326bf1a8d295f285d27628810097aea9 100644 (file)
--- 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 faf15389a265bc9829e94a8e21b324903c4fbb3f..281e80b4add5c8f3d01276fc9c1a0981d9a7917c 100644 (file)
--- 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 551da9d17aa3d744a2d678908b1dbf89560abdd8..3c834dfbf6e0828fbe5b72f2c4f2c359c3fb8bfb 100644 (file)
--- 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 562b1cf7f66978ca6dd20cd5dae8a348928dc2f7..a81da1f8661a5fc3351cfeed6fee47538fb6ab46 100644 (file)
--- 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 2397f9278cf6a8848137ad3b23efb6cc9665f0b4..b384fa34cc2844d54726967003d7076847e2f9df 100644 (file)
--- 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 30a4eaec0ea7bc671b702da0cdb881ff3332cb4a..39b2f4e5559a387583db11f019ab3986d2425dc8 100644 (file)
--- 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 f963ac58c965be287ef794054944cbfc0c58bc70..dfa8006132b250cafd7ec0df6f0a2ebf2b517efe 100644 (file)
--- 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 058f667e3ab231774f408ae75a8b6842994abf84..dfa87ff428f6862b59a4ebdb552f4479e9caf7d2 100644 (file)
--- 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 ed17af83e932312e8fe1b4810a90185c3c0c9c07..3ad52783be1fa020a19841e3f58ca82ddedf5b7c 100644 (file)
--- 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 d3903fb0b662d626566721e512dfa0869af00e1a..b6ae8cbdb267ccddb33121b644a0bd4d32293f3a 100644 (file)
--- 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 18273507f036f2d47f1361628159021e3b0f102c..38bc79583ebdf2aafc28bb8b027924dfa974ecc9 100644 (file)
--- 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 c6f9e97acca1644370e536af91d6b6ca28910cd1..3b6c07eb1233a64e5165c9d9c387c5856033fb78 100644 (file)
--- 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 f87146d1b8c0e53cd9ed3e92ff579d981a2ce77f..214cd8cfaae4d00bdbfe923b38d96db22f79524c 100644 (file)
--- 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 8611530091c3d7122a595f865877d62375b74da8..3d8727d4d91ba876e45d1aa11d0d8b63f07756f6 100644 (file)
--- 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 6e437657d468c813e829af31d7903184a531a2d3..6297236108ade9d14892acf5d9884729bbe2877f 100644 (file)
--- 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 7d7fba12793b9366f164f8331ae512a62241fe28..cd833d9982d9c0c027581cb578852d5b0a8ad638 100644 (file)
--- 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 800dfdca192e052bcc70a93f019667161d962d70..098950f134662e932bc9a268121f025f66e65551 100644 (file)
--- 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 c2d52f1c881c288cd27088f71ee9adc80287a5a3..6af1d08ad7bfcab5c35c3aa37e4a77f102cc0724 100644 (file)
--- 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 f41e5aa18d70c966946c3921827fac5f8d86983e..510bf123924fa68b749c97b5c960bf5eda1c5f52 100644 (file)
--- 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 d39716af6395457579efb7414b08cba3599888dc..1a89597707e35331898af83f9508cb88f90e55f5 100644 (file)
--- 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 37d718fea7bc563909cfc78ac75eba29d2ecc282..06beaccfefde1fe0d920a306f993e2e2be976be6 100644 (file)
--- 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 a91462988e48408bbb5abf987482862fdfc7d2a7..3bec7a2c22e1a6fc4581c8dc3d4ee134aba609ab 100644 (file)
--- 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 94218e878a6880b9f166749c8e4ad78f5902f91b..d71249978435f506095627a93b44316ceee8fe6b 100644 (file)
--- 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 eb3293dd62b0d26c15888bc121440484e0605147..2d045ad8b77dede0b39b3f6b14531f6192358e14 100644 (file)
--- 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 f719336c8c51915856eca944ba0c4b25fe843e08..daba30c115189529dd294ac90d65a47a82144ca4 100644 (file)
--- 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 da60dd256040fbb7e6af5d26a3d55655e9d1fd5c..1a30a37a4ee68bb0fe311e5c63a8a2f0e369a328 100644 (file)
--- 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 f32d495abcf14750ac832d672d212c969c6bb4b7..9a8edba14ffdcf8a287ad3a87a985796dbfb06d8 100644 (file)
--- 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 764ae06118e99394cc07f9643698e9c7e4c65ab2..17ce8de23567a8a854dfbb75918409a1f92e8d57 100644 (file)
--- 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 5ecb40dd0562523b65725f5b2960372293f55c89..40eca11fc33bb4a9937e0f8eec55bef0d6d2c87a 100644 (file)
--- 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 73a3235ef6242b350f388364c1f93cfc61f20103..84a0b3b0435fa4daa4f4e22b51c0a8d4966dd2a7 100644 (file)
--- 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 49ecb331b8f889f0946cf2cfadd7d02475468d5c..d60581aae4201e7122e22449f69b14805ea2793f 100644 (file)
--- 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 12f0c3d880901ecb6d6d2517e8fef1dca24f5e73..53ba0e55c8b95693afd4dee32d10e8eb2f014fcf 100644 (file)
--- 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 684e2f2f0efb38116ae6dcb8df38a156901b70f6..713707237bac1b22ff4a5a85068025e2cdc9595a 100644 (file)
--- 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 57d1fe64e704b46a35f9deac0b247f5c022e01ab..de229b085cf0ae90f4eaf68f136ee773df349cef 100644 (file)
--- 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 da8a2591975bde4f9642a7cdd5fbffd7b0d62f60..c20a28b744023949305c23b418e972a6d0997a0c 100644 (file)
--- 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 5e62f328c1b11acefebbcd06b51c497645d89dbe..581a60003de125e1e3e866e7304815c77535d033 100644 (file)
--- 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 c865c63909d5862a1a9ea311e252074462311c9d..48cb5c0c9e6a856e50b1b7bc9eb95ecca7dd39c1 100644 (file)
--- 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 7b25ce87ef2fabae882677dbd9055f0c45ab8a13..8e2a8711ad7087b66e7d746180f1f3d32a81296c 100644 (file)
--- 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 852e71cd3889b361f063be36acea5faddf255cfe..5e0d958444a75ac277dfeff62cebc52622458da4 100644 (file)
--- 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 85416eeac1f21a166b85117b0c85a6e3f5acaec5..77a4bafc96ca177675f88c043a5fe60fc80edec5 100644 (file)
--- 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 9c9e3f2c26647e949f96b4c3610375db4990cb2a..0f81b7327a45ea1aedccc4b73756cb0e5f75a963 100644 (file)
--- 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 19098b4d35b2c88202fb33be0516d79e78b85503..e0e4559f0833f849606fc39e5b0fc3d991523baf 100644 (file)
--- 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 3bb98f83b0448dc09dbf827a1bfebceda074c350..d2ff8b33547a6f649646dadcdffcb23a9cfe4efc 100644 (file)
--- 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 8f647d2cb2199e9eced5c01013c41792b651c584..06d1f3ab163c9dcc9ec4e4176913d85918dd6622 100644 (file)
--- 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 eb9156c75602b4777ffb95e474b7db888b227e46..b050676e566b670d8b39d13bbace2a86ff472b29 100644 (file)
--- 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 6c0287d839993476570a76854968174ea5222416..57657d69dd339ca4cb336f0cdbf395d93407aa9e 100644 (file)
--- 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 8b1687aa32efa386cd89eb4b12168077a22c8109..eb871c83b91402db43defeb1d135b172960554ea 100644 (file)
--- 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 25b7010011874cf8e25850f3ff3805bc580db1af..1cd0c9c62d871853b3b8ba371e62977cae948ec9 100644 (file)
--- 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 ab4b6ff8c5c7139fc96d908c9b2439b196595b94..e3ddac9bb98917e67c0d9f738bd09489235aed8a 100644 (file)
--- 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 2e66f9a9922b08965adff72a20fdf6e7e6b4de9a..a467ee4802fe2ccbb397944e0aadc7ef134d3d97 100644 (file)
--- 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 e4c81508f9060c8ec17c4df2e30ba5ce29bfd221..8db90ebf4d67868281333997df51364540b48fca 100644 (file)
--- 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 ae008fa7f7bda5d2968c1e2c59f1b03bbb086617..58df0376a1b99c8901a9664f3bdd461ba8ec96b6 100644 (file)
--- 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 56510036a477b3d93be667f859c4a55c96b44660..28beca9b0d09e5aa05b3f36082e4c906687a084e 100644 (file)
--- 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 d634d88398160f284e5d0676a842ac88a36bbc9d..ee81dc70cadf3dc35721c6ba4265018981a66242 100644 (file)
--- 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 90c998108b795076e86ffe6a3641d4d53eaab418..6e959fe83258a930ab8dc07c7cc36f19ec8a9f85 100644 (file)
--- 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 5f297c0e889fc1e669a7580c77bf86e54283fcc7..9cc6ac9d1ddce910cfe57bc8cf9c81e3dbe96150 100644 (file)
--- 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 98c50276b73fbcfc1a3b3c596e0658b736671dc7..a45421e630423d79c9953cc60af85012f6da6a77 100644 (file)
--- 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 a1c50e937cc937f924e111656b14b903f479228d..a454f1359993a9f971cf549cc18492942f5bdfb5 100644 (file)
--- 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 e7d6b55fa24206bd287795697e3186d22a59c70e..7554bffb1815ffa07d35db80ae3c6a2767689641 100644 (file)
--- 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)