From 874cf5a8f25df0b59f5650b753967a7b29659781 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 19 Dec 2007 16:30:28 +0000
Subject: Re-enable WITH_TCL. + fixed TCL_DEFS processing in patch-configure +
 re-enabled Tcl support (using new bsd.tcl.mk) + supports Tcl 80, 82, 83, 84,
 85 (WITH_TCL_VER=8x or VIM_WITH_TCL_VER=8x) + no support for threaded Tcl yet
 (because of the way how vim's configure   searches for Tcl, this needs more
 modifications)

PR:		112347
Submitted by:	mm
---
 editors/vim/Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'editors/vim/Makefile')

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 0c24e44d287c..9443b06dcf68 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -56,7 +56,7 @@ MANLANG=	"" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
 		fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
-#WITH_TCL=	yes
+WITH_TCL=	yes
 WITH_PERL=	yes
 WITH_PYTHON=	yes
 WITH_CSCOPE=	yes
@@ -64,10 +64,6 @@ WITH_EXUBERANT_CTAGS=yes
 WITH_LANG=	yes
 .endif
 
-.if defined(WITH_TCL)
-BROKEN=		Does not compile
-.endif
-
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
 MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp"
@@ -78,6 +74,11 @@ USE_RUBY=	yes
 MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
 .endif
 
+.if defined(WITH_TCL)
+USE_TCL=	80+
+USE_TCL_NO_THREADS=	yes
+.endif
+
 .if defined(WITH_PERL)
 WANT_PERL=	yes
 .endif
@@ -111,9 +112,7 @@ MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp"
 .endif
 
 .if defined(WITH_TCL)
-BUILD_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp"
+MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE}\/bin\///g}""
 .endif
 
 .if !defined(WITHOUT_X11)
-- 
cgit v1.2.3