Treat the manpage links the same as we do the binary links.

Submitted by:	reg

3 files changed, 129 insertions, 21 deletions

diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index 012c17dd8c42..a3ef884ab8ce 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,14 +1,14 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Jan 16 06:03:04 2000
++++ Makefile	Sat May  6 13:04:12 2000
+@@ -302,6 +302,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
 +CONF_ARGS = --prefix=$(PREFIX)
  
- # GUI - For creating Vim with GUI (gvim)
- # Uncomment the first line when you don't want to get the GUI version,
-@@ -1167,28 +1168,28 @@
+ # GUI - For creating Vim with GUI (gvim) (B)
+ # Uncomment this line when you don't want to get the GUI version, although you
+@@ -1444,56 +1445,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -43,5 +43,41 @@
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
  
- # create links for the manual pages with various names to vim.  This is only
+ # 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)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ 
+ $(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(MANSUBDIR)/$(GVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(BINDIR)/$(VIMTARGET)
diff --git a/editors/vim5/files/patch-01 b/editors/vim5/files/patch-01
index 012c17dd8c42..a3ef884ab8ce 100644
--- a/editors/vim5/files/patch-01
+++ b/editors/vim5/files/patch-01
@@ -1,14 +1,14 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Jan 16 06:03:04 2000
++++ Makefile	Sat May  6 13:04:12 2000
+@@ -302,6 +302,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
 +CONF_ARGS = --prefix=$(PREFIX)
  
- # GUI - For creating Vim with GUI (gvim)
- # Uncomment the first line when you don't want to get the GUI version,
-@@ -1167,28 +1168,28 @@
+ # GUI - For creating Vim with GUI (gvim) (B)
+ # Uncomment this line when you don't want to get the GUI version, although you
+@@ -1444,56 +1445,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -43,5 +43,41 @@
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
  
- # create links for the manual pages with various names to vim.  This is only
+ # 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)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ 
+ $(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(MANSUBDIR)/$(GVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(BINDIR)/$(VIMTARGET)
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
index 012c17dd8c42..a3ef884ab8ce 100644
--- a/editors/vim6/files/patch-01
+++ b/editors/vim6/files/patch-01
@@ -1,14 +1,14 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Jan 16 06:03:04 2000
++++ Makefile	Sat May  6 13:04:12 2000
+@@ -302,6 +302,7 @@
  
  # just an example:
  #CONF_ARGS = --exec-prefix=/usr
 +CONF_ARGS = --prefix=$(PREFIX)
  
- # GUI - For creating Vim with GUI (gvim)
- # Uncomment the first line when you don't want to get the GUI version,
-@@ -1167,28 +1168,28 @@
+ # GUI - For creating Vim with GUI (gvim) (B)
+ # Uncomment this line when you don't want to get the GUI version, although you
+@@ -1444,56 +1445,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -43,5 +43,41 @@
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
  
- # create links for the manual pages with various names to vim.  This is only
+ # 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)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ 
+ $(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(MANSUBDIR)/$(GVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(BINDIR)/$(VIMTARGET)