]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Updated mc (4.7.3).
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Jul 2010 16:19:09 +0000 (18:19 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Jul 2010 16:19:09 +0000 (18:19 +0200)
config/rootfiles/packages/mc
lfs/mc

index eec66d343203af2870d2b1da0f8f5dba5ed90080..4cb6efa2900c48639f2d405d79629dad713367c3 100644 (file)
@@ -1,4 +1,5 @@
 usr/bin/mc
+usr/bin/mcdiff
 usr/bin/mcedit
 usr/bin/mcmfmt
 usr/bin/mcview
@@ -8,9 +9,6 @@ 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
@@ -20,9 +18,59 @@ usr/etc/mc/mc.keymap.emacs
 usr/etc/mc/mc.lib
 usr/etc/mc/mc.menu
 usr/etc/mc/mc.menu.sr
+usr/etc/mc/sfs.ini
 #usr/libexec
 #usr/libexec/mc
 usr/libexec/mc/cons.saver
+#usr/libexec/mc/extfs.d
+#usr/libexec/mc/extfs.d/README
+#usr/libexec/mc/extfs.d/README.extfs
+usr/libexec/mc/extfs.d/a+
+usr/libexec/mc/extfs.d/apt+
+usr/libexec/mc/extfs.d/audio
+usr/libexec/mc/extfs.d/bpp
+usr/libexec/mc/extfs.d/deb
+usr/libexec/mc/extfs.d/deba
+usr/libexec/mc/extfs.d/debd
+usr/libexec/mc/extfs.d/dpkg+
+usr/libexec/mc/extfs.d/hp48+
+usr/libexec/mc/extfs.d/iso9660
+usr/libexec/mc/extfs.d/lslR
+usr/libexec/mc/extfs.d/mailfs
+usr/libexec/mc/extfs.d/patchfs
+usr/libexec/mc/extfs.d/rpm
+usr/libexec/mc/extfs.d/rpms+
+usr/libexec/mc/extfs.d/s3+
+usr/libexec/mc/extfs.d/trpm
+usr/libexec/mc/extfs.d/u7z
+usr/libexec/mc/extfs.d/uace
+usr/libexec/mc/extfs.d/ualz
+usr/libexec/mc/extfs.d/uar
+usr/libexec/mc/extfs.d/uarc
+usr/libexec/mc/extfs.d/uarj
+usr/libexec/mc/extfs.d/uc1541
+usr/libexec/mc/extfs.d/ucab
+usr/libexec/mc/extfs.d/uha
+usr/libexec/mc/extfs.d/ulha
+usr/libexec/mc/extfs.d/urar
+usr/libexec/mc/extfs.d/uzip
+usr/libexec/mc/extfs.d/uzoo
+#usr/libexec/mc/fish
+#usr/libexec/mc/fish/README.fish
+usr/libexec/mc/fish/append
+usr/libexec/mc/fish/chmod
+usr/libexec/mc/fish/chown
+usr/libexec/mc/fish/fexists
+usr/libexec/mc/fish/get
+usr/libexec/mc/fish/hardlink
+usr/libexec/mc/fish/info
+usr/libexec/mc/fish/ln
+usr/libexec/mc/fish/ls
+usr/libexec/mc/fish/mkdir
+usr/libexec/mc/fish/mv
+usr/libexec/mc/fish/rmdir
+usr/libexec/mc/fish/send
+usr/libexec/mc/fish/unlink
 usr/libexec/mc/mc-wrapper.csh
 usr/libexec/mc/mc-wrapper.sh
 usr/libexec/mc/mc.csh
@@ -31,38 +79,6 @@ usr/libexec/mc/mc.sh
 #usr/share/man/man1/mcedit.1
 #usr/share/man/man1/mcview.1
 #usr/share/mc
-#usr/share/mc/extfs
-#usr/share/mc/extfs/README
-usr/share/mc/extfs/a
-usr/share/mc/extfs/apt
-usr/share/mc/extfs/audio
-usr/share/mc/extfs/bpp
-usr/share/mc/extfs/deb
-usr/share/mc/extfs/deba
-usr/share/mc/extfs/debd
-usr/share/mc/extfs/dpkg
-usr/share/mc/extfs/hp48
-usr/share/mc/extfs/iso9660
-usr/share/mc/extfs/lslR
-usr/share/mc/extfs/mailfs
-usr/share/mc/extfs/patchfs
-usr/share/mc/extfs/rpm
-usr/share/mc/extfs/rpms
-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.hint
 #usr/share/mc/mc.hint.cs
 #usr/share/mc/mc.hint.es
@@ -81,6 +97,7 @@ 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/skins/nicedark.ini
 #usr/share/mc/syntax
 usr/share/mc/syntax/PKGBUILD.syntax
 usr/share/mc/syntax/ada95.syntax
@@ -109,6 +126,7 @@ 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/ini.syntax
 usr/share/mc/syntax/j.syntax
 usr/share/mc/syntax/java.syntax
 usr/share/mc/syntax/js.syntax
@@ -149,4 +167,4 @@ 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
+usr/share/mc/syntax/yxx.syntax
diff --git a/lfs/mc b/lfs/mc
index e321b3180426e7fb93a0befef46ab8ef01600535..d6badb5a614e406d5f1f6677a88121c80748c3e1 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
 
 include Config
 
-VER        = 4.7.0
+VER        = 4.7.3
 
 THISAPP    = mc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.lzma
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "glib"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3be875c7603ab45e784026a5d13d4bb0
+$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510
 
 install : $(TARGET)
 
@@ -76,15 +76,12 @@ $(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
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) --lzma
        cd $(DIR_APP) && ./configure --prefix=/usr \
                                --without-x --disable-nls \
                                --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)