From e6ca1f4e0b04fe868e8d83df647f6d3903a46381 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 15 Feb 2001 12:12:43 +0000
Subject: [PATCH] I shouldn't have been removing `gvim' from the non-GUI PLIST.
 Also make the gvim link relative rather than absolute, in case someone
 specifies a different prefix when installing the package.  Note there are
 some burned in paths in the vim binary, but there is no reason to totally
 make this not work, when it could somewhat.

---
 editors/vim/Makefile  | 6 +-----
 editors/vim5/Makefile | 4 +---
 editors/vim6/Makefile | 6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 77e0d1fd9374..3483f05c4ce5 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -67,18 +67,14 @@ MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tc
 .endif
 
 .else	# LITE
-PLIST=		${WRKDIR}/PLIST.nogui
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp"
 .endif	# LITE
 
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} distclean)
-	@${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui
 
 post-install:
-.if !defined(LITE)
-	[ -e ${PREFIX}/bin/gvim ] || ${LN} -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
-.endif
+	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -s vim gvim)
 
 .include <bsd.port.post.mk>
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 0a838cf723af..b292cb87e7b7 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -67,17 +67,15 @@ MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tc
 .endif
 
 .else	# LITE
-PLIST=		${WRKDIR}/PLIST.nogui
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp"
 .endif	# LITE
 
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} distclean)
-	@${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui
 
 post-install:
-	[ -e ${PREFIX}/bin/gvim ] || ${LN} -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
+	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -s vim gvim)
 	@${RM} -f ${PREFIX}/man/man1/etags.1
 	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
 
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 77e0d1fd9374..3483f05c4ce5 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -67,18 +67,14 @@ MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tc
 .endif
 
 .else	# LITE
-PLIST=		${WRKDIR}/PLIST.nogui
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp"
 .endif	# LITE
 
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} distclean)
-	@${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui
 
 post-install:
-.if !defined(LITE)
-	[ -e ${PREFIX}/bin/gvim ] || ${LN} -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
-.endif
+	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -s vim gvim)
 
 .include <bsd.port.post.mk>