Upgrade to 4.5.40.

1 files changed, 33 insertions, 21 deletions

diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index f4770ab8eec5..c517d57b6b99 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,15 +1,16 @@
---- Makefile.in.orig	Tue Mar 30 08:34:33 1999
-+++ Makefile.in	Wed Apr  7 23:48:54 1999
-@@ -5,7 +5,7 @@
+--- Makefile.in.orig	Thu Sep 30 04:39:33 1999
++++ Makefile.in	Sat Oct  9 15:23:23 1999
+@@ -5,14 +5,15 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
 -codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
+-unixdirs=intl $(codedirs) doc-gnome @POSUB@
 +codedirs=vfs lib doc slang edit src syntax
- unixdirs=intl $(codedirs) @POSUB@
++unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
-@@ -13,6 +13,7 @@
+ 
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -17,7 +18,7 @@
  
  DISTMAIN =	configure configure.in NEWS README INSTALL INSTALL.FAST \
  		Makefile.in FAQ COPYING create_vcs install-sh \
-@@ -46,7 +47,7 @@
+@@ -45,7 +46,7 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
  	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
@@ -26,7 +27,7 @@
  	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
  	@echo "Please verify that the configuration values are correctly"
  	@echo "set in the mc.ext file in $(mclibdir)"
-@@ -58,9 +59,9 @@
+@@ -57,9 +58,9 @@
  installdirs:
  	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
@@ -38,8 +39,8 @@
  
  mcfninstall:
  	-/bin/sh ./mcfn_install
---- src/Makefile.in.orig	Sun Dec  6 12:08:54 1998
-+++ src/Makefile.in	Sun Dec  6 12:09:24 1998
+--- src/Makefile.in.orig	Thu Sep 30 04:39:39 1999
++++ src/Makefile.in	Sat Oct  9 15:03:45 1999
 @@ -130,7 +130,7 @@
  	-$(RMF) $(srcdir)/Makefile
  
@@ -47,10 +48,10 @@
 -	$(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 
+ 	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp 
  
---- doc/Makefile.in.orig	Sat Feb 27 02:25:12 1999
-+++ doc/Makefile.in	Sat Feb 27 21:03:37 1999
+--- doc/Makefile.in.orig	Thu Sep 30 04:39:38 1999
++++ doc/Makefile.in	Sat Oct  9 15:03:45 1999
 @@ -17,7 +17,7 @@
  install:
  	$(MKINSTALLDIRS) $(DESTDIR)/$(man1dir)
@@ -60,14 +61,25 @@
  	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
  	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
  
---- lib/Makefile.in.orig	Wed Jan 27 01:10:33 1999
-+++ lib/Makefile.in	Wed Jan 27 01:10:59 1999
-@@ -13,7 +13,7 @@
+--- lib/Makefile.in.orig	Thu Sep 30 04:39:38 1999
++++ lib/Makefile.in	Sat Oct  9 15:03:45 1999
+@@ -12,8 +12,8 @@
+ # Distribution variables
  #
  
- LIBFILES_IN = mc.ext.in mc-gnome.ext.in
--LIBFILES_OUT = mc.ext mc-gnome.ext
-+LIBFILES_OUT = mc.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) \
+-LIBFILES_IN = mc.ext.in mc-gnome.ext.in
+-LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh
++LIBFILES_IN = mc.ext.in
++LIBFILES_OUT = mc.ext mc.csh mc.sh
+ LIBFILES_CONST = mc.hint mc.hint.es mc.lib mc.menu
+ SUPPBIN_IN = mc.csh.in mc.sh.in
+ SUPPBIN_OUT =  mc.csh mc.sh
+@@ -62,7 +62,7 @@
+ 	for I in $(LIBFILES_OUT); \
+ 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
+ 	for I in $(SUPPBIN_OUT); \
+-	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
++	do $(INSTALL_DATA) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
+ 	for I in $(TIFILES); \
+ 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)