[116417] trunk/dports/editors
raimue at macports.org
raimue at macports.org
Fri Jan 24 09:42:59 PST 2014
Revision: 116417
https://trac.macports.org/changeset/116417
Author: raimue at macports.org
Date: 2014-01-24 09:42:58 -0800 (Fri, 24 Jan 2014)
Log Message:
-----------
editors/vim, editors/vim-app, editors/MacVim:
Always include the patch to fix "conflicting types for 'sigaltstack'", as
apparently it's now required on older versions of OS X as well, see #41774.
Modified Paths:
--------------
trunk/dports/editors/MacVim/Portfile
trunk/dports/editors/vim/Portfile
trunk/dports/editors/vim-app/Portfile
Added Paths:
-----------
trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff
trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff
trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff
Removed Paths:
-------------
trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff
trunk/dports/editors/vim/files/patch-compat-darwin13.diff
trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff
Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/MacVim/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
@@ -60,6 +60,8 @@
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
@@ -203,9 +205,6 @@
configure.args-append --enable-cscope
}
-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
livecheck.type regex
livecheck.url https://github.com/b4winckler/macvim/releases
Deleted: trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -1,13 +0,0 @@
---- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
-+++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
-@@ -18,6 +18,10 @@
- * changed beyond recognition.
- */
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
- /*
- * Some systems have a prototype for select() that has (int *) instead of
- * (fd_set *), which is wrong. This define removes that prototype. We define
Copied: trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/MacVim/files/patch-compat-darwin13.diff)
===================================================================
--- trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -0,0 +1,13 @@
+--- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
++++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
+@@ -18,6 +18,10 @@
+ * changed beyond recognition.
+ */
+
++#if defined(__APPLE__)
++#include <AvailabilityMacros.h>
++#endif
++
+ /*
+ * Some systems have a prototype for select() that has (int *) instead of
+ * (fd_set *), which is wrong. This define removes that prototype. We define
Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
@@ -99,10 +99,7 @@
port:gettext \
port:libiconv
-autoconf.cmd make autoconf
-autoconf.pre_args
-autoconf.args
-autoconf.dir ${worksrcpath}/src
+patchfiles-append patch-compat-sigaltstack.diff
post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
@@ -116,6 +113,11 @@
file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
}
+autoconf.cmd make autoconf
+autoconf.pre_args
+autoconf.args
+autoconf.dir ${worksrcpath}/src
+
configure.args --disable-gui \
--without-x \
--disable-gpm \
@@ -296,10 +298,6 @@
configure.args-append --disable-darwin
}
-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
-
livecheck.type regex
livecheck.url http://ftp.vim.org/pub/${name}/patches/${vim_version}/?O=D
livecheck.version [format "%s.%03d" $vim_version $vim_patchlevel]
Deleted: trunk/dports/editors/vim/files/patch-compat-darwin13.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -1,13 +0,0 @@
---- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
-+++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
-@@ -18,6 +18,10 @@
- * changed beyond recognition.
- */
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
- /*
- * Some systems have a prototype for select() that has (int *) instead of
- * (fd_set *), which is wrong. This define removes that prototype. We define
Copied: trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/vim/files/patch-compat-darwin13.diff)
===================================================================
--- trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/vim/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -0,0 +1,13 @@
+--- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
++++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
+@@ -18,6 +18,10 @@
+ * changed beyond recognition.
+ */
+
++#if defined(__APPLE__)
++#include <AvailabilityMacros.h>
++#endif
++
+ /*
+ * Some systems have a prototype for select() that has (int *) instead of
+ * (fd_set *), which is wrong. This define removes that prototype. We define
Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim-app/Portfile 2014-01-24 17:42:58 UTC (rev 116417)
@@ -121,10 +121,7 @@
}
}
-autoconf.cmd make autoconf
-autoconf.pre_args
-autoconf.args
-autoconf.dir ${worksrcpath}/src
+patchfiles-append patch-compat-sigaltstack.diff
post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
@@ -138,6 +135,11 @@
file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
}
+autoconf.cmd make autoconf
+autoconf.pre_args
+autoconf.args
+autoconf.dir ${worksrcpath}/src
+
configure.pre_args --prefix=${applications_dir}
configure.args --enable-gui=carbon \
--without-x \
@@ -319,10 +321,6 @@
}
}
-platform darwin 13 {
- patchfiles-append patch-compat-darwin13.diff
-}
-
livecheck.type regex
livecheck.url http://ftp.vim.org/pub/${realname}/patches/${vim_version}/?O=D
livecheck.version [format "%s.%03d" $vim_version $vim_patchlevel]
Deleted: trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff 2014-01-24 15:09:48 UTC (rev 116416)
+++ trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -1,13 +0,0 @@
---- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
-+++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
-@@ -18,6 +18,10 @@
- * changed beyond recognition.
- */
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
- /*
- * Some systems have a prototype for select() that has (int *) instead of
- * (fd_set *), which is wrong. This define removes that prototype. We define
Copied: trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff (from rev 116416, trunk/dports/editors/vim-app/files/patch-compat-darwin13.diff)
===================================================================
--- trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-compat-sigaltstack.diff 2014-01-24 17:42:58 UTC (rev 116417)
@@ -0,0 +1,13 @@
+--- src/os_unix.c 2013-08-02 15:13:48.000000000 -0500
++++ src/os_unix.c 2013-08-02 15:14:51.000000000 -0500
+@@ -18,6 +18,10 @@
+ * changed beyond recognition.
+ */
+
++#if defined(__APPLE__)
++#include <AvailabilityMacros.h>
++#endif
++
+ /*
+ * Some systems have a prototype for select() that has (int *) instead of
+ * (fd_set *), which is wrong. This define removes that prototype. We define
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140124/e33b8df0/attachment.html>
More information about the macports-changes
mailing list