Revision: 83186 http://trac.macports.org/changeset/83186 Author: raimue@macports.org Date: 2011-08-27 09:07:44 -0700 (Sat, 27 Aug 2011) Log Message: ----------- editors/MacVim: Fix +python32 variant by reverting patch 7.3.245. Modified Paths: -------------- trunk/dports/editors/MacVim/Portfile Added Paths: ----------- trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff Modified: trunk/dports/editors/MacVim/Portfile =================================================================== --- trunk/dports/editors/MacVim/Portfile 2011-08-27 14:44:45 UTC (rev 83185) +++ trunk/dports/editors/MacVim/Portfile 2011-08-27 16:07:44 UTC (rev 83186) @@ -7,7 +7,7 @@ set snapshot 61 set gitcommit snapshot-${snapshot} version ${vim_version}.snapshot${snapshot} -revision 1 +revision 2 categories editors platforms darwin license VimLicense GPL-2+ @@ -34,7 +34,8 @@ port:ctags patchfiles patch-src-MacVim-icons-python.diff \ - patch-MMFullScreenWindow-case-sensitive.diff + patch-MMFullScreenWindow-case-sensitive.diff \ + patch-reverse-7.3.245.diff pre-fetch { if {${os.platform} == "darwin" && ${os.major} < 10} { Added: trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff =================================================================== --- trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff (rev 0) +++ trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff 2011-08-27 16:07:44 UTC (rev 83186) @@ -0,0 +1,35 @@ +--- src/auto/configure 2011-08-27 17:04:19.000000000 +0200 ++++ src/auto/configure 2011-08-27 17:07:16.000000000 +0200 +@@ -5814,7 +5814,7 @@ + eof + 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="-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=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` +diff -ur MacVim.orig/src/configure.in MacVim/src/configure.in +--- src/configure.in 2011-08-27 17:04:19.000000000 +0200 ++++ src/configure.in 2011-08-27 17:08:17.000000000 +0200 +@@ -1100,7 +1100,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="-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}" + dnl remove -ltermcap, it can conflict with an earlier -lncurses + vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` +diff -ur MacVim.orig/src/version.c MacVim/src/version.c +--- src/version.c 2011-08-27 17:04:27.000000000 +0200 ++++ src/version.c 2011-08-27 17:08:34.000000000 +0200 +@@ -755,8 +755,6 @@ + /**/ + 246, + /**/ +- 245, +-/**/ + 244, + /**/ + 243,