Use "MLINK"s rather than let Vim's Makefile do the manpage linking.

This fixes the problem that many of Vim's manpages pointed to nowhere.

9 files changed, 129 insertions, 18 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 114a73900586..6149d24137d7 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.33 1998/12/02 12:40:59 obrien Exp $
+# $Id: Makefile,v 1.34 1999/03/11 21:47:11 scrappy Exp $
 #
 
 DISTNAME=	vim-5.3
@@ -35,6 +35,8 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --enable-max-features --with-tlib=termlib" -f
 ALL_TARGET=	#
 MAN1=		vim.1 xxd.1 ectags.1
+MLINKS=		vim.1 gvim.1   vim.1 gview.1  \
+		vim.1 rgvim.1  vim.1 rgview.1  vim.1 rvim.1  vim.1 rview.1
 
 
 .if defined(HAVE_MOTIF)
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index 012c17dd8c42..a6e8a32da5bd 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Aug 30 09:16:50 1998
++++ Makefile	Mon Mar 15 01:55:08 1999
+@@ -260,6 +260,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,
-@@ -1167,28 +1168,28 @@
+@@ -1172,56 +1173,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,3 +45,39 @@
  
  # 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/pkg-plist b/editors/vim/pkg-plist
index 6b677d31dd3f..37354ebc94a1 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -11,7 +11,6 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-man/man1/etags.1.gz
 share/vim/doc/autocmd.txt
 share/vim/doc/change.txt
 share/vim/doc/cmdline.txt
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 114a73900586..6149d24137d7 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.33 1998/12/02 12:40:59 obrien Exp $
+# $Id: Makefile,v 1.34 1999/03/11 21:47:11 scrappy Exp $
 #
 
 DISTNAME=	vim-5.3
@@ -35,6 +35,8 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --enable-max-features --with-tlib=termlib" -f
 ALL_TARGET=	#
 MAN1=		vim.1 xxd.1 ectags.1
+MLINKS=		vim.1 gvim.1   vim.1 gview.1  \
+		vim.1 rgvim.1  vim.1 rgview.1  vim.1 rvim.1  vim.1 rview.1
 
 
 .if defined(HAVE_MOTIF)
diff --git a/editors/vim5/files/patch-01 b/editors/vim5/files/patch-01
index 012c17dd8c42..a6e8a32da5bd 100644
--- a/editors/vim5/files/patch-01
+++ b/editors/vim5/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Aug 30 09:16:50 1998
++++ Makefile	Mon Mar 15 01:55:08 1999
+@@ -260,6 +260,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,
-@@ -1167,28 +1168,28 @@
+@@ -1172,56 +1173,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,3 +45,39 @@
  
  # 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/vim5/pkg-plist b/editors/vim5/pkg-plist
index 6b677d31dd3f..37354ebc94a1 100644
--- a/editors/vim5/pkg-plist
+++ b/editors/vim5/pkg-plist
@@ -11,7 +11,6 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-man/man1/etags.1.gz
 share/vim/doc/autocmd.txt
 share/vim/doc/change.txt
 share/vim/doc/cmdline.txt
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 114a73900586..6149d24137d7 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.33 1998/12/02 12:40:59 obrien Exp $
+# $Id: Makefile,v 1.34 1999/03/11 21:47:11 scrappy Exp $
 #
 
 DISTNAME=	vim-5.3
@@ -35,6 +35,8 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --enable-max-features --with-tlib=termlib" -f
 ALL_TARGET=	#
 MAN1=		vim.1 xxd.1 ectags.1
+MLINKS=		vim.1 gvim.1   vim.1 gview.1  \
+		vim.1 rgvim.1  vim.1 rgview.1  vim.1 rvim.1  vim.1 rview.1
 
 
 .if defined(HAVE_MOTIF)
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
index 012c17dd8c42..a6e8a32da5bd 100644
--- a/editors/vim6/files/patch-01
+++ b/editors/vim6/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Aug 16 12:24:56 1998
-+++ Makefile	Mon Aug 17 12:08:56 1998
-@@ -257,6 +257,7 @@
+--- Makefile.orig	Sun Aug 30 09:16:50 1998
++++ Makefile	Mon Mar 15 01:55:08 1999
+@@ -260,6 +260,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,
-@@ -1167,28 +1168,28 @@
+@@ -1172,56 +1173,56 @@
  installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -45,3 +45,39 @@
  
  # 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/vim6/pkg-plist b/editors/vim6/pkg-plist
index 6b677d31dd3f..37354ebc94a1 100644
--- a/editors/vim6/pkg-plist
+++ b/editors/vim6/pkg-plist
@@ -11,7 +11,6 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-man/man1/etags.1.gz
 share/vim/doc/autocmd.txt
 share/vim/doc/change.txt
 share/vim/doc/cmdline.txt