mc: update to 4.6.2

4 files changed, 20 insertions, 44 deletions

diff --git a/mc/.footprint b/mc/.footprint
index c206f0a1a..26433a438 100644
--- a/mc/.footprint
+++ b/mc/.footprint
@@ -41,6 +41,8 @@ drwxr-xr-x	root/root	usr/share/mc/extfs/
 -rwxr-xr-x	root/root	usr/share/mc/extfs/rpms
 -rw-r--r--	root/root	usr/share/mc/extfs/sfs.ini
 -rwxr-xr-x	root/root	usr/share/mc/extfs/trpm
+-rwxr-xr-x	root/root	usr/share/mc/extfs/u7z
+-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/uarj
 -rwxr-xr-x	root/root	usr/share/mc/extfs/uha
@@ -62,6 +64,13 @@ drwxr-xr-x	root/root	usr/share/mc/syntax/
 -rw-r--r--	root/root	usr/share/mc/syntax/c.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/changelog.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/cs.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/css.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/cxx.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/d.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/debian-changelog.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/debian-control.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/debian-description.syntax
+-rw-r--r--	root/root	usr/share/mc/syntax/debian-sources-list.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/diff.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/dos.syntax
 -rw-r--r--	root/root	usr/share/mc/syntax/eiffel.syntax
diff --git a/mc/.md5sum b/mc/.md5sum
index 2c8979678..70216ee5b 100644
--- a/mc/.md5sum
+++ b/mc/.md5sum
@@ -1,2 +1 @@
-1b1c9691cfd14c071d786322be1279f6  mc-4.6.1-bash_3_2.patch
-18b20db6e40480a53bac2870c56fc3c4  mc-4.6.1.tar.gz
+ec92966f4d0c8b50c344fe901859ae2a  mc-4.6.2.tar.gz
diff --git a/mc/Pkgfile b/mc/Pkgfile
index ee3f709c6..20561552e 100644
--- a/mc/Pkgfile
+++ b/mc/Pkgfile
@@ -1,20 +1,23 @@
 # Description: GNU Midnight Commander
-# URL:         http://www.ibiblio.org/mc/ 
+# URL:         http://www.midnight-commander.org
 # Maintainer:  Juergen Daubert, juergen dot daubert at t-online dot de
 # Depends on:  e2fsprogs, glib
 
 name=mc
-version=4.6.1
-release=2
-source=(http://www.ibiblio.org/pub/Linux/utils/file/managers/$name/$name-$version.tar.gz \
-       $name-$version-bash_3_2.patch)
+version=4.6.2
+release=1
+source=(http://www.midnight-commander.org/downloads/$name-$version.tar.gz)
 
 build () {
     cd $name-$version
-    patch -p1 -i $SRC/$name-$version-bash_3_2.patch
-    ./configure --prefix=/usr --disable-nls 
+
+    ./configure --prefix=/usr \
+                --mandir=/usr/man \
+                --libexecdir=/usr/lib \
+                --disable-nls
     make
     make DESTDIR=$PKG install
+
     rm $PKG/usr/share/mc/{mc.hint.*,extfs/README}
     rm -r $PKG/usr/{sbin,man/man8}
 }
diff --git a/mc/mc-4.6.1-bash_3_2.patch b/mc/mc-4.6.1-bash_3_2.patch
deleted file mode 100644
index c0b290002..000000000
--- a/mc/mc-4.6.1-bash_3_2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-See http://mail.gnome.org/archives/mc-devel/2006-October/msg00025.html
-
-diff -Nru mc-4.6.1.orig/src/subshell.c mc-4.6.1/src/subshell.c
---- mc-4.6.1.orig/src/subshell.c	2006-11-21 08:13:35.498257460 +0100
-+++ mc-4.6.1/src/subshell.c	2006-11-21 08:14:10.971977460 +0100
-@@ -718,29 +718,13 @@
-     memcpy (d, cmd_start, len);
-     d += len;
- 
--    /*
--     * Print every character in octal format with the leading backslash.
--     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
--     */
--    if (subshell_type == BASH) {
- 	for (; *s; s++) {
--	    /* Must quote numbers, so that they are not glued to octals */
- 	    if (isalpha ((unsigned char) *s)) {
- 		*d++ = (unsigned char) *s;
- 	    } else {
--		sprintf (d, "\\%03o", (unsigned char) *s);
--		d += 4;
--	    }
--	}
--    } else {
--	for (; *s; s++) {
--	    if (isalnum ((unsigned char) *s)) {
--		*d++ = (unsigned char) *s;
--	    } else {
- 		sprintf (d, "\\0%03o", (unsigned char) *s);
- 		d += 5;
- 	    }
--	}
-     }
- 
-     memcpy (d, common_end, sizeof (common_end));