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

diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc
index bb7e6d794990503c8ff53b0407b99886d74ad929..47109e9afac93670920645ea71203eac0d620e7e 100644 (file)
--- a/config/rootfiles/packages/mc
+++ b/config/rootfiles/packages/mc
@@ -1,22 +1,30 @@
+#etc/mc
+etc/mc/edit.indent.rc
+etc/mc/filehighlight.ini
+etc/mc/mc.ext
+etc/mc/mc.keymap
+etc/mc/mc.keymap.default
+etc/mc/mc.keymap.emacs
+etc/mc/mc.menu
+etc/mc/mc.menu.sr
+etc/mc/mcedit.menu
+etc/mc/sfs.ini
 usr/bin/mc
 usr/bin/mcdiff
 usr/bin/mcedit
 usr/bin/mcview
-usr/etc
-usr/etc/mc
-usr/etc/mc/cedit.menu
-usr/etc/mc/edit.indent.rc
-usr/etc/mc/edit.spell.rc
-usr/etc/mc/filehighlight.ini
-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.menu
-usr/etc/mc/mc.menu.sr
-usr/etc/mc/sfs.ini
 #usr/libexec/mc
 usr/libexec/mc/cons.saver
+#usr/libexec/mc/ext.d
+usr/libexec/mc/ext.d/archive.sh
+usr/libexec/mc/ext.d/doc.sh
+usr/libexec/mc/ext.d/image.sh
+usr/libexec/mc/ext.d/misc.sh
+usr/libexec/mc/ext.d/package.sh
+usr/libexec/mc/ext.d/sound.sh
+usr/libexec/mc/ext.d/text.sh
+usr/libexec/mc/ext.d/video.sh
+usr/libexec/mc/ext.d/web.sh
 #usr/libexec/mc/extfs.d
 #usr/libexec/mc/extfs.d/README
 #usr/libexec/mc/extfs.d/README.extfs
@@ -24,15 +32,18 @@ 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/changesetfs
 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/gitfs+
 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/patchsetfs
 usr/libexec/mc/extfs.d/rpm
 usr/libexec/mc/extfs.d/rpms+
 usr/libexec/mc/extfs.d/s3+
@@ -47,6 +58,7 @@ 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/ulib
 usr/libexec/mc/extfs.d/urar
 usr/libexec/mc/extfs.d/uzip
 usr/libexec/mc/extfs.d/uzoo
@@ -66,6 +78,7 @@ usr/libexec/mc/fish/mv
 usr/libexec/mc/fish/rmdir
 usr/libexec/mc/fish/send
 usr/libexec/mc/fish/unlink
+usr/libexec/mc/fish/utime
 usr/libexec/mc/mc-wrapper.csh
 usr/libexec/mc/mc-wrapper.sh
 usr/libexec/mc/mc.csh
@@ -74,6 +87,15 @@ usr/libexec/mc/mc.sh
 #usr/share/man/man1/mcedit.1
 #usr/share/man/man1/mcview.1
 #usr/share/mc
+#usr/share/mc/examples
+#usr/share/mc/examples/macros.d
+#usr/share/mc/examples/macros.d/macro.0.sh
+#usr/share/mc/examples/macros.d/macro.1.sh
+#usr/share/mc/examples/macros.d/macro.3.sh
+#usr/share/mc/examples/macros.d/macro.4.sh
+#usr/share/mc/examples/macros.d/macro.5.sh
+#usr/share/mc/examples/macros.d/macro.6.sh
+#usr/share/mc/examples/macros.d/macro.7.sh
 #usr/share/mc/help
 usr/share/mc/help/mc.hlp
 #usr/share/mc/hints
@@ -89,10 +111,13 @@ usr/share/mc/skins/featured.ini
 usr/share/mc/skins/gotar.ini
 usr/share/mc/skins/mc46.ini
 usr/share/mc/skins/nicedark.ini
+usr/share/mc/skins/sand256.ini
+usr/share/mc/skins/xoria256.ini
 #usr/share/mc/syntax
 usr/share/mc/syntax/PKGBUILD.syntax
 usr/share/mc/syntax/Syntax
 usr/share/mc/syntax/ada95.syntax
+usr/share/mc/syntax/as.syntax
 usr/share/mc/syntax/aspx.syntax
 usr/share/mc/syntax/assembler.syntax
 usr/share/mc/syntax/awk.syntax

diff --git a/lfs/mc b/lfs/mc
index 895b2d49c296fb0f2c89f703200476ae296e9eae..32946c17abe4ee734e906405a7247ceaa78f0c46 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 4.7.5.2
+VER        = 4.8.4
 
 THISAPP    = mc-$(VER)
-DL_FILE    = $(THISAPP).tar.lzma
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da
+$(DL_FILE)_MD5 = a8edb8226cb25869f925ecce043faf1e
 
 install : $(TARGET)
 
@@ -76,8 +76,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) --lzma
+       @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-screen=ncurses