From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 19 17:45:06 2007 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDE8716A41B for ; Wed, 19 Dec 2007 17:45:06 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 9908213C46A for ; Wed, 19 Dec 2007 17:45:06 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.1/8.14.1) with ESMTP id lBJH6Aug014847; Wed, 19 Dec 2007 09:06:10 -0800 (PST) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.1/8.14.1/Submit) id lBJH6A9K014846; Wed, 19 Dec 2007 09:06:10 -0800 (PST) (envelope-from obrien) Date: Wed, 19 Dec 2007 09:06:09 -0800 From: "David O'Brien" To: "Mikhail T." Message-ID: <20071219170609.GA8040@dragon.NUXI.org> References: <200706131510.l5DFABn0081368@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706131510.l5DFABn0081368@freefall.freebsd.org> X-Operating-System: FreeBSD 7.0-CURRENT User-Agent: Mutt/1.5.16 (2007-06-09) Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/112347: [PATCH] editors/vim re-enable WITH_TCL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2007 17:45:06 -0000 On Wed, Jun 13, 2007 at 03:10:11PM +0000, Mikhail T. wrote: > P.S. David, you don't seem to be Tcl-enthusiast, would you mind if I > commit this? I plan to add OPTIONS too, to expose the knobs properly... Actually I'm not a TCL anti-enthusiast - I reserve that vile for Perl. :) Mikhail, Can you review this patch? Also, is the change from RM of maze/*.orig to a FIND in the source tree based on extra turds you found, or just being precocious? -- David Index: Makefile =================================================================== RCS file: /home/pcvs/ports/editors/vim/Makefile,v retrieving revision 1.317 diff -u -p -r1.317 Makefile --- Makefile 19 Dec 2007 16:30:28 -0000 1.317 +++ Makefile 19 Dec 2007 17:03:25 -0000 @@ -64,23 +64,24 @@ WITH_EXUBERANT_CTAGS=yes WITH_LANG= yes .endif -.if defined(WITH_PYTHON) -USE_PYTHON= yes -MAKE_ARGS+= CONF_OPT_PYTHON="--enable-pythoninterp" -.endif - -.if defined(WITH_RUBY) -USE_RUBY= yes -MAKE_ARGS+= CONF_OPT_RUBY="--enable-rubyinterp" -.endif +.for i in python ruby tcl perl +. if defined(WITH_${i:U}) +USE_${i:U}= yes +WANT_${i:U}= yes +_i:= $i # work-around a bug in if-handling - can't use $i directly +. if ${_i} == tcl +MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S|${LOCALBASE}/bin/||g}"" +. else +MAKE_ARGS+= CONF_OPT_${i:U}="--enable-$iinterp" +. endif +. else +MAKE_ARGS+= CONF_OPT_${i:U}="--disable-$iinterp" +. endif +.endfor .if defined(WITH_TCL) USE_TCL= 80+ -USE_TCL_NO_THREADS= yes -.endif - -.if defined(WITH_PERL) -WANT_PERL= yes +USE_TCL_NO_THREADS= yes .endif .if !defined(WITHOUT_X11) @@ -106,15 +107,6 @@ MAKE_ARGS+= CONF_OPT_CSCOPE="--enable-cs RUN_DEPENDS+= exctags:${PORTSDIR}/devel/ctags .endif -.if defined(WITH_PERL) -USE_PERL5= yes -MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp" -.endif - -.if defined(WITH_TCL) -MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE}\/bin\///g}"" -.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 @@ -152,11 +144,15 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=n .else # LITE PKGNAMESUFFIX= -lite MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte" -MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp" .endif # LITE .if exists(${PREFIX}/lib/libiconv.so) -USE_ICONV= yes +ICONV_PRESENT= on +.else +ICONV_PRESENT= off +.endif +.if defined(WITH_ICONV) +WITH_ICONV= yes .endif .if defined(WITH_LANG) @@ -198,7 +194,7 @@ pre-configure: # Clean up junk files to keep them from being installed. pre-install: - @${RM} -f ${WRKSRC}/../runtime/macros/maze/*.orig + @${FIND} ${WRKSRC:H} -type f -name '*.orig' -delete post-install: [ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim) Index: options =================================================================== RCS file: /home/pcvs/ports/editors/vim/options,v retrieving revision 1.1 diff -u -p -r1.1 options --- options 16 Sep 2007 02:37:49 -0000 1.1 +++ options 19 Dec 2007 17:03:25 -0000 @@ -7,4 +7,5 @@ OPTIONS= PERL "Enable Perl interpreter" GTK2 "GTK2 GUI" off \ GNOME "Gnome1 GUI" off \ MOTIF "Motif GUI" off \ - XTERM_SAVE "" off + XTERM_SAVE "" off \ + ICONV "Use gettext/iconv for localization" ${ICONV_PRESENT}