5 files changed, 134 insertions, 166 deletions

diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index 7d8c5dec92c9..3a19fdfe7d92 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon May 25 18:16:04 1998
-+++ configure	Tue Jun  2 06:43:28 1998
-@@ -10462,7 +10462,7 @@
+--- configure.orig	Sun Dec  6 11:57:21 1998
++++ configure	Sun Dec  6 11:59:02 1998
+@@ -10840,7 +10840,7 @@
          if test -f /usr/include/ncurses.h
  	then
  	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
@@ -9,18 +9,18 @@
  	    CPPFLAGS="$CPPFLAGS "
  	    search_ncurses=false
  	    screen_manager="ncurses on /usr/include"
-@@ -11268,7 +11268,7 @@
- vfs/extfs/ftplist vfs/extfs/zip vfs/extfs/zoo vfs/extfs/lslR
- vfs/extfs/lha vfs/extfs/cpio vfs/extfs/deb vfs/extfs/rar
+@@ -11648,7 +11648,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
+ vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
  
 -doc/mc.1 doc/mcedit.1 doc/mcserv.8
 +doc/mc.1 doc/mcserv.8
  
  intl/Makefile po/Makefile.in
   config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-@@ -11466,7 +11466,7 @@
- vfs/extfs/ftplist vfs/extfs/zip vfs/extfs/zoo vfs/extfs/lslR
- vfs/extfs/lha vfs/extfs/cpio vfs/extfs/deb vfs/extfs/rar
+@@ -11851,7 +11851,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR
+ vfs/extfs/ulha vfs/extfs/ucpio vfs/extfs/deb vfs/extfs/urar vfs/extfs/uar
  
 -doc/mc.1 doc/mcedit.1 doc/mcserv.8
 +doc/mc.1 doc/mcserv.8
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index 2c4117d8b1e0..a658376cf7e5 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,6 +1,6 @@
---- vfs/Makefile.in.orig	Mon May 25 18:16:04 1998
-+++ vfs/Makefile.in	Wed Jun  3 23:28:09 1998
-@@ -91,25 +91,24 @@
+--- vfs/Make-mc.in.orig	Sun Dec  6 11:59:31 1998
++++ vfs/Make-mc.in	Sun Dec  6 12:26:32 1998
+@@ -172,20 +172,20 @@
  
  install: @mcserv@ install.extfs
  	-(if test x@mcserv@ != x; then \
@@ -9,35 +9,19 @@
  	fi)
  
  install.extfs:
