<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0f154b61a82fb09bc0e2c3b3fae00d1a5556993f">https://github.com/macports/macports-ports/commit/0f154b61a82fb09bc0e2c3b3fae00d1a5556993f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0f154b6 libuv: uv_fsevents: fall back to kqueue on older mac systems
</span>0f154b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0f154b61a82fb09bc0e2c3b3fae00d1a5556993f
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri May 3 11:56:23 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libuv: uv_fsevents: fall back to kqueue on older mac systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://github.com/libuv/libuv/pull/2290
</span><span style='display:block; white-space:pre;color:#404040;'> update Tiger patches
</span>---
devel/libuv/Portfile | 23 +++---
.../files/patch-kqueue-on-older-mac-systems.diff | 87 ++++++++++++++++++++++
devel/libuv/files/patch-libuv-1-23-2-tiger.diff | 50 +++----------
.../libuv/files/patch-libuv-fsevents-leopard.diff | 35 ---------
4 files changed, 110 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/Portfile b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5283838..c28ee3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,11 @@ platform darwin {
</span>
# which port version depends on which OS version
if { ${os.major} == 8 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # peg at version 1.24.0 with patches for 10.4 Tiger, updated occasionally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.24.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4dae1e3af9188c0bb49380f304a75db7bf360f08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b3a627b5a4f98edcac8e11adc92f5d21a04a82b363e625f3a7675615d57a34a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1201804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # peg at version 1.28.0 with patches for 10.4 Tiger, updated occasionally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.28.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 021dfc555baec1572795c06b502228379146e580 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1219212
</span> revision 0
maintainers-prepend {kencu @kencu}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,10 +35,11 @@ platform darwin {
</span> # prevent conflicting opentransport header from being pulled in
configure.cppflags-append -D__OPENTRANSPORTPROVIDERS__
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete any patchfiles that may be added above later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this patch has been sent upstream (same as Leopard/SnowLeopard)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-kqueue-on-older-mac-systems.diff
</span>
# Tiger unified patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-libuv-1-23-2-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libuv-1-23-2-tiger.diff
</span>
# Tiger has no libutil
patchfiles-append patch-makefile-am-no-libutil-on-Tiger.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +62,13 @@ platform darwin {
</span> checksums rmd160 021dfc555baec1572795c06b502228379146e580 \
sha256 4a115f752fb8dd2f24f8ad5a3c1a975260b550c0fc3ef525c449eb382f182358 \
size 1219212
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needed for the tests to compile correctly on Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -D__DARWIN_64_BIT_INO_T
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libuv-fsevents-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this patch has been sent upstream (same as Tiger)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-kqueue-on-older-mac-systems.diff
</span>
# deprecate the devel port, if installed
# can be removed after 20201010
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff b/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1f0e8ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/files/patch-kqueue-on-older-mac-systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f806f2b3e91907ea1cc63ce8b73fc4f29282e5be Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 3 May 2019 15:02:33 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macOS: uv_fs_event - fall back to kqueue on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+newer macOS systems 10.7+ use fsevents() for the fs_event backend but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+older macOS systems don't have full functionality for this in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS fsevents() API. Fall back to kqueue for these systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/unix/fsevents.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/unix/kqueue.c | 12 ++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/unix/fsevents.c src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c430562b37..ddacda31fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,9 +21,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "uv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "internal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int uv__fsevents_init(uv_fs_event_t* handle) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/unix/kqueue.c src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 092005161f..c04e7a485c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/unix/kqueue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@ int uv__kqueue_init(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int uv__has_forked_with_cfrunloop;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@ int uv__io_fork(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (loop->cf_state != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* We cannot start another CFRunloop and/or thread in the child
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process; CF aborts if you try or if you try to touch the thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@ int uv__io_fork(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uv__free(loop->cf_state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ loop->cf_state = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* #if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,7 +458,7 @@ int uv_fs_event_start(uv_fs_event_t* handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (uv__is_active(handle))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Nullify field to perform checks later */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ handle->cf_cb = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ handle->realpath = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -482,7 +482,7 @@ int uv_fs_event_start(uv_fs_event_t* handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* defined(__APPLE__) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* #if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* TODO open asynchronously - but how do we report back errors? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fd = open(path, O_RDONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -513,7 +513,7 @@ int uv_fs_event_stop(uv_fs_event_t* handle) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uv__handle_stop(handle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!uv__has_forked_with_cfrunloop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r = uv__fsevents_close(handle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-libuv-1-23-2-tiger.diff b/devel/libuv/files/patch-libuv-1-23-2-tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index db2ae19..d99c3a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/files/patch-libuv-1-23-2-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/files/patch-libuv-1-23-2-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unix/fs.c src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3db5f89..3f0d719 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/sendfile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__) && !defined(FICLONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -589,7 +589,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -u src/unix/fs.c.orig src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/unix/fs.c.orig 2019-05-04 14:35:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/unix/fs.c 2019-05-04 14:40:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -729,7 +729,7 @@
</span>
return -1;
}
-#elif defined(__APPLE__) || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || \
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -760,7 +760,7 @@ done:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ssize_t uv__fs_copyfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) && !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On macOS, use the native copyfile(3). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copyfile_flags_t flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -925,7 +925,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1040,7 +1040,7 @@
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
-#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span> dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unix/fsevents.c src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ee45299..4c821ca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "uv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "internal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if TARGET_OS_IPHONE || ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git src/unix/tty.c src/unix/tty.c
index 74d3d75..ee8e186 100644
--- src/unix/tty.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +28,7 @@ index 74d3d75..ee8e186 100644
</span>
result = ioctl(fd, TIOCGPTN, &dummy) != 0;
-#elif defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span> char dummy[256];
result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +41,7 @@ index 01f5a7b..d1eaf13 100644
</span> ASSERT(s->st_blksize == (uint64_t) t.st_blksize);
ASSERT(s->st_blocks == (uint64_t) t.st_blocks);
-#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
</span> ASSERT(s->st_atim.tv_sec == t.st_atimespec.tv_sec);
ASSERT(s->st_atim.tv_nsec == t.st_atimespec.tv_nsec);
ASSERT(s->st_mtim.tv_sec == t.st_mtimespec.tv_sec);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/files/patch-libuv-fsevents-leopard.diff b/devel/libuv/files/patch-libuv-fsevents-leopard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e56808f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/files/patch-libuv-fsevents-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unix/fsevents.c src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c430562..7ab55c1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unix/fsevents.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,7 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else /* TARGET_OS_IPHONE */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +49,22 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CFRunLoop.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( MAC_OS_X_VERSION_MAX_ALLOWED < 1070 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemCreated 0x00000100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemRemoved 0x00000200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemInodeMetaMod 0x00000400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemRenamed 0x00000800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemModified 0x00001000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemFinderInfoMod 0x00002000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemChangeOwner 0x00004000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemXattrMod 0x00008000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemIsFile 0x00010000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemIsDir 0x00020000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamEventFlagItemIsSymlink 0x00040000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define kFSEventStreamCreateFlagFileEvents 0x00000010
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* These are macros to avoid "initializer element is not constant" errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * with old versions of gcc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span></pre><pre style='margin:0'>
</pre>