<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/57b6722817c64724abf70ed062a049516e33cc8b">https://github.com/macports/macports-ports/commit/57b6722817c64724abf70ed062a049516e33cc8b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 57b6722817c64724abf70ed062a049516e33cc8b
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Fri Dec 28 15:15:57 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> MacVim: Update to version 8.1.snapshot153
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://github.com/macports/macports-ports/pull/3157
</span>---
editors/MacVim/Portfile | 11 +++++------
editors/MacVim/files/patch-MacVim-GCC-VERSION.diff | 4 ++--
.../MacVim/files/patch-remove-Homebrew-python.diff | 10 +++++++++-
editors/MacVim/files/patch-remove-sparkle.diff | 20 +++++++++++---------
4 files changed, 27 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0b4413..d606b47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,10 @@ PortGroup github 1.0
</span> PortGroup compiler_blacklist_versions 1.0
set vim_version 8.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set snapshot 151
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot 153
</span> github.setup macvim-dev macvim ${snapshot} snapshot-
name MacVim
version ${vim_version}.snapshot${snapshot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories editors
platforms darwin
license Vim GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +18,10 @@ long_description \
</span> integrate seamlessly with the native user interface.
homepage https://macvim-dev.github.io/macvim/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0298a22f02d406d35deb73964ac8d5e8a0914cc7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 58cc94b31d4a4c6a5e925f55def146d553547c03589148e6a041309209104bde \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20133403
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 aaa534532c11d211d83612d77e7afefe88bff77a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 857fcc96e9e8042c8610a1f97a2a6c0ea1d10a892e781a0b47174e90817326f0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20250777
</span>
depends_lib port:ncurses \
port:gettext \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff b/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ad34c63..03ba9ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig 2015-12-09 18:06:35.000000000 +0100
+++ src/MacVim/MacVim.xcodeproj/project.pbxproj 2015-12-09 18:06:38.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -676,7 +676,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,7 +777,7 @@
</span> isa = XCBuildConfiguration;
buildSettings = {
ENABLE_TESTABILITY = YES;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -688,7 +688,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,7 +777,7 @@
</span> C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-Homebrew-python.diff b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c3de462..2c4631b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span>
--- src/MacVim/vimrc
+++ src/MacVim/vimrc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,25 +13,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,41 +13,3 @@
</span> " the entire MacVim menu is set up in a nib file which currently only is
" translated to English).
set langmenu=none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,14 @@ Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly)
</span> - " Homebrew python 2.7
- set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python
- set pythonhome=/usr/local/Frameworks/Python.framework/Versions/2.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonhome=/opt/local/Library/Frameworks/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " https://www.python.org/downloads/mac-osx/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonhome=/Library/Frameworks/Python.framework/Versions/2.7
</span> - endif
-endif
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-sparkle.diff b/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 01cea57..57eab2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/English.lproj/Preferences.nib/designable.nib 2016-08-26 12:38:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/English.lproj/Preferences.nib/designable.nib 2016-08-26 12:42:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,26 +73,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/English.lproj/Preferences.nib/designable.nib 2018-12-12 12:45:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/English.lproj/Preferences.nib/designable.nib 2018-12-27 15:38:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,28 +75,6 @@
</span> <binding destination="58" name="selectedTag" keyPath="values.MMOpenLayout" id="441"/>
</connections>
</popUpButton>
- <textField verticalHuggingPriority="750" id="124">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <rect key="frame" x="17" y="187" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <autoresizingMask key="autoresizingMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="17" y="209" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,19 +14,21 @@
</span> - </textFieldCell>
- </textField>
- <button id="122">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <rect key="frame" x="207" y="186" width="258" height="18"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <autoresizingMask key="autoresizingMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="207" y="208" width="258" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string>
</span> - <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/>
</span> - <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/>
- </connections>
- </button>
<textField verticalHuggingPriority="750" id="121">
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <rect key="frame" x="209" y="47" width="243" height="58"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <autoresizingMask key="autoresizingMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <rect key="frame" x="209" y="50" width="243" height="58"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span> --- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig 2017-06-12 11:56:17.000000000 +0200
+++ src/MacVim/MacVim.xcodeproj/project.pbxproj 2017-06-12 11:56:42.000000000 +0200
@@ -66,8 +66,6 @@
</pre><pre style='margin:0'>
</pre>