[101347] trunk/dports/editors/MacVim

raimue at macports.org raimue at macports.org
Wed Jan 9 03:14:07 PST 2013


Revision: 101347
          https://trac.macports.org/changeset/101347
Author:   raimue at macports.org
Date:     2013-01-09 03:14:07 -0800 (Wed, 09 Jan 2013)
Log Message:
-----------
editors/MacVim:
Update to version 7.3.snapshot66, closes #37305
Make +huge the default variant, see #36212

Modified Paths:
--------------
    trunk/dports/editors/MacVim/Portfile
    trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
    trunk/dports/editors/MacVim/files/patch-python.diff

Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile	2013-01-09 11:07:07 UTC (rev 101346)
+++ trunk/dports/editors/MacVim/Portfile	2013-01-09 11:14:07 UTC (rev 101347)
@@ -4,7 +4,7 @@
 
 name                MacVim
 set vim_version     7.3
-set snapshot        65
+set snapshot        66
 set gitcommit       snapshot-${snapshot}
 version             ${vim_version}.snapshot${snapshot}
 revision            1
@@ -19,8 +19,8 @@
 homepage            http://code.google.com/p/macvim
 
 master_sites        http://github.com/b4winckler/macvim/zipball/${gitcommit}
-checksums           rmd160  fa99000846f2eee8fea41093eb74f539ee774607 \
-                    sha256  b926c1c034dcb4e40e2bc70d85e6325f6b4e0ec59ad7a1313e74cb8de2dc59f0
+checksums           rmd160  a5c33364634a349099092cae4b60a115ad94f438 \
+                    sha256  910608b81fbea75495c03472ef2214ed4dd1354279dd7afd9c369a99797332b5
 use_zip             yes
 worksrcdir          ${name}
 
@@ -88,6 +88,8 @@
 
 test.run            yes
 
+default_variants    +huge
+
 variant big description {Build big feature set} conflicts huge {
     configure.args-append --with-features=big
 }

Modified: trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff	2013-01-09 11:07:07 UTC (rev 101346)
+++ trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff	2013-01-09 11:14:07 UTC (rev 101347)
@@ -1,6 +1,6 @@
 --- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig	2011-10-16 16:14:43.000000000 +0200
 +++ src/MacVim/MacVim.xcodeproj/project.pbxproj	2011-10-16 16:14:56.000000000 +0200
-@@ -679,7 +679,7 @@
+@@ -673,7 +673,7 @@
  			isa = XCBuildConfiguration;
  			buildSettings = {
  				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
@@ -9,7 +9,7 @@
  				GCC_WARN_ABOUT_RETURN_TYPE = YES;
  				GCC_WARN_UNUSED_VARIABLE = YES;
  				ONLY_ACTIVE_ARCH = YES;
-@@ -692,7 +692,7 @@
+@@ -686,7 +686,7 @@
  			isa = XCBuildConfiguration;
  			buildSettings = {
  				ARCHS = "$(NATIVE_ARCH_ACTUAL)";

Modified: trunk/dports/editors/MacVim/files/patch-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-python.diff	2013-01-09 11:07:07 UTC (rev 101346)
+++ trunk/dports/editors/MacVim/files/patch-python.diff	2013-01-09 11:14:07 UTC (rev 101347)
@@ -2,7 +2,7 @@
 +++ src/configure.in	2010-08-04 20:34:27.000000000 +0200
 @@ -762,7 +762,11 @@
  AC_MSG_RESULT($enable_pythoninterp)
- if test "$enable_pythoninterp" = "yes"; then
+ if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    dnl -- find the python executable
 -  AC_PATH_PROG(vi_cv_path_python, python)
 +  AC_MSG_CHECKING(--with-python argument)
@@ -20,7 +20,9 @@
 -	    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"
--	    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
 -	      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
@@ -29,18 +31,14 @@
 -	      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//`
--	    fi
-+            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
-+                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}"
-+            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}"
++	    dnl remove -ltermcap, it can conflict with an earlier -lncurses
++	    vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  	])
  
- 	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+ 	if test "X$python_DLLLIBRARY" != "X"; 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 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130109/21b1a77b/attachment.html>


More information about the macports-changes mailing list