Update to version 4.5.31.

PR:		11847
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 73 insertions, 58 deletions

diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index ef507b35623f..bb31617df7e1 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Jan 19 00:44:07 1999
-+++ configure	Fri Jan 29 16:51:46 1999
-@@ -3188,15 +3188,15 @@
+--- configure.orig	Sun Apr 11 04:38:29 1999
++++ configure	Sun May  9 15:58:08 1999
+@@ -3267,15 +3267,15 @@
  fi
  
          
@@ -10,19 +10,17 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
--	INTLLIBS=$INTLDEPS
--	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++	INTLDEPS='-lintl'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
 -        nls_cv_header_libgt=intl/libgettext.h
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLLIBS=$INTLDEPS
-+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 +#        nls_cv_header_intl=intl/libintl.h
 +#        nls_cv_header_libgt=intl/libgettext.h
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -10359,13 +10359,13 @@
+@@ -10524,13 +10524,13 @@
      
      if $search_ncurses
      then
@@ -41,7 +39,7 @@
              cat >> confdefs.h <<\EOF
  #define HAS_CURSES 1
  EOF
-@@ -10381,13 +10381,13 @@
+@@ -10546,13 +10546,13 @@
      
      if $search_ncurses
      then
@@ -60,7 +58,7 @@
              cat >> confdefs.h <<\EOF
  #define HAS_CURSES 1
  EOF
-@@ -10403,13 +10403,13 @@
+@@ -10568,13 +10568,13 @@
      
      if $search_ncurses
      then
@@ -79,7 +77,7 @@
              cat >> confdefs.h <<\EOF
  #define HAS_CURSES 1
  EOF
-@@ -10425,13 +10425,13 @@
+@@ -10590,13 +10590,13 @@
      
      if $search_ncurses
      then
@@ -98,27 +96,27 @@
              cat >> confdefs.h <<\EOF
  #define HAS_CURSES 1
  EOF
-@@ -10676,6 +10676,8 @@
- fi
- done
+@@ -10655,6 +10655,8 @@
+ 	fi
+     fi
  
 +CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
 +LIBS="$LIBS $CURSES_LIBS"
  
- if test "x$screen_manager" = "xunknown"; then
-     cat >> confdefs.h <<\EOF
-@@ -11212,7 +11214,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
+                 if $search_ncurses 
+     then
+@@ -11465,7 +11467,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha 
+ vfs/extfs/uha 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
-@@ -11423,7 +11425,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
+@@ -11684,7 +11686,7 @@
+ vfs/extfs/ftplist vfs/extfs/uzip vfs/extfs/uzoo vfs/extfs/lslR vfs/extfs/ulha 
+ vfs/extfs/uha 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 2e7bb63a2d15..1b276df3f7bb 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,6 +1,17 @@
---- vfs/Make-mc.in.orig	Tue Jan 19 00:44:08 1999
-+++ vfs/Make-mc.in	Tue Jan 26 19:26:43 1999
-@@ -180,20 +180,20 @@
+--- vfs/Make-mc.in.orig	Tue Mar 30 08:34:34 1999
++++ vfs/Make-mc.in	Wed Apr  7 23:37:58 1999
+@@ -13,8 +13,9 @@
+ DEFS     = $(XDEFS)
+ LIBS     = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
+ INSTALL  = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ AR = @AR@
+ 
+ #
+@@ -185,7 +186,7 @@
  
  install: @mcserv@ install.extfs
  	-(if test x@mcserv@ != x; then \
@@ -9,19 +20,17 @@
  	fi)
  
  install.extfs:
- 	for I in $(EXTFS_MISC); do \
--	    $(INSTALL_DATA) $(srcdir)/extfs/$$I \
-+	    $(INSTALL_DATA) extfs/$$I \
- 	          $(DESTDIR)$(libdir)/extfs/$$I; \
+@@ -194,11 +195,11 @@
+ 	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_CONST) ; do \
 -	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+	    $(INSTALL_DATA) -m 555 extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
++	    $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_OUT) ; do \
 -	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+	    $(INSTALL_DATA) -m 555 extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
++	    $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index c6abe289485e..88063ea4e492 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,23 +1,23 @@
---- Make.common.in.orig	Sat Feb 27 02:25:11 1999
-+++ Make.common.in	Sat Feb 27 21:01:05 1999
+--- Make.common.in.orig	Tue Mar 30 08:34:33 1999
++++ Make.common.in	Wed Apr  7 23:40:05 1999
 @@ -17,9 +17,10 @@
  
  builddir   = @builddir@
  bindir     = @bindir@
 +sbindir    = $(exec_prefix)/sbin
  sysconfdir = @sysconfdir@
- corbadir   = $(sysconfdir)/CORBA/servers
--libdir     = $(exec_prefix)/lib/mc
-+libdir     = $(exec_prefix)/share/mc
- idldir     = $(prefix)/share/idl
- suppbindir = $(libdir)/bin
- gnewdir	   = $(prefix)/share/mc/templates
-@@ -60,7 +61,7 @@
+ datadir    = @datadir@
+-libdir	   = @libdir@
++libdir	   = @datadir@
+ mandir     = @mandir@
+ gnomeicondir = @gnomeicondir@
+ xv_bindir  = @xv_bindir@
+@@ -64,7 +65,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@
--XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
-+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
+-XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
++XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
  XLDFLAGS = @LDFLAGS@
  XDEFS = @DEFS@
  XLIBS = @LIBS@
diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index f1deb1145228..f4770ab8eec5 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,31 +1,40 @@
---- Makefile.in.orig	Sat Feb 27 02:25:11 1999
-+++ Makefile.in	Sat Feb 27 21:02:30 1999
+--- Makefile.in.orig	Tue Mar 30 08:34:33 1999
++++ Makefile.in	Wed Apr  7 23:48:54 1999
 @@ -5,7 +5,7 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
-+codedirs=vfs lib doc slang edit src
+-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
++codedirs=vfs lib doc slang edit src syntax
  unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
-@@ -46,7 +46,7 @@
+@@ -13,6 +13,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ DISTMAIN =	configure configure.in NEWS README INSTALL INSTALL.FAST \
+ 		Makefile.in FAQ COPYING create_vcs install-sh \
+@@ -46,7 +47,7 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+ 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
 -	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-+	$(INSTALL_DATA) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++	$(INSTALL_SCRIPT) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
  	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
  	@echo "Please verify that the configuration values are correctly"
- 	@echo "set in the mc.ext file in $(libdir)"
-@@ -58,9 +58,8 @@
+ 	@echo "set in the mc.ext file in $(mclibdir)"
+@@ -58,9 +59,9 @@
  installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
 +	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+-	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(syntaxdir)
  
  mcfninstall:
  	-/bin/sh ./mcfn_install
@@ -53,13 +62,12 @@
  
 --- lib/Makefile.in.orig	Wed Jan 27 01:10:33 1999
 +++ lib/Makefile.in	Wed Jan 27 01:10:59 1999
-@@ -13,7 +13,8 @@
+@@ -13,7 +13,7 @@
  #
  
  LIBFILES_IN = mc.ext.in mc-gnome.ext.in
 -LIBFILES_OUT = mc.ext mc-gnome.ext
 +LIBFILES_OUT = mc.ext
-+#LIBFILES_OUT = mc.ext mc-gnome.ext
  LIBFILES_CONST = mc.hint mc.lib mc.menu
  TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
  DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \