mc-4.8.16-1.parabola1: updating version

2 files changed, 46 insertions, 46 deletions

diff --git a/libre/mc/PKGBUILD b/libre/mc/PKGBUILD
index cc5e05d2a..2251b07fa 100644
--- a/libre/mc/PKGBUILD
+++ b/libre/mc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129921 2015-03-25 21:16:55Z anatolik $
+# $Id: PKGBUILD 166430 2016-03-12 22:15:15Z schuay $
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer (Arch): schuay <jakob.gruber@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=mc
-pkgver=4.8.15
+pkgver=4.8.16
 pkgrel=1.parabola1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar support removed"
 arch=('i686' 'x86_64' 'armv7h')
@@ -76,5 +76,5 @@ package() {
         -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('db48ce26ba425a61edc51930e94227fd'
-         'f91103718b1497ce611b9a12f05e1cc9')
+sha256sums=('c37ea495df93f6d375a3ce59cdcf0f3a3690338526205347b03a316daebdaaf8'
+            '2d05fa0bc5c6e5022a2d45a3cf1481c70da9f164c341d4204fa8506b6ce9f0d3')
diff --git a/libre/mc/libre.patch b/libre/mc/libre.patch
index 833e07095..74059aeb4 100644
--- a/libre/mc/libre.patch
+++ b/libre/mc/libre.patch
@@ -1,17 +1,17 @@
 diff --git a/configure b/configure
-index ae597a4..98d286b 100755
+index 077b176..883ee03 100755
 --- a/configure
 +++ b/configure
-@@ -27338,7 +27338,7 @@ _ACEOF
+@@ -28701,7 +28701,7 @@ _ACEOF
  ac_config_files="$ac_config_files src/man2hlp/man2hlp"
  
  
--ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/mc.menu.sr misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/mc.menu.sr misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
+-ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
  
  
  if test x$enable_tests != xno; then
-@@ -28601,7 +28601,6 @@ do
+@@ -29970,7 +29970,6 @@ do
      "src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;;
      "src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;;
      "src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;;
@@ -19,7 +19,7 @@ index ae597a4..98d286b 100755
      "src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;;
      "src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;;
      "src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;;
-@@ -28611,7 +28610,6 @@ do
+@@ -29980,7 +29979,6 @@ do
      "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;;
      "src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;;
      "src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;;
@@ -28,7 +28,7 @@ index ae597a4..98d286b 100755
      "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;;
      "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;;
 diff --git a/configure.ac b/configure.ac
-index c82fdd0..9884f40 100644
+index 4962f03..f2a42da 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -550,7 +550,6 @@ src/vfs/extfs/helpers/mailfs
@@ -48,10 +48,10 @@ index c82fdd0..9884f40 100644
  src/vfs/extfs/helpers/uzoo
  
 diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh
-index 2264b12..39885ae 100755
+index e6105fd..ebf6b52 100755
 --- a/misc/ext.d/archive.sh
 +++ b/misc/ext.d/archive.sh
-@@ -61,8 +61,7 @@ do_view_action() {
+@@ -75,8 +75,7 @@ do_view_action() {
          lha l "${MC_EXT_FILENAME}"
          ;;
      arj)
@@ -61,7 +61,7 @@ index 2264b12..39885ae 100755
          ;;
      cab)
          cabextract -l "${MC_EXT_FILENAME}"
-@@ -70,10 +69,6 @@ do_view_action() {
+@@ -84,10 +83,6 @@ do_view_action() {
      ha)
          ha lf "${MC_EXT_FILENAME}"
          ;;
@@ -72,7 +72,7 @@ index 2264b12..39885ae 100755
      alz)
          unalz -l "${MC_EXT_FILENAME}"
          ;;
-@@ -93,9 +88,6 @@ do_view_action() {
+@@ -115,9 +110,6 @@ do_view_action() {
              7z l "${MC_EXT_FILENAME}"
  
          ;;
@@ -83,23 +83,23 @@ index 2264b12..39885ae 100755
          arc l "${MC_EXT_FILENAME}"
          ;;
 diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini
-index 8bc1722..430bebb 100644
+index 689ecdd..9c6e078 100644
 --- a/misc/filehighlight.ini
 +++ b/misc/filehighlight.ini
 @@ -28,7 +28,7 @@
      regexp=(^#.*|.*~$)
  
  [archive]
--    extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z;ace
-+    extensions=gz;bz2;tar;tgz;rpm;Z;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z
+-    extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;xz;zip;zoo
++    extensions=7z;Z;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;xz;zip;zoo
  
  [doc]
-     extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm;docx;docm;xlsx;xlsm;pptx;pptm
+     extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;pdf;po;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xlsm;xlsx;xml;xsd;xslt
 diff --git a/misc/mc.ext.in b/misc/mc.ext.in
-index 68c6819..aefb267 100644
+index 9c286d1..5a7e371 100644
 --- a/misc/mc.ext.in
 +++ b/misc/mc.ext.in
-@@ -175,11 +175,6 @@ shell/i/.ha
+@@ -185,11 +185,6 @@ shell/i/.ha
  	Open=%cd %p/uha://
  	View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
  
@@ -111,7 +111,7 @@ index 68c6819..aefb267 100644
  # ALZip
  shell/i/.alz
  	Open=%cd %p/ualz://
-@@ -667,12 +662,6 @@ shell/i/.torrent
+@@ -705,12 +700,6 @@ shell/i/.torrent
  
  ### Plain compressed files ###
  
@@ -152,7 +152,7 @@ index 008bf31..fd16aec 100644
      keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow
  
 diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax
-index f5537df..e3b3017 100644
+index ff9ba2b..74c1a1e 100644
 --- a/misc/syntax/sh.syntax
 +++ b/misc/syntax/sh.syntax
 @@ -610,7 +610,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
@@ -171,7 +171,7 @@ index f5537df..e3b3017 100644
      keyword whole uncompress cyan
      keyword whole unexpand cyan
      keyword whole unicode_start cyan
-@@ -1712,7 +1710,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+@@ -1714,7 +1712,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
      keyword whole pwunconv cyan
      keyword whole ramsize cyan
      keyword whole ranlib cyan
@@ -179,7 +179,7 @@ index f5537df..e3b3017 100644
      keyword whole rarp cyan
      keyword whole raw cyan
      keyword whole rbash cyan
-@@ -1884,7 +1881,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+@@ -1886,7 +1883,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
      keyword whole ul cyan
      keyword whole umount cyan
      keyword whole uname cyan
@@ -224,23 +224,10 @@ index 06ea789..099acf1 100644
  	uzoo
  
 diff --git a/src/vfs/extfs/helpers/Makefile.in b/src/vfs/extfs/helpers/Makefile.in
-index b5f4864..d166e55 100644
+index c7b5df7..2a035fe 100644
 --- a/src/vfs/extfs/helpers/Makefile.in
 +++ b/src/vfs/extfs/helpers/Makefile.in
-@@ -86,10 +86,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \
- 	$(srcdir)/iso9660.in $(srcdir)/hp48+.in $(srcdir)/lslR.in \
- 	$(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \
--	$(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \
-+	$(srcdir)/s3+.in $(srcdir)/ualz.in \
- 	$(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \
- 	$(srcdir)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \
--	$(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \
-+	$(srcdir)/ulha.in $(srcdir)/ulib.in \
- 	$(srcdir)/uzip.in $(srcdir)/uzoo.in README
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-@@ -149,8 +149,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -149,8 +149,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \
@@ -251,7 +238,20 @@ index b5f4864..d166e55 100644
  CONFIG_CLEAN_VPATH_FILES =
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
-@@ -439,7 +439,6 @@ EXTFS_IN = \
+@@ -208,10 +208,10 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/a+.in \
+ 	$(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \
+ 	$(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \
+ 	$(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \
+-	$(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \
++	$(srcdir)/s3+.in $(srcdir)/ualz.in \
+ 	$(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \
+ 	$(srcdir)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \
+-	$(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \
++	$(srcdir)/ulha.in $(srcdir)/ulib.in \
+ 	$(srcdir)/uzip.in $(srcdir)/uzoo.in \
+ 	$(top_srcdir)/config/mkinstalldirs README
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -451,7 +451,6 @@ EXTFS_IN = \
  	patchfs.in		\
  	rpms+.in		\
  	s3+.in			\
@@ -259,7 +259,7 @@ index b5f4864..d166e55 100644
  	ualz.in			\
  	uar.in			\
  	uarc.in			\
-@@ -449,7 +448,6 @@ EXTFS_IN = \
+@@ -461,7 +460,6 @@ EXTFS_IN = \
  	uha.in			\
  	ulha.in			\
  	ulib.in			\
@@ -267,7 +267,7 @@ index b5f4864..d166e55 100644
  	uzip.in			\
  	uzoo.in
  
-@@ -470,7 +468,6 @@ EXTFS_OUT = \
+@@ -482,7 +480,6 @@ EXTFS_OUT = \
  	patchfs			\
  	rpms+			\
  	s3+			\
@@ -275,7 +275,7 @@ index b5f4864..d166e55 100644
  	ualz			\
  	uar			\
  	uarc			\
-@@ -480,7 +477,6 @@ EXTFS_OUT = \
+@@ -492,7 +489,6 @@ EXTFS_OUT = \
  	uha			\
  	ulha			\
  	ulib			\
@@ -283,7 +283,7 @@ index b5f4864..d166e55 100644
  	uzip			\
  	uzoo
  
-@@ -550,8 +546,6 @@ rpms+: $(top_builddir)/config.status $(srcdir)/rpms+.in
+@@ -561,8 +557,6 @@ rpms+: $(top_builddir)/config.status $(srcdir)/rpms+.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  s3+: $(top_builddir)/config.status $(srcdir)/s3+.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -292,7 +292,7 @@ index b5f4864..d166e55 100644
  ualz: $(top_builddir)/config.status $(srcdir)/ualz.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  uar: $(top_builddir)/config.status $(srcdir)/uar.in
-@@ -570,8 +564,6 @@ ulha: $(top_builddir)/config.status $(srcdir)/ulha.in
+@@ -581,8 +575,6 @@ ulha: $(top_builddir)/config.status $(srcdir)/ulha.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  ulib: $(top_builddir)/config.status $(srcdir)/ulib.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@