From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <lorenz.marcel@web.de>
To: development@lists.ipfire.org
Subject: [PATCH] less: update to 481
Date: Tue, 23 Feb 2016 09:51:38 +0100
Message-ID: <1456217498-14520-1-git-send-email-lorenz.marcel@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0681576895587306815=="
List-Id: <development.lists.ipfire.org>

--===============0681576895587306815==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update less to last version from Linux from Scratch.
LFS is prepared for tools build. Need for later Perl 5.22.x integration.

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>

---
 lfs/less | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lfs/less b/lfs/less
index d9680c8..dbf66af 100644
--- a/lfs/less
+++ b/lfs/less
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 443
+VER        =3D 481
=20
 THISAPP    =3D less-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,6 +32,17 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+	EXTRA_CONFIG =3D --prefix=3D/usr --sysconfdir=3D/etc
+	TARGET =3D $(DIR_INFO)/$(THISAPP)
+else
+	EXTRA_CONFIG =3D --prefix=3D/tools --sysconfdir=3D/tools/etc
+	TARGET =3D $(DIR_INFO)/$(THISAPP)-tools
+endif
+
+
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
@@ -40,7 +51,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 47db098fb3cdaf847b3c4be05ee954fc
+$(DL_FILE)_MD5 =3D 50ef46065c65257141a7340123527767
=20
 install : $(TARGET)
=20
@@ -70,7 +81,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc --disable-=
nls
+	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--=20
1.9.1


--===============0681576895587306815==--