[109322] users/larryv/dports/editors/vim
larryv at macports.org
larryv at macports.org
Mon Aug 12 21:47:13 PDT 2013
Revision: 109322
https://trac.macports.org/changeset/109322
Author: larryv at macports.org
Date: 2013-08-12 21:47:13 -0700 (Mon, 12 Aug 2013)
Log Message:
-----------
[users/larryv] vim: Fix configure for Python 3 too.
Also use pythonX.Y-configure for includes, and use a single patch for
both +python2x and +python3x variants.
Modified Paths:
--------------
users/larryv/dports/editors/vim/Portfile
users/larryv/dports/editors/vim/files/patch-python.diff
Removed Paths:
-------------
users/larryv/dports/editors/vim/files/patch-python3.diff
Modified: users/larryv/dports/editors/vim/Portfile
===================================================================
--- users/larryv/dports/editors/vim/Portfile 2013-08-13 03:31:35 UTC (rev 109321)
+++ users/larryv/dports/editors/vim/Portfile 2013-08-13 04:47:13 UTC (rev 109322)
@@ -156,7 +156,7 @@
}
variant python31 conflicts python32 python33 description {Enable Python scripting} {
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.1
- patchfiles-append patch-python3.diff
+ patchfiles-append patch-python.diff
depends_lib-append port:python31
use_autoconf yes
@@ -165,7 +165,7 @@
}
variant python32 conflicts python31 python33 description {Enable Python scripting} {
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.2
- patchfiles-append patch-python3.diff
+ patchfiles-append patch-python.diff
depends_lib-append port:python32
use_autoconf yes
@@ -174,7 +174,7 @@
}
variant python33 conflicts python31 python32 description {Enable Python scripting} {
configure.args-append --enable-python3interp --with-python3=${prefix}/bin/python3.3
- patchfiles-append patch-python3.diff
+ patchfiles-append patch-python.diff
depends_lib-append port:python33
use_autoconf yes
Modified: users/larryv/dports/editors/vim/files/patch-python.diff
===================================================================
--- users/larryv/dports/editors/vim/files/patch-python.diff 2013-08-13 03:31:35 UTC (rev 109321)
+++ users/larryv/dports/editors/vim/files/patch-python.diff 2013-08-13 04:47:13 UTC (rev 109322)
@@ -1,5 +1,5 @@
--- src/configure.in.orig 2013-08-04 14:00:50.000000000 -0400
-+++ src/configure.in 2013-08-12 22:58:33.000000000 -0400
++++ src/configure.in 2013-08-13 00:31:54.000000000 -0400
@@ -965,7 +965,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
@@ -13,7 +13,7 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
-@@ -1049,19 +1053,9 @@
+@@ -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}"
@@ -36,3 +36,51 @@
])
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
+@@ -1162,7 +1152,11 @@
+ AC_MSG_RESULT($enable_python3interp)
+ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
+ dnl -- find the python3 executable
+- AC_PATH_PROGS(vi_cv_path_python3, python3 python)
++ AC_MSG_CHECKING(--with-python3 argument)
++ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
++ python_name="$withval"; AC_MSG_RESULT($python_name),
++ python_name="python3"; AC_MSG_RESULT(no))
++ AC_SUBST(vi_cv_path_python3, $python_name)
+ 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_var_python3_abiflags}"
+- 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"
+
Deleted: users/larryv/dports/editors/vim/files/patch-python3.diff
===================================================================
--- users/larryv/dports/editors/vim/files/patch-python3.diff 2013-08-13 03:31:35 UTC (rev 109321)
+++ users/larryv/dports/editors/vim/files/patch-python3.diff 2013-08-13 04:47:13 UTC (rev 109322)
@@ -1,15 +0,0 @@
---- 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 @@
- AC_MSG_RESULT($enable_python3interp)
- if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
- dnl -- find the python3 executable
-- AC_PATH_PROGS(vi_cv_path_python3, python3 python)
-+ AC_MSG_CHECKING(--with-python3 argument)
-+ AC_ARG_WITH(python3, [ --with-python3=PATH which python to use (default: python3)],
-+ python_name="$withval"; AC_MSG_RESULT($python_name),
-+ python_name="python3"; AC_MSG_RESULT(no))
-+ AC_SUBST(vi_cv_path_python3, $python_name)
- if test "X$vi_cv_path_python3" != "X"; then
-
- dnl -- get its version number
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130812/325e5212/attachment-0001.html>
More information about the macports-changes
mailing list