Upgrade to 4.0.

PR:		3904
Submitted by:	Vanilla I. Shu <vanilla@MinJe.com.TW>

6 files changed, 124 insertions, 53 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 61ba02846c88..c0056ec7c8aa 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for:	mc
-# Version required:	3.2.1
+# Version required:	4.0
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1996/11/18 10:25:14 asami Exp $
+# $Id: Makefile,v 1.10 1997/05/25 21:24:32 torstenb Exp $
 #
 
-DISTNAME=	mc-3.2.1
+DISTNAME=	mc-4.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	utils/file/managers/mc
+
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-ncurses
-STRIP=
-MAN1=		mc.1
+CONFIGURE_ARGS=	--with-ncurses --without-edit --without-subshell
+MAN1=		mc.1 mcedit.1
 MAN8=		mcserv.8
 
-post-install:
-	@/usr/bin/strip ${PREFIX}/bin/mc ${PREFIX}/sbin/mcserv
-
 .include <bsd.port.mk>
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 387a0b178c6d..ca1f958db632 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-3.2.1.tar.gz) = c8591a48e65f72debfcda495b4cb5576
+MD5 (mc-4.0.tar.gz) = 1420c696eeff2678199144e38d0ee0aa
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index 9afe23f85603..418066cc6ad7 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,7 +1,34 @@
-*** configure.orig	Mon Sep 18 21:27:59 1995
---- configure	Mon Sep 18 21:29:01 1995
-***************
-*** 4828,4834 ****
+*** configure.orig	Tue Jun 17 09:51:22 1997
+--- configure	Fri Jun 20 00:03:50 1997
+*************** if test "x$CCOPTS" = x; then
+*** 1382,1388 ****
+              CCOPTS='-O'
+  	    if test x$use_cc_g_flag = xyes; then
+  		if test $cc_uses_g = yes; then
+! 		    CCOPTS='-g -O'
+  		fi
+  	    fi
+  	fi
+--- 1382,1388 ----
+              CCOPTS='-O'
+  	    if test x$use_cc_g_flag = xyes; then
+  		if test $cc_uses_g = yes; then
+! 		    CCOPTS='-O2 -m486 -pipe'
+  		fi
+  	    fi
+  	fi
+*************** ac_configure=$ac_aux_dir/configure # Thi
+*** 1437,1442 ****
+--- 1437,1443 ----
+  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+  # ./install, which can be erroneously created by make from ./install.sh.
+  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++ INSTALL="/usr/bin/install -c"
+  if test -z "$INSTALL"; then
+  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+    echo $ac_n "(cached) $ac_c" 1>&6
+*************** if test "${with_ncurses+set}" = set; the
+*** 5411,5417 ****
   	then
   		search_ncurses=true
   	else
@@ -9,7 +36,7 @@
   		CPPFLAGS="$CPPFLAGS -I$withval/include"
   		search_ncurses=false
   		screen_manager="ncurses"
---- 4828,4834 ----
+--- 5412,5418 ----
   	then
   		search_ncurses=true
   	else
@@ -17,8 +44,8 @@
   		CPPFLAGS="$CPPFLAGS -I$withval/include"
   		search_ncurses=false
   		screen_manager="ncurses"
-***************
-*** 5661,5667 ****
+*************** then
+*** 6372,6378 ****
           if test -f /usr/include/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
@@ -26,7 +53,7 @@
   	    CPPFLAGS="$CPPFLAGS "
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/include"
---- 5661,5667 ----
+--- 6373,6379 ----
           if test -f /usr/include/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
@@ -34,8 +61,8 @@
   	    CPPFLAGS="$CPPFLAGS "
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/include"
-***************
-*** 5678,5684 ****
+*************** EOF
+*** 6389,6395 ****
           if test -f /usr/include/ncurses/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
@@ -43,7 +70,7 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/include/ncurses"
---- 5678,5684 ----
+--- 6390,6396 ----
           if test -f /usr/include/ncurses/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
@@ -51,8 +78,8 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/include/ncurses"
-***************
-*** 5695,5701 ****
+*************** EOF
+*** 6406,6412 ****
           if test -f /usr/local/include/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
@@ -60,7 +87,7 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/local"
---- 5695,5701 ----
+--- 6407,6413 ----
           if test -f /usr/local/include/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
@@ -68,8 +95,8 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/local"
-***************
-*** 5712,5718 ****
+*************** EOF
+*** 6423,6429 ****
           if test -f /usr/local/include/ncurses/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
@@ -77,7 +104,7 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/local/include/ncurses"
---- 5712,5718 ----
+--- 6424,6430 ----
           if test -f /usr/local/include/ncurses/ncurses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
@@ -85,8 +112,8 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
   	    search_ncurses=false
   	    screen_manager="ncurses on /usr/local/include/ncurses"
-***************
-*** 5730,5736 ****
+*************** EOF
+*** 6441,6447 ****
           if test -f /usr/local/include/ncurses/curses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
