1. Add a patch for compressed man page.

2. Make --enable-subshell as configure argument.

3 files changed, 169 insertions, 19 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 9fc7888037c9..66fc8977e654 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.20 1998/05/02 21:19:48 vanilla Exp $
+# $Id: Makefile,v 1.21 1998/06/01 23:31:36 vanilla Exp $
 #
 
 DISTNAME=	mc-4.1.35
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	utils/file/managers/mc
 MAINTAINER=	ports@FreeBSD.ORG
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-ncurses --without-edit --without-subshell --disable-nls
+CONFIGURE_ARGS=	--with-ncurses --without-edit --with-dusum --disable-nls
 CONFIGURE_ENV=	INSTALL="$${INSTALL} -c"
 MAKE_ENV=	CCOPTS="$(CFLAGS)"
 MAN1=		midc.1
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index 3c72bcedd2f2..2c4117d8b1e0 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	Tue Jun  2 06:29:12 1998
-@@ -91,25 +91,25 @@
++++ vfs/Makefile.in	Wed Jun  3 23:28:09 1998
+@@ -91,25 +91,24 @@
  
  install: @mcserv@ install.extfs
  	-(if test x@mcserv@ != x; then \
@@ -9,17 +9,13 @@
  	fi)
  
  install.extfs:
- 	$(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
- 	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
+-	$(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_DATA) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
-+	$(INSTALL_DATA) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
-+	$(INSTALL_DATA) $(srcdir)/extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
-+	$(INSTALL_DATA) $(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
@@ -28,14 +24,20 @@
 -	$(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/cpio $(DESTDIR)$(libdir)/extfs/cpio
-+	$(INSTALL_DATA) extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
-+	$(INSTALL_DATA) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-+	$(INSTALL_DATA) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-+	$(INSTALL_DATA) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-+	$(INSTALL_DATA) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-+	$(INSTALL_DATA) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-+	$(INSTALL_DATA) 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
  
  uninstall:
  	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
diff --git a/misc/mc/files/patch-ag b/misc/mc/files/patch-ag
new file mode 100644
index 000000000000..3c38040c5633
--- /dev/null
+++ b/misc/mc/files/patch-ag
@@ -0,0 +1,148 @@
+--- 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 @@
+ # ar library
+ regex/\.s?a$
+ 	Open=%cd arfs:%d/%p/
+-	View=%view{ascii} nm %f
++	View=%view{ascii} nm '%d/%p'
+ 
+ # C
+ shell/.c
+@@ -357,8 +357,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@
+ 	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 @@
+        Icon=rexx.xpm
+ 
+ # Microsoft Word Document
+-regex/\.(doc|DOC)$
++#regex/\.(doc|DOC)$
+ #       View=%view{ascii} catdoc -w %f
+-       View=%view{ascii} word2x -f text %f -
+-       Icon=word.xpm
+-type/Microsoft Word Document
++#       View=%view{ascii} word2x -f text %f -
++#       Icon=word.xpm
++#type/Microsoft Word Document
+ #       View=%view{ascii} catdoc -w %f
+-       View=%view{ascii} word2x -f text %f -
+-       Icon=word.xpm
++#       View=%view{ascii} word2x -f text %f -
++#       Icon=word.xpm
+  
+ # cpio rules
+ 
+@@ -551,8 +551,8 @@
+ 
+ shell/.cpio.gz
+ 	Open=%cd cpio:%d/%p/
+-	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
+ 
+ shell/.cpio