[110123] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Mon Aug 26 10:36:10 PDT 2013
Revision: 110123
https://trac.macports.org/changeset/110123
Author: raimue at macports.org
Date: 2013-08-26 10:36:09 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Fix linking with +python27, which failed silently before, closes #39207.
Also ensure we are always using the correct tclsh binary.
Thanks to larryv@ for the patches.
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/MacVim/files/patch-python.diff
trunk/dports/editors/MacVim/files/patch-python3.diff
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim/files/patch-python.diff
trunk/dports/editors/vim/files/patch-python3.diff
trunk/dports/editors/vim-app/Portfile
trunk/dports/editors/vim-app/files/patch-python.diff
trunk/dports/editors/vim-app/files/patch-python3.diff
Property Changed:
----------------
trunk/dports/editors/vim/
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/MacVim/Portfile 2013-08-26 17:36:09 UTC (rev 110123)
@@ -7,7 +7,7 @@
set snapshot 66
set gitcommit snapshot-${snapshot}
version ${vim_version}.snapshot${snapshot}
-revision 3
+revision 4
categories editors
platforms darwin
license Vim GPL-2+
@@ -173,7 +173,8 @@
depends_lib-append port:ruby19
}
variant tcl description {Enable Tcl scripting} {
- configure.args-append --enable-tclinterp
+ configure.args-append --enable-tclinterp \
+ --with-tclsh=${prefix}/bin/tclsh
patchfiles-append patch-tcl.diff
depends_lib-append port:tcl
Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.orig 2010-08-04 20:32:32.000000000 +0200
-+++ src/configure.in 2010-08-04 20:34:27.000000000 +0200
-@@ -762,7 +762,11 @@
+--- src/configure.in.orig 2013-08-04 14:00:50.000000000 -0400
++++ src/configure.in 2013-08-12 22:03:16.000000000 -0400
+@@ -965,7 +965,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
dnl -- find the python executable
@@ -13,16 +13,14 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -840,19 +844,14 @@
+@@ -1049,30 +1053,16 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
-+ if test "${vi_cv_var_python_version}" = "1.4"; then
-+ vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
+- else
- if test "${vi_cv_var_python_version}" = "1.4"; then
- vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
@@ -31,14 +29,25 @@
- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
- dnl remove -ltermcap, it can conflict with an earlier -lncurses
- vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
-+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
- fi
-+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- fi
++ vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
])
if test "X$python_DLLLIBRARY" != "X"; then
+ python_INSTSONAME="$python_DLLLIBRARY"
+ fi
+ PYTHON_LIBS="${vi_cv_path_python_plibs}"
+- if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- else
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- fi
++ PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
+ PYTHON_SRC="if_python.c"
+ PYTHON_OBJ="objects/if_python.o"
+ if test "${vi_cv_var_python_version}" = "1.4"; then
--- src/if_python.c.orig 2012-09-12 12:42:42.000000000 +0200
+++ src/if_python.c 2012-09-12 12:45:22.000000000 +0200
@@ -46,12 +46,7 @@
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
-+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
-@@ -949,7 +949,11 @@
+--- src/configure.in.orig 2013-01-08 12:40:52.000000000 +0100
++++ src/configure.in 2013-01-08 12:43:26.000000000 +0100
+@@ -1162,7 +1152,11 @@
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
@@ -13,3 +13,26 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1257,8 +1251,7 @@
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
+- vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
++ vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
+@@ -1268,11 +1261,7 @@
+ python3_INSTSONAME="$python3_DLLLIBRARY"
+ fi
+ PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+- if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- else
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- fi
++ PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
+ PYTHON3_SRC="if_python3.c"
+ PYTHON3_OBJ="objects/if_python3.o"
+
Property changes on: trunk/dports/editors/vim
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/editors/vim:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/larryv/dports/editors/vim:109318-109322
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim/Portfile 2013-08-26 17:36:09 UTC (rev 110123)
@@ -6,7 +6,7 @@
set vim_version 7.3
set vim_patchlevel 762
version ${vim_version}.${vim_patchlevel}
-revision 2
+revision 3
categories editors
platforms darwin freebsd
license Vim GPL-2+
@@ -975,7 +975,8 @@
depends_lib-append port:ruby19
}
variant tcl description {Enable Tcl scripting} {
- configure.args-append --enable-tclinterp
+ configure.args-append --enable-tclinterp \
+ --with-tclsh=${prefix}/bin/tclsh
patchfiles-append patch-tcl.diff
depends_lib-append port:tcl
Modified: trunk/dports/editors/vim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim/files/patch-python.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.orig 2013-01-08 12:40:52.000000000 +0100
-+++ src/configure.in 2013-01-08 12:43:26.000000000 +0100
-@@ -838,7 +838,11 @@
+--- src/configure.in.orig 2013-08-04 14:00:50.000000000 -0400
++++ src/configure.in 2013-08-12 22:03:16.000000000 -0400
+@@ -965,7 +965,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
dnl -- find the python executable
@@ -13,16 +13,14 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -917,19 +921,14 @@
+@@ -1049,30 +1053,16 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
-+ if test "${vi_cv_var_python_version}" = "1.4"; then
-+ vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
+- else
- if test "${vi_cv_var_python_version}" = "1.4"; then
- vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
@@ -31,11 +29,22 @@
- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
- dnl remove -ltermcap, it can conflict with an earlier -lncurses
- vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
-+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
- fi
-+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- fi
++ vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
])
if test "X$python_DLLLIBRARY" != "X"; then
+ python_INSTSONAME="$python_DLLLIBRARY"
+ fi
+ PYTHON_LIBS="${vi_cv_path_python_plibs}"
+- if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- else
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- fi
++ PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
+ PYTHON_SRC="if_python.c"
+ PYTHON_OBJ="objects/if_python.o"
+ if test "${vi_cv_var_python_version}" = "1.4"; then
Modified: trunk/dports/editors/vim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python3.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
-+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
-@@ -1024,7 +1024,11 @@
+--- src/configure.in.orig 2013-01-08 12:40:52.000000000 +0100
++++ src/configure.in 2013-01-08 12:43:26.000000000 +0100
+@@ -1162,7 +1152,11 @@
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
@@ -13,3 +13,26 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1257,8 +1251,7 @@
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
+- vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
++ vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
+@@ -1268,11 +1261,7 @@
+ python3_INSTSONAME="$python3_DLLLIBRARY"
+ fi
+ PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+- if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- else
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- fi
++ PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
+ PYTHON3_SRC="if_python3.c"
+ PYTHON3_OBJ="objects/if_python3.o"
+
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim-app/Portfile 2013-08-26 17:36:09 UTC (rev 110123)
@@ -7,7 +7,7 @@
set vim_version 7.3
set vim_patchlevel 762
version ${vim_version}.${vim_patchlevel}
-revision 2
+revision 3
categories editors
platforms darwin
license Vim GPL-2+
@@ -840,12 +840,12 @@
port:gettext \
port:libiconv
-pre-fetch {
- if {${os.platform} == "darwin" && ${os.major} >= 10} {
- ui_error "${name} does not run on Mac OS X 10.6 or greater. Please use MacVim instead."
- return -code error "incompatible Mac OS X version"
- }
-}
+#pre-fetch {
+# if {${os.platform} == "darwin" && ${os.major} >= 10} {
+# ui_error "${name} does not run on Mac OS X 10.6 or greater. Please use MacVim instead."
+# return -code error "incompatible Mac OS X version"
+# }
+#}
autoconf.cmd make autoconf
autoconf.dir ${worksrcpath}/src
@@ -994,7 +994,8 @@
depends_lib-append port:ruby19
}
variant tcl description {Enable Tcl scripting} {
- configure.args-append --enable-tclinterp
+ configure.args-append --enable-tclinterp \
+ --with-tclsh=${prefix}/bin/tclsh
patchfiles-append patch-tcl.diff
depends_lib-append port:tcl
Modified: trunk/dports/editors/vim-app/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim-app/files/patch-python.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.orig 2013-01-08 12:40:52.000000000 +0100
-+++ src/configure.in 2013-01-08 12:43:26.000000000 +0100
-@@ -838,7 +838,11 @@
+--- src/configure.in.orig 2013-08-04 14:00:50.000000000 -0400
++++ src/configure.in 2013-08-12 22:03:16.000000000 -0400
+@@ -965,7 +965,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
dnl -- find the python executable
@@ -13,16 +13,14 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -917,19 +921,14 @@
+@@ -1049,30 +1053,16 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
- vi_cv_path_python_plibs="-framework Python"
-+ if test "${vi_cv_var_python_version}" = "1.4"; then
-+ vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
+- else
- if test "${vi_cv_var_python_version}" = "1.4"; then
- vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
- else
@@ -31,11 +29,22 @@
- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
- dnl remove -ltermcap, it can conflict with an earlier -lncurses
- vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
-+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
- fi
-+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+- fi
++ vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
])
if test "X$python_DLLLIBRARY" != "X"; then
+ python_INSTSONAME="$python_DLLLIBRARY"
+ fi
+ PYTHON_LIBS="${vi_cv_path_python_plibs}"
+- if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- else
+- PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
+- fi
++ PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
+ PYTHON_SRC="if_python.c"
+ PYTHON_OBJ="objects/if_python.o"
+ if test "${vi_cv_var_python_version}" = "1.4"; then
Modified: trunk/dports/editors/vim-app/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python3.diff 2013-08-26 16:55:59 UTC (rev 110122)
+++ trunk/dports/editors/vim-app/files/patch-python3.diff 2013-08-26 17:36:09 UTC (rev 110123)
@@ -1,6 +1,6 @@
---- src/configure.in.old 2008-12-07 02:58:32.000000000 +0100
-+++ src/configure.in 2008-12-07 02:58:58.000000000 +0100
-@@ -1024,7 +1024,11 @@
+--- src/configure.in.orig 2013-01-08 12:40:52.000000000 +0100
++++ src/configure.in 2013-01-08 12:43:26.000000000 +0100
+@@ -1162,7 +1152,11 @@
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
@@ -13,3 +13,26 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1257,8 +1251,7 @@
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ rm -f -- "${tmp_mkf}"
+- vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
+- vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
++ vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
+ dnl remove -ltermcap, it can conflict with an earlier -lncurses
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
+ vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
+@@ -1268,11 +1261,7 @@
+ python3_INSTSONAME="$python3_DLLLIBRARY"
+ fi
+ PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+- if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- else
+- PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
+- fi
++ PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
+ PYTHON3_SRC="if_python3.c"
+ PYTHON3_OBJ="objects/if_python3.o"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/29cb9ed4/attachment-0001.html>
More information about the macports-changes
mailing list