@@ -94,7 +121,7 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
   	    search_ncurses=false
   	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
---- 5730,5736 ----
+--- 6442,6448 ----
           if test -f /usr/local/include/ncurses/curses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
@@ -102,8 +129,8 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
   	    search_ncurses=false
   	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
-***************
-*** 5748,5754 ****
+*************** EOF
+*** 6459,6465 ****
           if test -f /usr/include/ncurses/curses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
@@ -111,7 +138,7 @@
   	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
   	    search_ncurses=false
   	    screen_manager="renamed ncurses on /usr/include/ncurses"
---- 5748,5754 ----
+--- 6460,6466 ----
           if test -f /usr/include/ncurses/curses.h
   	then
   	    echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index c8a83a18c7fa..a34ba1805cbe 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,19 +1,51 @@
-*** vfs/Makefile.in.orig	Wed Sep 27 20:07:56 1995
---- vfs/Makefile.in	Wed Sep 27 20:08:28 1995
-***************
-*** 75,81 ****
+*** vfs/Makefile.in.orig	Tue Jun 17 09:51:24 1997
+--- vfs/Makefile.in	Fri Jun 20 00:17:24 1997
+*************** distclean:
+*** 91,113 ****
   
-  install:
+  install: mcserv install.extfs
   	if test x@mcserv@ != x; then \
 ! 	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
   	fi
   
   install.extfs:
---- 75,81 ----
+  	$(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
+  	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
   
-  install:
+! 	$(INSTALL_PROGRAM) extfs/a $(DESTDIR)$(libdir)/extfs/a
+! 	$(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/rpm  $(DESTDIR)$(libdir)/extfs/rpm
+! 	$(INSTALL_PROGRAM) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
+! 	$(INSTALL_PROGRAM) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
+! 	$(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
+  
+  uninstall:
+  	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
+--- 91,113 ----
+  
+  install: mcserv install.extfs
   	if test x@mcserv@ != x; then \
 ! 	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
   	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) extfs/a $(DESTDIR)$(libdir)/extfs/a
+! 	$(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/rpm  $(DESTDIR)$(libdir)/extfs/rpm
+! 	$(INSTALL_DATA) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
+! 	$(INSTALL_DATA) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
+! 	$(INSTALL_DATA) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
+  
+  uninstall:
+  	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index d07c8e7ae22e..9d273e374c7a 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,6 +1,6 @@
-*** Make.common.in.orig	Wed Sep 27 20:09:34 1995
---- Make.common.in	Wed Sep 27 20:10:42 1995
-***************
+*** Make.common.in.orig	Thu Jun 19 23:14:51 1997
+--- Make.common.in	Thu Jun 19 23:16:28 1997
+*************** exec_prefix = $(prefix)
 *** 14,19 ****
 --- 14,20 ----
   binprefix =
@@ -10,8 +10,8 @@
   libdir = $(exec_prefix)/lib/mc
   suppbindir = $(libdir)/bin
   tidir = $(libdir)/term
-***************
-*** 42,48 ****
+*************** AWK = @AWK@
+*** 45,51 ****
   # 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@
@@ -19,7 +19,7 @@
   XLDFLAGS = @LDFLAGS@
   XDEFS = @DEFS@
   XLIBS = @LIBS@
---- 43,49 ----
+--- 46,52 ----
   # 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/pkg-plist b/misc/mc/pkg-plist
index 08a1a6bfc9db..9d48010dd8ce 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,20 +1,28 @@
 bin/mc
+bin/mcmfmt
 sbin/mcserv
 lib/mc/FAQ
+lib/mc/gd.tcl
+lib/mc/gui.tcl
+lib/mc/mc.ext
+lib/mc/mc.hint
+lib/mc/mc.hlp
+lib/mc/mc.lib
+lib/mc/mc.menu
+lib/mc/mc.tcl
 lib/mc/bin/mcfn_install
 lib/mc/extfs/README
 lib/mc/extfs/a
+lib/mc/extfs/cpio
+lib/mc/extfs/deb
 lib/mc/extfs/extfs.ini
 lib/mc/extfs/ftplist
+lib/mc/extfs/lha
 lib/mc/extfs/lslR
+lib/mc/extfs/rar
 lib/mc/extfs/rpm
+lib/mc/extfs/zip
 lib/mc/extfs/zoo
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/mc.tcl
 lib/mc/term/README.xterm
 lib/mc/term/ansi.ti
 lib/mc/term/linux.ti
@@ -23,4 +31,9 @@ lib/mc/term/xterm.ad
 lib/mc/term/xterm.tcap
 lib/mc/term/xterm.ti
 man/man1/mc.1.gz
+man/man1/mcedit.1.gz
 man/man8/mcserv.8.gz
+@dirrm lib/mc/bin
+@dirrm lib/mc/extfs
+@dirrm lib/mc/term
+@dirrm lib/mc