[136909] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Fri May 29 13:48:46 PDT 2015
Revision: 136909
https://trac.macports.org/changeset/136909
Author: raimue at macports.org
Date: 2015-05-29 13:48:45 -0700 (Fri, 29 May 2015)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Link correct python library when using +python2x and +python3y at the same time, see #41344
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
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
@@ -7,6 +7,7 @@
set vim_version 7.4
set snapshot 76
version ${vim_version}.snapshot${snapshot}
+revision 1
categories editors
platforms darwin
license Vim GPL-2+
Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -1,5 +1,5 @@
---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
@@ -1046,7 +1046,11 @@
fi
@@ -13,6 +13,15 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
@@ -1133,13 +1137,6 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -13,3 +13,12 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
@@ -6,6 +6,7 @@
set vim_version 7.4
set vim_patchlevel 729
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
platforms darwin freebsd
license Vim GPL-2+
Modified: trunk/dports/editors/vim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -1,5 +1,5 @@
---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
@@ -1046,7 +1046,11 @@
fi
@@ -13,6 +13,15 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
@@ -1133,13 +1137,6 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Modified: trunk/dports/editors/vim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -13,3 +13,12 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/Portfile 2015-05-29 20:48:45 UTC (rev 136909)
@@ -7,6 +7,7 @@
set vim_version 7.4
set vim_patchlevel 729
version ${vim_version}.${vim_patchlevel}
+revision 1
categories editors
platforms darwin
license Vim GPL-2+
Modified: trunk/dports/editors/vim-app/files/patch-python.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/files/patch-python.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -1,5 +1,5 @@
---- src/configure.in.orig 2015-05-29 20:42:01.000000000 +0200
-+++ src/configure.in 2015-05-29 20:53:32.000000000 +0200
+--- configure.in.orig 2015-05-29 22:32:15.000000000 +0200
++++ /opt/local/var/macports/build/_Users_raimue_src_macports_trunk_dports_editors_vim/vim/work/vim74/src/configure.in 2015-05-29 22:34:23.000000000 +0200
@@ -1046,7 +1046,11 @@
fi
@@ -13,6 +13,15 @@
if test "X$vi_cv_path_python" != "X"; then
dnl -- get its version number
+@@ -1125,7 +1129,7 @@
+ @echo "python_SYSLIBS='$(SYSLIBS)'"
+ @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+ @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python_INSTSONAME='$(INSTSONAME)'"
++ @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
+ @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
+ @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
@@ -1133,13 +1137,6 @@
dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Modified: trunk/dports/editors/vim-app/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-python3.diff 2015-05-29 20:11:30 UTC (rev 136908)
+++ trunk/dports/editors/vim-app/files/patch-python3.diff 2015-05-29 20:48:45 UTC (rev 136909)
@@ -13,3 +13,12 @@
if test "X$vi_cv_path_python3" != "X"; then
dnl -- get its version number
+@@ -1367,7 +1363,7 @@
+ @echo "python3_LIBS='$(LIBS)'"
+ @echo "python3_SYSLIBS='$(SYSLIBS)'"
+ @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+- @echo "python3_INSTSONAME='$(INSTSONAME)'"
++ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
+ dnl -- delete the lines from make about Entering/Leaving directory
+ eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150529/2d5e56e0/attachment-0001.html>
More information about the macports-changes
mailing list