summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/mc/.footprint (renamed from extra/mc/.footprint)70
-rw-r--r--base/mc/.md5sum1
-rwxr-xr-xbase/mc/Pkgfile (renamed from extra/mc/Pkgfile)15
-rw-r--r--base/mc/mc-4.7.0.2_hotlist_syntax.patch (renamed from extra/mc/mc-4.7.0.2_hotlist_syntax.patch)0
-rw-r--r--extra/mc/.md5sum2
5 files changed, 42 insertions, 46 deletions
diff --git a/extra/mc/.footprint b/base/mc/.footprint
index 1df2cee02..bd02f1046 100644
--- a/extra/mc/.footprint
+++ b/base/mc/.footprint
@@ -4,9 +4,6 @@ drwxr-xr-x root/root etc/mc/
-rw-r--r-- root/root etc/mc/cedit.menu
-rw-r--r-- root/root etc/mc/edit.indent.rc
-rw-r--r-- root/root etc/mc/edit.spell.rc
-drwxr-xr-x root/root etc/mc/extfs/
--rw-r--r-- root/root etc/mc/extfs/extfs.ini
--rw-r--r-- root/root etc/mc/extfs/sfs.ini
-rw-r--r-- root/root etc/mc/filehighlight.ini
-rw-r--r-- root/root etc/mc/mc.charsets
-rw-r--r-- root/root etc/mc/mc.ext
@@ -16,15 +13,49 @@ drwxr-xr-x root/root etc/mc/extfs/
-rw-r--r-- root/root etc/mc/mc.lib
-rw-r--r-- root/root etc/mc/mc.menu
-rw-r--r-- root/root etc/mc/mc.menu.sr
+-rw-r--r-- root/root etc/mc/sfs.ini
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/mc
+lrwxrwxrwx root/root usr/bin/mcdiff -> mc
lrwxrwxrwx root/root usr/bin/mcedit -> mc
-rwxr-xr-x root/root usr/bin/mcmfmt
lrwxrwxrwx root/root usr/bin/mcview -> mc
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/mc/
-rwxr-xr-x root/root usr/lib/mc/cons.saver
+drwxr-xr-x root/root usr/lib/mc/extfs.d/
+-rw-r--r-- root/root usr/lib/mc/extfs.d/README
+-rw-r--r-- root/root usr/lib/mc/extfs.d/README.extfs
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/a+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/apt+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/audio
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/bpp
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/deb
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/deba
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/debd
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/dpkg+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/hp48+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/iso9660
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/lslR
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/mailfs
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/patchfs
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/rpm
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/rpms+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/s3+
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/trpm
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uace
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/ualz
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uar
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uarc
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uarj
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uc1541
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/ucab
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uha
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/ulha
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/urar
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uzip
+-rwxr-xr-x root/root usr/lib/mc/extfs.d/uzoo
-rwxr-xr-x root/root usr/lib/mc/mc-wrapper.csh
-rwxr-xr-x root/root usr/lib/mc/mc-wrapper.sh
-rwxr-xr-x root/root usr/lib/mc/mc.csh
@@ -61,37 +92,6 @@ drwxr-xr-x root/root usr/share/man/sr/man1/
-rw-r--r-- root/root usr/share/man/sr/man1/mc.1.gz
drwxr-xr-x root/root usr/share/man/sr/man8/
drwxr-xr-x root/root usr/share/mc/
-drwxr-xr-x root/root usr/share/mc/extfs/
--rw-r--r-- root/root usr/share/mc/extfs/README
--rwxr-xr-x root/root usr/share/mc/extfs/a
--rwxr-xr-x root/root usr/share/mc/extfs/apt
--rwxr-xr-x root/root usr/share/mc/extfs/audio
--rwxr-xr-x root/root usr/share/mc/extfs/bpp
--rwxr-xr-x root/root usr/share/mc/extfs/deb
--rwxr-xr-x root/root usr/share/mc/extfs/deba
--rwxr-xr-x root/root usr/share/mc/extfs/debd
--rwxr-xr-x root/root usr/share/mc/extfs/dpkg
--rwxr-xr-x root/root usr/share/mc/extfs/hp48
--rwxr-xr-x root/root usr/share/mc/extfs/iso9660
--rwxr-xr-x root/root usr/share/mc/extfs/lslR
--rwxr-xr-x root/root usr/share/mc/extfs/mailfs
--rwxr-xr-x root/root usr/share/mc/extfs/patchfs
--rwxr-xr-x root/root usr/share/mc/extfs/rpm
--rwxr-xr-x root/root usr/share/mc/extfs/rpms
--rwxr-xr-x root/root usr/share/mc/extfs/s3
--rwxr-xr-x root/root usr/share/mc/extfs/trpm
--rwxr-xr-x root/root usr/share/mc/extfs/uace
--rwxr-xr-x root/root usr/share/mc/extfs/ualz
--rwxr-xr-x root/root usr/share/mc/extfs/uar
--rwxr-xr-x root/root usr/share/mc/extfs/uarc
--rwxr-xr-x root/root usr/share/mc/extfs/uarj
--rwxr-xr-x root/root usr/share/mc/extfs/uc1541
--rwxr-xr-x root/root usr/share/mc/extfs/ucab
--rwxr-xr-x root/root usr/share/mc/extfs/uha
--rwxr-xr-x root/root usr/share/mc/extfs/ulha
--rwxr-xr-x root/root usr/share/mc/extfs/urar
--rwxr-xr-x root/root usr/share/mc/extfs/uzip
--rwxr-xr-x root/root usr/share/mc/extfs/uzoo
-rw-r--r-- root/root usr/share/mc/mc.hint
-rw-r--r-- root/root usr/share/mc/mc.hint.cs
-rw-r--r-- root/root usr/share/mc/mc.hint.es
@@ -116,6 +116,7 @@ drwxr-xr-x root/root usr/share/mc/skins/
-rw-r--r-- root/root usr/share/mc/skins/double-lines.ini
-rw-r--r-- root/root usr/share/mc/skins/featured.ini
-rw-r--r-- root/root usr/share/mc/skins/gotar.ini
+-rw-r--r-- root/root usr/share/mc/skins/nicedark.ini
drwxr-xr-x root/root usr/share/mc/syntax/
-rw-r--r-- root/root usr/share/mc/syntax/PKGBUILD.syntax
-rw-r--r-- root/root usr/share/mc/syntax/ada95.syntax
@@ -144,6 +145,7 @@ drwxr-xr-x root/root usr/share/mc/syntax/
-rw-r--r-- root/root usr/share/mc/syntax/haskell.syntax
-rw-r--r-- root/root usr/share/mc/syntax/html.syntax
-rw-r--r-- root/root usr/share/mc/syntax/idl.syntax
+-rw-r--r-- root/root usr/share/mc/syntax/ini.syntax
-rw-r--r-- root/root usr/share/mc/syntax/j.syntax
-rw-r--r-- root/root usr/share/mc/syntax/java.syntax
-rw-r--r-- root/root usr/share/mc/syntax/js.syntax
diff --git a/base/mc/.md5sum b/base/mc/.md5sum
new file mode 100644
index 000000000..3fa378b4f
--- /dev/null
+++ b/base/mc/.md5sum
@@ -0,0 +1 @@
+82d0f923f686e462eeb739760f8c45bd mc-4.7.2.tar.bz2
diff --git a/extra/mc/Pkgfile b/base/mc/Pkgfile
index 7d98637a2..fa7abd998 100755
--- a/extra/mc/Pkgfile
+++ b/base/mc/Pkgfile
@@ -2,17 +2,15 @@
# URL: http://www.ibiblio.org/mc/
# Maintainer: NuTyX coreteam
# Packager: thierryn1 at hispeed dot ch
-# Depends on: p7zip, e2fsprogs, glib2, pcre, gpm, slang, glib
+# Depends on: p7zip, e2fsprogs, pcre, gpm, slang, glib
name=mc
-version=4.7.0.2
+version=4.7.2
release=1
-source=(http://www.midnight-commander.org/downloads/$name-$version.tar.bz2 \
- mc-4.7.0.2_hotlist_syntax.patch)
+source=(http://www.midnight-commander.org/downloads/$name-$version.tar.bz2)
build() {
cd $name-$version
- patch -p1 < ../mc-4.7.0.2_hotlist_syntax.patch
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -35,10 +33,7 @@ build() {
make
make DESTDIR=$PKG install
- # Fix FS#15177
sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
- $PKG/usr/share/mc/extfs/uzip
-
- # Fix FS#18312
- rm $PKG/usr/share/mc/extfs/u7z
+ $PKG/usr/lib/mc/extfs.d/uzip
+ rm $PKG/usr/lib/mc/extfs.d/u7z
}
diff --git a/extra/mc/mc-4.7.0.2_hotlist_syntax.patch b/base/mc/mc-4.7.0.2_hotlist_syntax.patch
index 2dc115ec2..2dc115ec2 100644
--- a/extra/mc/mc-4.7.0.2_hotlist_syntax.patch
+++ b/base/mc/mc-4.7.0.2_hotlist_syntax.patch
diff --git a/extra/mc/.md5sum b/extra/mc/.md5sum
deleted file mode 100644
index f1262a2b6..000000000
--- a/extra/mc/.md5sum
+++ /dev/null
@@ -1,2 +0,0 @@
-4618626cacd3481e39719a4571c1b5be mc-4.7.0.2.tar.bz2
-e43b3c780de82c1a70a98fc31ec5fbf9 mc-4.7.0.2_hotlist_syntax.patch