ports/112347: [PATCH] editors/vim re-enable WITH_TCL

[Martin Matuska]

>Number:         112347
>Category:       ports
>Synopsis:       [PATCH] editors/vim re-enable WITH_TCL
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 02 10:40:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE i386 amd64
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE i386 amd64
>Description:
- 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)

Tinderbox output for 5.5-R, 6.2-R and 7-C i386 and amd64:

http://i386.vx.sk/logs/6.2-FreeBSD-i386/vim-7.0.224_1.log
http://i386.vx.sk/logs/7-FreeBSD-i386/vim-7.0.224_1.log
http://i386.vx.sk/logs/5.5-FreeBSD-i386/vim-7.0.224_1.log

http://amd64.vx.sk/logs/6.2-FreeBSD-amd64/vim-7.0.224_1.log
http://amd64.vx.sk/logs/7-FreeBSD-amd64/vim-7.0.224_1.log
http://amd64.vx.sk/logs/5.5-FreeBSD-amd64/vim-7.0.224_1.log

If commited, please close these related PR's:
ports/103844
ports/99678

>How-To-Repeat:
>Fix:
Index: ports/editors/vim/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/vim/Makefile,v
retrieving revision 1.296
diff -u -r1.296 Makefile
--- ports/editors/vim/Makefile	18 Apr 2007 05:20:21 -0000	1.296
+++ ports/editors/vim/Makefile	2 May 2007 10:26:41 -0000
@@ -10,7 +10,7 @@
 PATCHLEVEL=	224
 PORTVERSION=	7.0.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
@@ -30,17 +30,13 @@
 SLAVEDIRS=	editors/vim-lite
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
-#WITH_TCL=	yes
+WITH_TCL=	yes
 WITH_PERL=	yes
 WITH_PYTHON=	yes
 WITH_CSCOPE=	yes
 WITH_EXUBERANT_CTAGS=yes
 .endif
 
-.if defined(WITH_TCL)
-BROKEN=		Does not compile
-.endif
-
 USE_BZIP2=	yes
 DIST_SUBDIR=	vim
 WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
@@ -74,8 +70,17 @@
 MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
 .endif
 
+.if defined(WITH_TCL)
+USE_TCL=	80+
+USE_TCL_NO_THREADS=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_TCL)
+MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE}\/bin\///g}""
+.endif
+
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
@@ -98,12 +103,6 @@
 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"
-.endif
-
 .if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
 #	will be reviewed when the GTK+ 1.{3,4} behemoth is released
Index: ports/editors/vim/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/editors/vim/files/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- ports/editors/vim/files/patch-configure	26 Jun 2006 18:21:39 -0000	1.3
+++ ports/editors/vim/files/patch-configure	2 May 2007 10:26:41 -0000
@@ -3,6 +3,6 @@
 @@ -4644,3 +4644,4 @@ echo "${ECHO_T}$try/tclConfig.sh" >&6
  	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
 -	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
-+	    	    	    TCL_DEFS=`echo $TCL_DEFS |       tr ' ' '\012' | sed -e 's/\\\\ /\\\\X/g' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
++	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\ /g'`
 +
  	    break
>Release-Note:
>Audit-Trail:
>Unformatted: