mc: Prepare to move system to real /usr

mc/PKGBUILD

@@ -2,25 +2,23 @@
 
 pkgname=mc
 pkgver=4.8.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
 arch=('i686' 'x86_64')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
-depends=(
-    'glib2'
-    'libssh2')
+depends=('glib2'
+        'libssh2')
 makedepends=('glib2-devel' 'libssh2-devel')
-optdepends=(
-    'gawk: hp48+ extfs'
-    'aspell: spelling corrections'
-    'cvs: CVS support'
-    'perl: needed by several extfs scripts'
-    'unace: uace extfs'
-    'unarj: uarj extfs'
-    'unrar: urar extfs'
-    'zip: uzip extfs'
-    'p7zip: support for 7zip archives')
+optdepends=('gawk: hp48+ extfs'
+            #'aspell: spelling corrections'
+            'cvs: CVS support'
+            'perl: needed by several extfs scripts'
+            #'unace: uace extfs'
+            #'unarj: uarj extfs'
+            'unrar: urar extfs'
+            'zip: uzip extfs'
+            'p7zip: support for 7zip archives')
 options=('!emptydirs' '!makeflags')
 backup=('etc/mc/edit.indent.rc'
         'etc/mc/filehighlight.ini'
@@ -30,8 +28,11 @@ backup=('etc/mc/edit.indent.rc'
         'etc/mc/mc.menu'
         'etc/mc/sfs.ini')
 source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2"
-    4.7.5.2-ncursesw-term.h.patch
-    mc-4.8.10-msys2.patch)
+        4.7.5.2-ncursesw-term.h.patch
+        mc-4.8.10-msys2.patch)
+md5sums=('a64c426364bfaee56b628f6c0738aade'
+         '5b5e78b598b4405c1c4bcef055c78744'
+         '3429bafbfbfcf3bdf76d1014fb3a1893')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -62,7 +63,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  mv -f ${pkgdir}/etc ${pkgdir}/usr/
 
   # Fix FS#15177
   sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
@@ -71,7 +71,3 @@ package() {
   sed 's#/usr/bin/env python#/usr/bin/python2#' \
     -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
-
-md5sums=('a64c426364bfaee56b628f6c0738aade'
-         '5b5e78b598b4405c1c4bcef055c78744'
-         '3429bafbfbfcf3bdf76d1014fb3a1893')