Upgrade to 4.0.

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

1 files changed, 50 insertions, 23 deletions

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