[66594] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Sat Apr 17 16:51:48 PDT 2010
Revision: 66594
http://trac.macports.org/changeset/66594
Author: raimue at macports.org
Date: 2010-04-17 16:51:42 -0700 (Sat, 17 Apr 2010)
Log Message:
-----------
editors/vim, editors/vim-app:
Ensure we are always using tclsh from MacPorts
Modified Paths:
--------------
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim-app/Portfile
Added Paths:
-----------
trunk/dports/editors/vim/files/patch-tcl.diff
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2010-04-17 22:54:40 UTC (rev 66593)
+++ trunk/dports/editors/vim/Portfile 2010-04-17 23:51:42 UTC (rev 66594)
@@ -6,6 +6,7 @@
set vim_version 7.2
set vim_patchlevel 411
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
maintainers raimue
description Vi \"workalike\" with many additional features
@@ -157,7 +158,12 @@
}
variant tcl description {Enable Tcl scripting} {
configure.args-append --enable-tclinterp
+ patchfiles-append patch-tcl.diff
depends_lib-append port:tcl
+
+ use_autoconf yes
+ # Overwriting autoconf.cmd above removes dependency, add it again
+ depends_build-append port:autoconf
}
variant cscope description {Enable source code browsing with cscope} {
Added: trunk/dports/editors/vim/files/patch-tcl.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-tcl.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-tcl.diff 2010-04-17 23:51:42 UTC (rev 66594)
@@ -0,0 +1,32 @@
+--- src/configure.in.orig 2010-04-18 00:11:11.000000000 +0200
++++ src/configure.in 2010-04-18 00:17:10.000000000 +0200
+@@ -875,12 +875,7 @@
+ tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
+
+ AC_MSG_CHECKING(for location of Tcl include)
+- if test "x$MACOSX" != "xyes"; then
+- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
+- else
+- dnl For Mac OS X 10.3, use the OS-provided framework location
+- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
+- fi
++ tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver"
+ TCL_INC=
+ for try in $tclinc; do
+ if test -f "$try/tcl.h"; then
+@@ -895,13 +890,8 @@
+ fi
+ if test -z "$SKIP_TCL"; then
+ AC_MSG_CHECKING(for location of tclConfig.sh script)
+- if test "x$MACOSX" != "xyes"; then
+- tclcnf=`echo $tclinc | sed s/include/lib/g`
+- tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
+- else
+- dnl For Mac OS X 10.3, use the OS-provided framework location
+- tclcnf="/System/Library/Frameworks/Tcl.framework"
+- fi
++ tclcnf=`echo $tclinc | sed s/include/lib/g`
++ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
+ for try in $tclcnf; do
+ if test -f $try/tclConfig.sh; then
+ AC_MSG_RESULT($try/tclConfig.sh)
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2010-04-17 22:54:40 UTC (rev 66593)
+++ trunk/dports/editors/vim-app/Portfile 2010-04-17 23:51:42 UTC (rev 66594)
@@ -7,6 +7,7 @@
set vim_version 7.2
set vim_patchlevel 411
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
maintainers raimue
description Vim.app is a GUI version of the famous editor vim.
@@ -170,7 +171,12 @@
}
variant tcl description {Enable Tcl scripting} {
configure.args-append --enable-tclinterp
+ patchfiles-append patch-tcl.diff
depends_lib-append port:tcl
+
+ use_autoconf yes
+ # Overwriting autoconf.cmd above removes dependency, add it again
+ depends_build-append port:autoconf
}
variant cscope description {Enable source code browsing with cscope} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100417/2857c704/attachment.html>
More information about the macports-changes
mailing list