[111451] trunk/dports/editors/MacVim
raimue at macports.org
raimue at macports.org
Sun Sep 22 13:26:45 PDT 2013
Revision: 111451
https://trac.macports.org/changeset/111451
Author: raimue at macports.org
Date: 2013-09-22 13:26:45 -0700 (Sun, 22 Sep 2013)
Log Message:
-----------
editors/MacVim:
Update to version 7.4.snapshot71
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/MacVim/files/patch-python.diff
trunk/dports/editors/MacVim/files/patch-python3.diff
Removed Paths:
-------------
trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2013-09-22 20:16:29 UTC (rev 111450)
+++ trunk/dports/editors/MacVim/Portfile 2013-09-22 20:26:45 UTC (rev 111451)
@@ -4,11 +4,10 @@
PortGroup compiler_blacklist_versions 1.0
name MacVim
-set vim_version 7.3
-set snapshot 66
+set vim_version 7.4
+set snapshot 71
set gitcommit snapshot-${snapshot}
version ${vim_version}.snapshot${snapshot}
-revision 4
categories editors
platforms darwin
license Vim GPL-2+
@@ -20,15 +19,11 @@
homepage http://code.google.com/p/macvim
master_sites http://github.com/b4winckler/macvim/zipball/${gitcommit}
-checksums rmd160 7837828c4ca5ee4bbbd36be724fc3029de989885 \
- sha256 f8e317393a2cb78e459f8a430d392bcba85b89e19afc5e9692b1b239aee8b8fe
+checksums rmd160 37b601eb9489d90ab92886a53624bd13417f6b16 \
+ sha256 b3d0ff9990d7beac3763107c31f505302c5c7a5abacb15a92eb4485e7efa45e6
use_zip yes
worksrcdir ${name}
-# 7.3.snapshot66 had a stealth update
-dist_subdir ${name}/${version}_1
-
-
depends_build bin:gnutar:gnutar \
bin:grep:grep \
bin:autoconf:autoconf \
@@ -43,7 +38,6 @@
}
patchfiles patch-src-MacVim-icons-python.diff \
- patch-reverse-7.3.245.diff \
patch-MacVim-GCC-VERSION.diff
pre-fetch {
Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff 2013-09-22 20:16:29 UTC (rev 111450)
+++ trunk/dports/editors/MacVim/files/patch-python.diff 2013-09-22 20:26:45 UTC (rev 111451)
@@ -1,10 +1,10 @@
---- src/configure.in.orig 2013-08-04 14:00:50.000000000 -0400
-+++ src/configure.in 2013-08-12 22:03:16.000000000 -0400
+--- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
++++ src/configure.in 2013-09-22 20:28:50.000000000 +0200
@@ -965,7 +965,11 @@
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
dnl -- find the python executable
-- AC_PATH_PROG(vi_cv_path_python, python)
+- AC_PATH_PROGS(vi_cv_path_python, python2 python)
+ AC_MSG_CHECKING(--with-python argument)
+ AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)],
+ python_name="$withval"; AC_MSG_RESULT($python_name),
@@ -40,17 +40,17 @@
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}\\\""
+- 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}\\\""
+- 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 @@
+--- src/if_python.c.orig 2013-09-06 18:00:40.000000000 +0200
++++ src/if_python.c 2013-09-22 22:01:06.000000000 +0200
+@@ -55,11 +55,7 @@
#define PY_SSIZE_T_CLEAN
@@ -59,8 +59,7 @@
-#else
-# include <Python.h>
-#endif
--
+#include <Python.h>
- #if defined(MACOS) && !defined(MACOS_X_UNIX)
- # include "macglue.h"
- # include <CodeFragments.h>
+
+ #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000
+ # undef PY_SSIZE_T_CLEAN
Modified: trunk/dports/editors/MacVim/files/patch-python3.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python3.diff 2013-09-22 20:16:29 UTC (rev 111450)
+++ trunk/dports/editors/MacVim/files/patch-python3.diff 2013-09-22 20:26:45 UTC (rev 111451)
@@ -1,10 +1,10 @@
---- 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 @@
+--- src/configure.in.orig 2013-08-04 20:00:50.000000000 +0200
++++ src/configure.in 2013-09-22 20:35:45.000000000 +0200
+@@ -1162,7 +1162,11 @@
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
dnl -- find the python3 executable
-- AC_PATH_PROG(vi_cv_path_python3, python3)
+- 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),
@@ -13,26 +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"
-
+@@ -1257,8 +1261,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 +1271,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: trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff 2013-09-22 20:16:29 UTC (rev 111450)
+++ trunk/dports/editors/MacVim/files/patch-reverse-7.3.245.diff 2013-09-22 20:26:45 UTC (rev 111451)
@@ -1,35 +0,0 @@
---- 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,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130922/9b912d50/attachment.html>
More information about the macports-changes
mailing list