From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 13 Apr 2009 07:32:37 +0000 (+0200)
Subject: Updated mc to 4.6.2
X-Git-Tag: v2.5-beta1~37
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=6f40698198ed722a32ccb79c1f8c664f469162c0

Updated mc to 4.6.2
---

diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index d151351249..16909a8b29 100644
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -2,11 +2,12 @@ usr/bin/mc
 usr/bin/mcedit
 usr/bin/mcmfmt
 usr/bin/mcview
-#usr/lib/mc
-usr/lib/mc/cons.saver
-#usr/man/man1/mc.1
-#usr/man/man1/mcedit.1
-#usr/man/man1/mcview.1
+#usr/libexec
+#usr/libexec/mc
+usr/libexec/mc/cons.saver
+#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
@@ -36,6 +37,8 @@ usr/share/mc/extfs/rpm
 usr/share/mc/extfs/rpms
 usr/share/mc/extfs/sfs.ini
 usr/share/mc/extfs/trpm
+usr/share/mc/extfs/u7z
+usr/share/mc/extfs/ualz
 usr/share/mc/extfs/uar
 usr/share/mc/extfs/uarj
 usr/share/mc/extfs/uha
@@ -67,6 +70,13 @@ usr/share/mc/syntax/assembler.syntax
 usr/share/mc/syntax/c.syntax
 usr/share/mc/syntax/changelog.syntax
 usr/share/mc/syntax/cs.syntax
+usr/share/mc/syntax/css.syntax
+usr/share/mc/syntax/cxx.syntax
+usr/share/mc/syntax/d.syntax
+usr/share/mc/syntax/debian-changelog.syntax
+usr/share/mc/syntax/debian-control.syntax
+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/eiffel.syntax
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f4a9b7a8e2..a4b7e3389e 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -151,6 +151,7 @@
 * l7-protocols-2008-12-18
 * lame-3.97
 * lcd4linux-0.10.1-RC2
+* lcr.git-64143650bc9c04fadc99694c499cf34750bc2804
 * less-394
 * libaal-1.0.5
 * libart_lgpl-2.3.17
@@ -192,7 +193,7 @@
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8
-* mc-4.6.1
+* mc-4.6.2
 * mechanize-0.1.8
 * memtest86+-2.11
 * miau-0.6.5
diff --git a/lfs/mc b/lfs/mc
index d3dfa3ac68..1e261c6b88 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.6.1
+VER        = 4.6.2
 
 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    = 1
+PAK_VER    = 2
 
 DEPS       = "glib"
 
@@ -40,11 +40,13 @@ 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)
 
@@ -77,10 +79,14 @@ $(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
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 				--without-x --disable-nls \
 				--with-samba
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	rm /usr/share/automake-1.10
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)