2 files changed, 8 insertions, 53 deletions

diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index a6e8a32da5bd..012c17dd8c42 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 30 09:16:50 1998
-+++ Makefile	Mon Mar 15 01:55:08 1999
-@@ -260,6 +260,7 @@
+--- Makefile.orig	Sun Aug 16 12:24:56 1998
++++ Makefile	Mon Aug 17 12:08:56 1998
+@@ -257,6 +257,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
@@ -8,7 +8,7 @@
  
  # GUI - For creating Vim with GUI (gvim)
  # Uncomment the first line when you don't want to get the GUI version,
-@@ -1172,56 +1173,56 @@
+@@ -1167,28 +1168,28 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,39 +45,3 @@
  
  # create links for the manual pages with various names to vim.  This is only
  # done when the links (or manpages with the same name) don't exist yet.
- installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(EXTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(EXTARGET).1
- 
- $(MANSUBDIR)/$(VIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(VIEWTARGET).1
- 
- $(MANSUBDIR)/$(GVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIMTARGET).1
- 
- $(MANSUBDIR)/$(GVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(GVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIMTARGET).1
- 
- $(MANSUBDIR)/$(RVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RVIEWTARGET).1
- 
- $(MANSUBDIR)/$(RGVIMTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIMTARGET).1
- 
- $(MANSUBDIR)/$(RGVIEWTARGET).1:
--	cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
-+	cd $(MANSUBDIR); #ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1
- 
- uninstall:
- 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX)
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
index 1e4d4ddf502c..61cc5494e207 100644
--- a/editors/vim/files/patch-02
+++ b/editors/vim/files/patch-02
@@ -1,16 +1,7 @@
---- configure.orig	Thu Aug 13 12:59:48 1998
-+++ configure	Mon Aug 17 12:12:16 1998
-@@ -1253,7 +1253,7 @@
- if test "$enable_tclinterp" = "yes"; then
- 	
- 	# Extract the first word of "tclsh", so it can be a program name with args.
--set dummy tclsh; ac_word=$2
-+set dummy tclsh8.0; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1259: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
-@@ -2495,7 +2495,7 @@
-   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$GUI_INC_LOC" | sed s/include/lib/` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib $GUI_LIB_LOC"
+--- configure.orig	Thu Mar 11 07:11:42 1999
++++ configure	Mon Mar 22 10:45:57 1999
+@@ -3100,7 +3100,7 @@
+   gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
    GUI_LIB_LOC=
    for try in $gui_libs; do
 -    for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do