--	$(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
--	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
--	$(INSTALL_PROGRAM) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
--	$(INSTALL_PROGRAM) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
--	$(INSTALL_PROGRAM) $(srcdir)/extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
--	$(INSTALL_PROGRAM) $(srcdir)/extfs/hp48  $(DESTDIR)$(libdir)/extfs/hp48
--	
--	$(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
--	$(INSTALL_PROGRAM) extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
--	$(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
--	$(INSTALL_PROGRAM) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
--	$(INSTALL_PROGRAM) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
--	$(INSTALL_PROGRAM) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
--	$(INSTALL_PROGRAM) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
--	$(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
-+	$(INSTALL_DATA) extfs/README $(DESTDIR)$(libdir)/extfs/README
-+	$(INSTALL_DATA) extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
-+	$(INSTALL_DATA) -m 555 extfs/a $(DESTDIR)$(libdir)/extfs/a
-+	$(INSTALL_DATA) -m 555 extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
-+	$(INSTALL_DATA) -m 555 extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
-+	$(INSTALL_DATA) -m 555 extfs/hp48  $(DESTDIR)$(libdir)/extfs/hp48
-+	$(INSTALL_DATA) -m 555 extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
-+	$(INSTALL_DATA) -m 555 extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
-+	$(INSTALL_DATA) -m 555 extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-+	$(INSTALL_DATA) -m 555 extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-+	$(INSTALL_DATA) -m 555 extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-+	$(INSTALL_DATA) -m 555 extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-+	$(INSTALL_DATA) -m 555 extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-+	$(INSTALL_DATA) -m 555 extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
+ 	for I in $(EXTFS_MISC); do \
+-	    $(INSTALL_DATA) $(srcdir)/extfs/$$I \
++	    $(INSTALL_DATA) extfs/$$I \
+ 	          $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	done
+ 	for I in $(EXTFS_CONST) ; do \
+-	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
++	    $(INSTALL_DATA) -m 555 extfs/$$I \
+ 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	done
+ 	for I in $(EXTFS_OUT) ; do \
+-	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
++	    $(INSTALL_DATA) -m 555 extfs/$$I \
+ 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	done
  
- uninstall:
- 	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index 2107be300f95..50f7a0eefc38 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,14 +1,14 @@
---- Make.common.in.orig	Mon Mar 30 05:26:08 1998
-+++ Make.common.in	Sun Apr 12 03:19:48 1998
-@@ -16,6 +16,7 @@
- manprefix =
+--- Make.common.in.orig	Sun Dec  6 12:04:28 1998
++++ Make.common.in	Sun Dec  6 12:05:41 1998
+@@ -17,6 +17,7 @@
  
- bindir     = $(exec_prefix)/bin
-+sbindir     = $(exec_prefix)/sbin
+ builddir   = @builddir@
+ bindir     = @bindir@
++sbindir    = $(exec_prefix)/sbin
  libdir     = $(exec_prefix)/lib/mc
  suppbindir = $(libdir)/bin
  tidir      = $(libdir)/term
-@@ -50,7 +51,7 @@
+@@ -52,7 +53,7 @@
  # No way, to make make happy (except GNU), we cannot use := to append
  # something to these, so that's why there is a leading _
  XCFLAGS = @CFLAGS@
diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index e080ef620e95..90316a17bd22 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Apr 12 04:41:57 1998
-+++ Makefile.in	Sat May  2 13:10:05 1998
-@@ -40,7 +40,7 @@
+--- Makefile.in.orig	Sun Dec  6 12:08:01 1998
++++ Makefile.in	Sun Dec  6 12:08:51 1998
+@@ -45,7 +45,7 @@
  install: installdirs @vcs@
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
  	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
@@ -9,7 +9,7 @@
  	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
  	@echo "Please verify that the configuration values are correctly"
  	@echo "set in the mc.ext file in $(libdir)"
-@@ -52,7 +52,7 @@
+@@ -57,7 +57,7 @@
  installdirs:
  	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
  	$(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
@@ -18,19 +18,19 @@
  	$(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
  
  mcfninstall:
---- src/Makefile.in.orig	Sun Nov 30 01:51:42 1997
-+++ src/Makefile.in	Sun Nov 30 01:51:56 1997
-@@ -125,7 +125,7 @@
+--- src/Makefile.in.orig	Sun Dec  6 12:08:54 1998
++++ src/Makefile.in	Sun Dec  6 12:09:24 1998
+@@ -130,7 +130,7 @@
  	-$(RMF) $(srcdir)/Makefile
  
- install: mc mfmt @saver@
+ install: mc mcmfmt @saver@
 -	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)mc
 +	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)midc
  	$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
  	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp 
  
---- doc/Makefile.in.orig	Mon Mar 30 05:26:09 1998
-+++ doc/Makefile.in	Sun Apr 12 03:23:15 1998
+--- doc/Makefile.in.orig	Sun Dec  6 12:09:48 1998
++++ doc/Makefile.in	Sun Dec  6 12:10:08 1998
 @@ -15,7 +15,7 @@
  all:
  
diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag
index 3c38040c5633..ea0cb2c90b24 100644
--- a/misc/mc/files/patch-ag
+++ b/misc/mc/files/patch-ag
@@ -1,120 +1,106 @@
---- lib/mc.ext.in.orig	Mon May 25 18:16:05 1998
-+++ lib/mc.ext.in	Thu Jun  4 10:06:34 1998
-@@ -105,20 +105,20 @@
- 
- regex/\.t([gp]?z|ar\.g?[zZ])$
- 	Open=%cd tar:%d/%p/
--	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
--	Extract=gzip -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} gzip -dc '%d/%p' | tar tvvf -
-+	Extract=gzip -dc '%d/%p' | tar xf -
- 	Icon=compressed.xpm
- 
- regex/\.tar\.bz$
- #	Open=%cd tar:%d/%p/
--	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
--	Extract=bzip -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} bzip -dc '%d/%p' | tar tvvf -
-+	Extract=bzip -dc '%d/%p' | tar xf -
- 	Icon=compressed.xpm
- 
- regex/\.tar\.bz2$
- 	Open=%cd tar:%d/%p/
--	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
--	Extract=bzip2 -dc %f 2>/dev/null | tar xf -
-+	View=%view{ascii} bzip2 -dc '%d/%p' | tar tvvf -
-+	Extract=bzip2 -dc '%d/%p' | tar xf -
- 	Icon=compressed.xpm
- 
- # .tar
-@@ -130,17 +130,17 @@
- 
- # bzipped
- regex/\.bz$
--	Open=bzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} bzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; bzip -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
--	Uncompress=bunzip %f
-+	Open=bzip -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} bzip -dc '%d/%p'
-+	Edit=I=`date +%%s`; export I; bzip -dc '%d/%p' >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip -c /tmp/bzed.$I > '%d/%p'; rm -f /tmp/bzed.$I
-+	Uncompress=bunzip '%d/%p'
- 	Icon=compressed.xpm
- 
- regex/\.bz2$
--	Open=bzip2 -dc %f | %var{PAGER:more}
--	View=%view{ascii} bzip2 -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; bzip2 -cd %f >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > %f; rm -f /tmp/bzed.$I
--	Uncompress=bunzip2 %f
-+	Open=bzip2 -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} bzip2 -dc '%d/%p'
-+	Edit=I=`date +%%s`; export I; bzip2 -dc '%d/%p' >/tmp/bzed.$I && %var{EDITOR:vi} /tmp/bzed.$I && bzip2 -c /tmp/bzed.$I > '%d/%p'; rm -f /tmp/bzed.$I
-+	Uncompress=bunzip2 '%d/%p'
- 	Icon=compressed.xpm
- 
- # Programs
-@@ -213,7 +213,7 @@
- 	Icon=plain_dir.xpm
- regex/^ls-?lR\.(g?z|Z)$
- 	Open=%cd lslR:%d/%p/
--	View=%view{ascii} gunzip -c %f
-+	View=%view{ascii} gzip -c '%d/%p'
- 	Icon=plain_dir.xpm
- 
- # ftplist
-@@ -236,7 +236,7 @@
- 	Open=%cd zip:%d/%p/
- 	View=%view{ascii} unzip -v %f
- 	Icon=zip.xpm
--	Extract=unzip %f
-+	Extract=unzip '%d/%p'
- 	Extract (with flags)=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I %f; fi
- 	Unzip=unzip %f '*'
- 
-@@ -266,7 +266,7 @@
+--- lib/mc.ext.in.orig	Sun Dec  6 16:43:44 1998
++++ lib/mc.ext.in	Sun Dec  6 16:46:43 1998
+@@ -265,7 +265,7 @@
  # ar library
  regex/\.s?a$
