[ptxdist] [PATCH/RFC] mc: vesion bump 4.6.1 -> 4.8.20

[Ladislav Michl <ladis@linux-mips.org>]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Note: 4.6.1 is almost a decade old, so it really deserve some update.
 While there it might be nice to enable VFS as well, however SMB fails
 compile for me. Also slang/curses selection should be reworked a bit.
 Idea is to use slang if slang is already selected or ncurses are not
 selected and use ncurses if those are already selected and slang is
 not. This default would avoid pulling yet another dependency.
 Parhaps that's best to achieve with Kconfig's 'imply'?
 I'm sending this patch as is as I'm not sure when I'll have time
 to look at this issue again.

 rules/mc.in   | 41 +++++++++++++++++++++++++++++++++++++----
 rules/mc.make | 49 ++++++++++++++++++++++++-------------------------
 2 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/rules/mc.in b/rules/mc.in
index 9dba3c974..2f06d52eb 100644
--- a/rules/mc.in
+++ b/rules/mc.in
@@ -3,21 +3,21 @@
 menuconfig MC
 	tristate
 	select GLIB
-	select NCURSES if MC_USES_NCURSES
-	select SLANG if MC_USES_SLANG
+	select NCURSES if !MC_SCREEN_SLANG
+	select SLANG if MC_SCREEN_SLANG
 	select LIBC_NSL
 	select GCCLIBS_GCC_S
 	prompt "midnight commander            "
 	help
 	  midnight commander is a text oriented file manager
 
+if MC
+
 comment "build options   ---"
-	depends on MC
 
 choice
 	prompt "Kind of MMI "
 	default MC_USES_NO_PREFERENCE
-	depends on MC
 
 config MC_USES_NO_PREFERENCE
 	bool "no preference"
@@ -35,3 +35,36 @@ config MC_USES_SLANG
 	  Build midnight commander with slang
 
 endchoice
+
+config MC_SCREEN_SLANG
+	bool
+	default MC_USES_NO_PREFERENCE || MC_USES_SLANG
+
+config MC_VFS_CPIO
+	bool "Support for cpio filesystem"
+
+config MC_VFS_EXTFS
+	bool "Support for extfs filesystem"
+
+config MC_VFS_FISH
+	bool "Support for FISH filesystem"
+
+config MC_VFS_FTP
+	bool "Support for FTP filesystem"
+
+config MC_VFS_SFS
+	bool "Support for sfs filesystem"
+
+config MC_VFS_SFTP
+	bool "Support for SFTP filesystem"
+
+config MC_VFS_SMB
+	bool "Support for SMB filesystem"
+
+config MC_VFS_TAR
+	bool "Support for tar filesystem"
+
+config MC_VFS_UNDELFS
+	bool "Support for ext2 undelete filesystem"
+
+endif
diff --git a/rules/mc.make b/rules/mc.make
index 2586c2c3d..6533bd9cb 100644
--- a/rules/mc.make
+++ b/rules/mc.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_MC) += mc
 #
 # Paths and names
 #
-MC_VERSION	:= 4.6.1
-MC_MD5		:= 18b20db6e40480a53bac2870c56fc3c4
+MC_VERSION	:= 4.8.20
+MC_MD5		:= 7f808b01f3f7d9aa52152a9efb86dbca
 MC		:= mc-$(MC_VERSION)
-MC_SUFFIX	:= tar.gz
-MC_URL		:= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$(MC).$(MC_SUFFIX)
+MC_SUFFIX	:= tar.xz
+MC_URL		:= http://ftp.midnight-commander.org/$(MC).$(MC_SUFFIX)
 MC_SOURCE	:= $(SRCDIR)/$(MC).$(MC_SUFFIX)
 MC_DIR		:= $(BUILDDIR)/$(MC)
 MC_LICENSE	:= GPL-2.0-only
@@ -31,28 +31,27 @@ MC_LICENSE	:= GPL-2.0-only
 # Prepare
 # ----------------------------------------------------------------------------
 
-MC_PATH	:= PATH=$(CROSS_PATH)
-MC_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-#
-MC_AUTOCONF := \
+MC_CONF_TOOL := autoconf
+MC_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	--with-x=no \
-	--without-gpm-mouse \
-	--without-ext2undel \
-	--disable-rpath
-
-ifdef PTXCONF_MC_USES_NCURSES
-MC_AUTOCONF += --with-screen=ncurses
-endif
-
-ifdef PTXCONF_MC_USES_SLANG
-MC_AUTOCONF += --with-screen=slang
-endif
-
-MC_INSTALL_OPT := -C src install
+	--disable-tests \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-nls \
+	--$(call ptx/endis,PTXCONF_MC_VFS)-vfs \
+	--$(call ptx/endis,PTXCONF_MC_VFS_CPIO)-vfs-cpio \
+	--$(call ptx/endis,PTXCONF_MC_VFS_EXTFS)-vfs-extfs \
+	--$(call ptx/endis,PTXCONF_MC_VFS_FISH)-vfs-fish \
+	--$(call ptx/endis,PTXCONF_MC_VFS_FTP)-vfs-ftp \
+	--$(call ptx/endis,PTXCONF_MC_VFS_SFS)-vfs-sfs \
+	--$(call ptx/endis,PTXCONF_MC_VFS_SFTP)-vfs-sftp \
+	--$(call ptx/endis,PTXCONF_MC_VFS_SMB)-vfs-smb \
+	--$(call ptx/endis,PTXCONF_MC_VFS_TAR)-vfs-tar \
+	--$(call ptx/endis,PTXCONF_MC_VFS_UNDELFS)-vfs-undelfs \
+	--disable-doxygen-doc \
+	--with-screen=$(call ptx/ifdef, PTXCONF_MC_SCREEN_SLANG, slang, ncurses) \
+	--without-x \
+	--with-mmap \
+	--without-gpm-mouse
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.17.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de