X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmc;h=1e261c6b88dbdb406e86870c7b3ae429dd6acc92;hb=f399dfa46978a9d7d3d8761919a2fca7414c098c;hp=95fd809732881a2a91b3f89e5fabaa5395bf926d;hpb=f8e5510c0f892247fd406c74b695aa0ee2e0cc80;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/mc b/lfs/mc
index 95fd809732..1e261c6b88 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -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  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        #
-# 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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,23 +24,29 @@
 
 include Config
 
-VER        = 4.6.1
+VER        = 4.6.2
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.ibiblio.org/pub/Linux/utils/file/managers/mc
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = mc
+PAK_VER    = 2
+
+DEPS       = "glib"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(THISAPP)-utf8.patch.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(THISAPP)-utf8.patch.gz = $(DL_FROM)/$(THISAPP)-utf8.patch.gz
 
-$(DL_FILE)_MD5 = 18b20db6e40480a53bac2870c56fc3c4
+$(DL_FILE)_MD5 = ec92966f4d0c8b50c344fe901859ae2a
+$(THISAPP)-utf8.patch.gz_MD5 = 9753f1d340c7e3f6f73242afcf12edd2
 
 install : $(TARGET)
 
@@ -59,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh mc $(THISAPP)-ipfire-beta-1
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -81,13 +79,14 @@ $(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 --with-screen=mcslang --without-x --disable-nls # This has to be enabled when samba is in the SVN: --with-samba
-	cd $(DIR_APP) && make
+	# Create a symlink because mc search for automake-1.10
+	ln -s automake-1.9 /usr/share/automake-1.10
+	cd $(DIR_APP) && zcat $(DIR_DL)/$(THISAPP)-utf8.patch.gz | patch -Np1
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+				--without-x --disable-nls \
+				--with-samba
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	mv /usr/bin/mc /usr/bin/mcc
-	echo -e "#!/bin/bash" > /usr/bin/mc
-	echo -e "# Start MC in color-mode" >> /usr/bin/mc
-	echo -e "/usr/bin/mcc -c" >> /usr/bin/mc
-	chmod 755 /usr/bin/mc
+	rm /usr/share/automake-1.10
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)