- 	Open=%cd arfs:%d/%p/
+ 	Open=%cd %p#uar
 -	View=%view{ascii} nm %f
 +	View=%view{ascii} nm '%d/%p'
  
  # C
  shell/.c
-@@ -357,8 +357,8 @@
+@@ -356,8 +356,8 @@
  
  # Manual page - compressed
  regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
 -	Open=gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
 -	View=%view{ascii,nroff} gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@
-+	Open=gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-+	View=%view{ascii,nroff} gzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
++	Open=gunzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
++	View=%view{ascii,nroff} gunzip -dc '%d/%p' | nroff @TROFFASCII@ @MANDOC@
  	Icon=man.xpm
  
  regex/(read\.?me$)|(README)
-@@ -455,16 +455,16 @@
- 
- # gzipped
- type/gzip
--	Open=gzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} gzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
--	Uncompress=gunzip %f
-+	Open=gzip -dc '%d/%p' | %var{PAGER:more}
-+	View=%view{ascii} gzip -dc '%d/%p'
-+	Edit=I=`date +%%s`; export I; gzip -dc '%d/%p' >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > '%d/%p'; rm -f /tmp/gzed.$I
-+	Uncompress=gzip '%d/%p'
- 	Icon=compressed.xpm
- 
- type/compress
- 	Open=gzip -dc %f | %var{PAGER:more}
--	View=%view{ascii} gzip -dc %f 2>/dev/null
--	Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I
-+	View=%view{ascii} gzip -dc '%d/%p'
-+	Edit=I=`date +%%s`; export I; gzip -dc '%d/%p' >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > '%d/%p'; rm -f /tmp/gzed.$I
- 	Icon=compressed.xpm
- 
- # Makefile
-@@ -532,14 +532,14 @@
+@@ -372,52 +372,52 @@
+ 	View with GhostView=gv %f
+ 
+ type/GIF\ image
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=gif.xpm
+ 	Include=image-options
+ 	
+ type/GIF\ picture
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=gif.xpm
+ 	Include=image-options
+ 	
+ type/JPEG\ picture
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=jpeg.xpm
+ 	Include=image-options
+ 
+ type/PC\ bitmap
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=bitmap.xpm
+ 	Include=image-options
+ 
+ type/PNG\ image
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=gif.xpm
+ 	Include=image-options
+ 
+ type/JPEG\ image
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=jpeg.xpm
+ 	Include=image-options
+ 	
+ type/TIFF\ file
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=tiff.xpm
+ 	Include=image-options
+ 	
+ type/PBM
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=pbm.xpm
+ 	Include=image-options
+ 	
+ type/PGM
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=pgm.xpm
+ 	Include=image-options
+ 	
+ type/PPM
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	Icon=ppm.xpm
+ 	Include=image-options
+ 
+@@ -426,14 +426,14 @@
+ 	Icon=xbm.xpm
+ 
+ shell/.xpm
+-	Open=ee %f
++	Open=ElectricEyes %f
+ 	View=sxpm %f
+ 	Include=image-options
+ 	Icon=xpm.xpm
+ 
+ include/image-options
+ 	Set root window to this image=background-properties --setwallpaper %f &
+-	Display this file=ee %f &
++	Display this file=ElectricEyes %f &
+ 
+ # Sound files
+ shell/.mod
+@@ -531,14 +531,14 @@
         Icon=rexx.xpm
  
  # Microsoft Word Document
@@ -135,13 +121,11 @@
   
  # cpio rules
  
-@@ -551,8 +551,8 @@
- 
+@@ -551,7 +551,7 @@
  shell/.cpio.gz
  	Open=%cd cpio:%d/%p/
--	View=%view{ascii} gzip -dc '%f' | cpio -ictv
+ 	View=%view{ascii} gzip -dc '%f' | cpio -ictv
 -	Extract=gzip -dc '%f' | cpio -ic
-+	View=%view{ascii} gzip -dc '%d/%p' | cpio -ictv
 +	Extract=gzip -dc '%d/%p' | cpio -ic
  	Icon=compressed.xpm