Ticket #47090: Portfile-MacVim.diff

Portfile

@@ +1 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id: Portfile 131243 2015-01-07 13:53:26Z raimue@macports.org $
 
 PortSystem          1.0
@@ -5 +6 @@
 
 name                MacVim
 set vim_version     7.4
-set snapshot        73
+set snapshot        74
 set gitcommit       snapshot-${snapshot}
 version             ${vim_version}.snapshot${snapshot}
-revision            1
 categories          editors
 platforms           darwin
 license             Vim GPL-2+
@@ -19 +19 @@
     better and integrate more seamlessly with the Mac than vim-app.
 homepage            http://code.google.com/p/macvim
 
-master_sites        http://github.com/b4winckler/macvim/zipball/${gitcommit}
-checksums           ${name}-${version}.zip \
-                    rmd160  457b0eea2d7d86629d67683125df994e11e680dd \
-                    sha256  ed008a0d31f3c38f7fd018586aaa8c0bccda97c911f1be9f12c7120312f66976
+master_sites        http://github.com/douglasdrumond/macvim/archive
+distfiles           snapshot-${snapshot}.zip
+checksums           snapshot-${snapshot}.zip \
+                    rmd160  65aba3f7e16c2e9b59ad1984d92b904eba6d4d87 \
+                    sha256  05b46b80dd5ee8324ae8f83d404169b7b25ea323891a69cadd31eb38449b71c1
 use_zip             yes
 worksrcdir          ${name}
-extract.only        ${name}-${version}.zip
+extract.only        snapshot-${snapshot}.zip
 
 depends_build       bin:gnutar:gnutar \
                     bin:grep:grep \
@@ -41 +42 @@
 }
 
 patchfiles          patch-src-MacVim-icons-python.diff \
-                    patch-MacVim-GCC-VERSION.diff
+                    patch-MacVim-GCC-VERSION.diff \
+                    patch-compat-sigaltstack.diff
 
 pre-fetch {
     if {${os.platform} eq "darwin" && ${os.major} < 10} {
@@ -51 +53 @@
 }
 
 # does not run correctly when build with older clang releases, see #30985
-compiler.blacklist macports-clang-2.9 macports-clang-3.0 {clang < 400}
+compiler.blacklist  macports-clang-2.9 macports-clang-3.0 {clang < 400}
 
 post-extract {
     # github zipball has root folder including commitish, renaming for ease of use
-    file rename [glob ${workpath}/b4winckler-*] ${worksrcpath}
+    file rename [glob ${workpath}/macvim-snapshot-*] ${worksrcpath}
 
     # create cache directory
     file mkdir ${workpath}/caches
 }
 
-patchfiles-append patch-compat-sigaltstack.diff
 
 post-patch {
     reinplace "s|^# VIM_APP_DIR=/Applications$|VIM_APP_DIR=${applications_dir}|" \
          ${worksrcpath}/src/MacVim/mvim
 }
 
-autoconf.dir ${worksrcpath}/src
+autoconf.dir        ${worksrcpath}/src
 
 configure.args      --enable-gui=macvim \
                     --without-x \
@@ -108 +109 @@
     configure.args-append --with-xim
 }
 
-variant breakindent description {Apply the breakindent patch} {
-    # Upstream: https://retracile.net/wiki/VimBreakIndent
-    master_sites-append https://retracile.net/raw-attachment/blog/2013/09/12/23.00/:breakindent
-    distfiles-append    vim-7.4.16-fc19-breakindent.patch:breakindent
-    checksums-append    vim-7.4.16-fc19-breakindent.patch \
-                        rmd160  a03d102166b7fa4d699b621c6a9c54dae05017c6 \
-                        sha256  8374b1fa505797761fd4480adb1f636d5cdebc1c943c9af70db8f7431b761548
-
-    post-patch {
-        system -W ${worksrcpath} "patch -p1 < ${distpath}/vim-7.4.16-fc19-breakindent.patch"
-    }
-}
-
 variant perl description {Enable Perl scripting} {
     configure.args-append   --enable-perlinterp
     depends_lib-append      path:bin/perl:perl5
@@ -199 +187 @@
 
 
 livecheck.type          regex
-livecheck.url           https://github.com/b4winckler/macvim/releases
+livecheck.url           https://github.com/douglasdrumond/macvim/releases
 livecheck.version       ${snapshot}
 livecheck.regex         snapshot-(\\d+)