X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnano;h=37998319656ed860f72c7dbba52d1dddd22d2b38;hb=f74072a24a066a1872f8e1356d8cb83a65abc178;hp=d69b0de819801b2c4139b5aeeffa19634fceab8b;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=ipfire-2.x.git

diff --git a/lfs/nano b/lfs/nano
index d69b0de819..3799831965 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2017  IPFire Team  <info@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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: nano,v 1.3.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,17 @@
 
 include Config
 
-VER        = 1.2.4
+VER        = 2.8.6
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.nano-editor.org/dist/v1.2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = nano
+PAK_VER    = 16
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c513310ec5e8b63abaecaf48670ac7a
+$(DL_FILE)_MD5 = e05d83c0f1687b733322f806c080d256
 
 install : $(TARGET)
 
@@ -58,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+	@$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,9 +77,17 @@ $(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=/usr --disable-nls --enable-tiny
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/nano \
+		--enable-color \
+		--enable-multibuffer \
+		--enable-nanorc \
+		--disable-nls
+
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && install -v -m644 -D doc/sample.nanorc /etc/nano/sample.nanorc
 	ln -sf /usr/bin/nano /usr/bin/pico
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)