Merge remote-tracking branch 'stevee/mc-update' into thirteen

[people/teissler/ipfire-2.x.git] / lfs / mc

diff --git a/lfs/mc b/lfs/mc
index 1e261c6b88dbdb406e86870c7b3ae429dd6acc92..32946c17abe4ee734e906405a7247ceaa78f0c46 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 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        #
@@ -24,29 +24,27 @@
 
 include Config
 
-VER        = 4.6.2
+VER        = 4.8.4
 
 THISAPP    = mc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 2
+PAK_VER    = 6
 
-DEPS       = "glib"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-utf8.patch.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-utf8.patch.gz = $(DL_FROM)/$(THISAPP)-utf8.patch.gz
 
-$(DL_FILE)_MD5 = ec92966f4d0c8b50c344fe901859ae2a
-$(THISAPP)-utf8.patch.gz_MD5 = 9753f1d340c7e3f6f73242afcf12edd2
+$(DL_FILE)_MD5 = a8edb8226cb25869f925ecce043faf1e
 
 install : $(TARGET)
 
@@ -78,15 +76,13 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       # 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
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr \
+                               --sysconfdir=/etc \
                                --without-x --disable-nls \
-                               --with-samba
+                               --with-samba \
+                               --with-screen=ncurses
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       rm /usr/share/automake-1.10
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)