Updated mc to stable 4.7.

The mc now supports out of the box UTF-8.

diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index 16909a8b29fbc4581abfb26be478ce54e4bccd5f..eec66d343203af2870d2b1da0f8f5dba5ed90080 100644 (file)
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -2,21 +2,35 @@ usr/bin/mc
 usr/bin/mcedit
 usr/bin/mcmfmt
 usr/bin/mcview
+usr/etc
+usr/etc/mc
+usr/etc/mc/Syntax
+usr/etc/mc/cedit.menu
+usr/etc/mc/edit.indent.rc
+usr/etc/mc/edit.spell.rc
+usr/etc/mc/extfs
+usr/etc/mc/extfs/extfs.ini
+usr/etc/mc/extfs/sfs.ini
+usr/etc/mc/filehighlight.ini
+usr/etc/mc/mc.charsets
+usr/etc/mc/mc.ext
+usr/etc/mc/mc.keymap
+usr/etc/mc/mc.keymap.default
+usr/etc/mc/mc.keymap.emacs
+usr/etc/mc/mc.lib
+usr/etc/mc/mc.menu
+usr/etc/mc/mc.menu.sr
 #usr/libexec
 #usr/libexec/mc
 usr/libexec/mc/cons.saver
+usr/libexec/mc/mc-wrapper.csh
+usr/libexec/mc/mc-wrapper.sh
+usr/libexec/mc/mc.csh
+usr/libexec/mc/mc.sh
 #usr/share/man/man1/mc.1
 #usr/share/man/man1/mcedit.1
 #usr/share/man/man1/mcview.1
 #usr/share/mc
-#usr/share/mc/bin
-usr/share/mc/bin/mc-wrapper.csh
-usr/share/mc/bin/mc-wrapper.sh
-usr/share/mc/bin/mc.csh
-usr/share/mc/bin/mc.sh
-usr/share/mc/cedit.menu
-usr/share/mc/edit.indent.rc
-usr/share/mc/edit.spell.rc
 #usr/share/mc/extfs
 #usr/share/mc/extfs/README
 usr/share/mc/extfs/a
@@ -27,7 +41,6 @@ usr/share/mc/extfs/deb
 usr/share/mc/extfs/deba
 usr/share/mc/extfs/debd
 usr/share/mc/extfs/dpkg
-usr/share/mc/extfs/extfs.ini
 usr/share/mc/extfs/hp48
 usr/share/mc/extfs/iso9660
 usr/share/mc/extfs/lslR
@@ -35,18 +48,21 @@ usr/share/mc/extfs/mailfs
 usr/share/mc/extfs/patchfs
 usr/share/mc/extfs/rpm
 usr/share/mc/extfs/rpms
-usr/share/mc/extfs/sfs.ini
+usr/share/mc/extfs/s3
 usr/share/mc/extfs/trpm
 usr/share/mc/extfs/u7z
+usr/share/mc/extfs/uace
 usr/share/mc/extfs/ualz
 usr/share/mc/extfs/uar
+usr/share/mc/extfs/uarc
 usr/share/mc/extfs/uarj
+usr/share/mc/extfs/uc1541
+usr/share/mc/extfs/ucab
 usr/share/mc/extfs/uha
 usr/share/mc/extfs/ulha
 usr/share/mc/extfs/urar
 usr/share/mc/extfs/uzip
 usr/share/mc/extfs/uzoo
-usr/share/mc/mc.ext
 usr/share/mc/mc.hint
 #usr/share/mc/mc.hint.cs
 #usr/share/mc/mc.hint.es
@@ -59,15 +75,20 @@ usr/share/mc/mc.hint
 #usr/share/mc/mc.hint.uk
 #usr/share/mc/mc.hint.zh
 usr/share/mc/mc.hlp
-usr/share/mc/mc.lib
-usr/share/mc/mc.menu
-#usr/share/mc/mc.menu.sr
+usr/share/mc/skins
+usr/share/mc/skins/darkfar.ini
+usr/share/mc/skins/default.ini
+usr/share/mc/skins/double-lines.ini
+usr/share/mc/skins/featured.ini
+usr/share/mc/skins/gotar.ini
 #usr/share/mc/syntax
