Update mc to 4.8.21

7 files changed, 42 insertions, 14 deletions

diff --git a/data/mc/_metadata/homepage b/data/mc/_metadata/homepage
index 167cdb530..fb71f5668 100644
--- a/data/mc/_metadata/homepage
+++ b/data/mc/_metadata/homepage
@@ -1 +1 @@
-http://www.ibiblio.org/mc/
+http://midnight-commander.org/
diff --git a/data/mc/_metadata/version b/data/mc/_metadata/version
index 8ac28bf9f..a70a836c5 100644
--- a/data/mc/_metadata/version
+++ b/data/mc/_metadata/version
@@ -1 +1 @@
-4.6.1
+4.8.21
diff --git a/data/mc/make.sh b/data/mc/make.sh
index b784b748c..503448b2f 100644
--- a/data/mc/make.sh
+++ b/data/mc/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
 pkg:configure --with-screen=ncurses --without-x
-make
+make -j8
 pkg:install
diff --git a/data/mc/mc-4.6.1.tar.gz b/data/mc/mc-4.6.1.tar.gz
deleted file mode 100644
index 15f99119e..000000000
--- a/data/mc/mc-4.6.1.tar.gz
+++ /dev/null
diff --git a/data/mc/mc-4.8.21.tar.xz b/data/mc/mc-4.8.21.tar.xz
new file mode 100644
index 000000000..f1529af4d
--- /dev/null
+++ b/data/mc/mc-4.8.21.tar.xz
diff --git a/data/mc/structtime.diff b/data/mc/structtime.diff
new file mode 100644
index 000000000..1f518bdb0
--- /dev/null
+++ b/data/mc/structtime.diff
@@ -0,0 +1,16 @@
+diff -ur mc-4.8.21/lib/global.h mc-4.8.21+iPhone/lib/global.h
+--- mc-4.8.21/lib/global.h	2018-05-27 09:56:21.000000000 -1000
++++ mc-4.8.21+iPhone/lib/global.h	2018-08-14 10:59:08.000000000 -1000
+@@ -24,6 +24,12 @@
+ /* for O_* macros */
+ #include <fcntl.h>
+ 
++#ifdef __APPLE__
++#define st_atim st_atimespec
++#define st_ctim st_ctimespec
++#define st_mtim st_mtimespec
++#endif
++
+ /* for sig_atomic_t */
+ #include <signal.h>
+ 
diff --git a/data/mc/subdirs.diff b/data/mc/subdirs.diff
index bf6e410a1..bd2380938 100644
--- a/data/mc/subdirs.diff
+++ b/data/mc/subdirs.diff
@@ -1,12 +1,24 @@
-diff -ru mc-4.6.1/Makefile.in mc-4.6.1+iPhone/Makefile.in
---- mc-4.6.1/Makefile.in	2005-07-23 16:53:13.000000000 +0000
-+++ mc-4.6.1+iPhone/Makefile.in	2008-06-30 21:52:52.000000000 +0000
-@@ -242,7 +242,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+diff -ur mc-4.8.21/Makefile.am mc-4.8.21+iPhone/Makefile.am
+--- mc-4.8.21/Makefile.am	2017-02-24 10:25:57.000000000 -1000
++++ mc-4.8.21+iPhone/Makefile.am	2018-08-14 10:44:39.000000000 -1000
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to create Makefile.in.
  AUTOMAKE_OPTIONS = 1.5
--SUBDIRS = intl po m4 vfs slang edit src lib doc syntax
-+SUBDIRS = intl po m4 vfs slang edit src lib syntax
- EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO
- noinst_DATA = mc.spec mc.qpg pkginfo prototype
- dist_noinst_SCRIPTS = build-glib1.sh build-glib2.sh
+ 
+-SUBDIRS = intl po lib src doc contrib misc
++SUBDIRS = intl po lib src contrib misc
+ 
+ if HAVE_TESTS
+     SUBDIRS += tests
+diff -ur mc-4.8.21/Makefile.in mc-4.8.21+iPhone/Makefile.in
+--- mc-4.8.21/Makefile.in	2018-06-02 22:57:29.000000000 -1000
++++ mc-4.8.21+iPhone/Makefile.in	2018-08-14 10:44:26.000000000 -1000
+@@ -508,7 +508,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5
+-SUBDIRS = intl po lib src doc contrib misc $(am__append_1)
++SUBDIRS = intl po lib src contrib misc $(am__append_1)
+ EXTRA_DIST = 
+ dist_noinst_SCRIPTS = build-glib2.sh
+ dist_noinst_HEADERS = $(top_srcdir)/version.h