-usr/share/mc/syntax/Syntax
+usr/share/mc/syntax/PKGBUILD.syntax
 usr/share/mc/syntax/ada95.syntax
 usr/share/mc/syntax/aspx.syntax
 usr/share/mc/syntax/assembler.syntax
+usr/share/mc/syntax/awk.syntax
 usr/share/mc/syntax/c.syntax
+usr/share/mc/syntax/cabal.syntax
 usr/share/mc/syntax/changelog.syntax
 usr/share/mc/syntax/cs.syntax
 usr/share/mc/syntax/css.syntax
@@ -79,10 +100,16 @@ usr/share/mc/syntax/debian-description.syntax
 usr/share/mc/syntax/debian-sources-list.syntax
 usr/share/mc/syntax/diff.syntax
 usr/share/mc/syntax/dos.syntax
+usr/share/mc/syntax/ebuild.syntax
 usr/share/mc/syntax/eiffel.syntax
+usr/share/mc/syntax/erlang.syntax
+usr/share/mc/syntax/f90.syntax
+usr/share/mc/syntax/filehighlight.syntax
 usr/share/mc/syntax/fortran.syntax
+usr/share/mc/syntax/haskell.syntax
 usr/share/mc/syntax/html.syntax
 usr/share/mc/syntax/idl.syntax
+usr/share/mc/syntax/j.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
 usr/share/mc/syntax/latex.syntax
@@ -93,6 +120,8 @@ usr/share/mc/syntax/m4.syntax
 usr/share/mc/syntax/mail.syntax
 usr/share/mc/syntax/makefile.syntax
 usr/share/mc/syntax/ml.syntax
+usr/share/mc/syntax/named.syntax
+usr/share/mc/syntax/nemerle.syntax
 usr/share/mc/syntax/nroff.syntax
 usr/share/mc/syntax/octave.syntax
 usr/share/mc/syntax/pascal.syntax
@@ -100,6 +129,8 @@ usr/share/mc/syntax/perl.syntax
 usr/share/mc/syntax/php.syntax
 usr/share/mc/syntax/po.syntax
 usr/share/mc/syntax/povray.syntax
+usr/share/mc/syntax/procmail.syntax
+usr/share/mc/syntax/properties.syntax
 usr/share/mc/syntax/python.syntax
 usr/share/mc/syntax/ruby.syntax
 usr/share/mc/syntax/sh.syntax
@@ -107,9 +138,15 @@ usr/share/mc/syntax/slang.syntax
 usr/share/mc/syntax/smalltalk.syntax
 usr/share/mc/syntax/spec.syntax
 usr/share/mc/syntax/sql.syntax
+usr/share/mc/syntax/strace.syntax
 usr/share/mc/syntax/swig.syntax
 usr/share/mc/syntax/syntax.syntax
 usr/share/mc/syntax/tcl.syntax
 usr/share/mc/syntax/texinfo.syntax
+usr/share/mc/syntax/tt.syntax
 usr/share/mc/syntax/unknown.syntax
+usr/share/mc/syntax/verilog.syntax
+usr/share/mc/syntax/vhdl.syntax
 usr/share/mc/syntax/xml.syntax
+usr/share/mc/syntax/yum-repo.syntax
+usr/share/mc/syntax/yxx.syntax
\ No newline at end of file

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index fe7ec1fe060431b709b2a4c58fe24c1c71a66487..70a782af3ed7593fc7592a55a6b824ebb13b07c4 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -216,7 +216,7 @@
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8
-* mc-4.6.2
+* mc-4.7.0
 * mechanize-0.1.8
 * mediatomb-svn2020
 * memtest86+-4.00

diff --git a/lfs/mc b/lfs/mc
index 1e261c6b88dbdb406e86870c7b3ae429dd6acc92..e321b3180426e7fb93a0befef46ab8ef01600535 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,7 +24,7 @@
 
 include Config
 
-VER        = 4.6.2
+VER        = 4.7.0
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "glib"
 
@@ -40,13 +40,11 @@ DEPS       = "glib"
 # 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 = 3be875c7603ab45e784026a5d13d4bb0
 
 install : $(TARGET)
 
@@ -81,10 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                --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