<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d6cba0d3fc985702bcb56a054c1649880ecc058">https://github.com/macports/macports-ports/commit/6d6cba0d3fc985702bcb56a054c1649880ecc058</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 6d6cba0d3fc nq: update to 0.5
</span>6d6cba0d3fc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d6cba0d3fc985702bcb56a054c1649880ecc058
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Sat Jan 20 07:33:56 2024 +0300
<span style='display:block; white-space:pre;color:#404040;'> nq: update to 0.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * fix build on macOS < 10.12
</span><span style='display:block; white-space:pre;color:#404040;'> * remove platforms line, mark fq port as conflict
</span>---
sysutils/nq/Portfile | 20 +++--
sysutils/nq/files/kqueue.diff | 121 ---------------------------
sysutils/nq/files/patch-fq-note-funlock.diff | 13 +++
3 files changed, 27 insertions(+), 127 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/nq/Portfile b/sysutils/nq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fba16f192e1..05028bba2fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/nq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/nq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,14 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# openat, unlinkat, renameat, fdopendir, dprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span>
name nq
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts fq
</span> maintainers {landonf @landonf} openmaintainer
license public-domain
description Unix command line queue utility
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,15 +17,19 @@ long_description nq allows creating very lightweight job queue \
</span> systems which require no setup, maintenance, supervision, \
or any long-running processes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup leahneukirchen nq 0.3.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup leahneukirchen nq 0.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ae794b283b21a7b44b0c855ee617421010b87dc8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4c6dbc8aaf98142cea45bb61c22d1352021e6186b433f991244c1ed934048fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0367b9463b9bfbd24635f618975e51378f779181 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 414afe356d48fbc207ab93cf5a2145306506b31ea2de8941c5c3af6aa0b0075a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12246
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles kqueue.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-fq-note-funlock.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_configure no
build.args CC=${configure.cc} CFLAGS="${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span> destroot.args PREFIX="${prefix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/nq/files/kqueue.diff b/sysutils/nq/files/kqueue.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9f6a22c0117..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/nq/files/kqueue.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,121 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fq.1 b/fq.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index df60052..dec179b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fq.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fq.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--.Dd August 25, 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.Dd January 31, 2021
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Dt FQ 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Sh NAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,9 @@ Directory where lock files/job output resides, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- On Linux,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Xr inotify 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is used to monitor job output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+On FreeBSD and macOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.Xr kqueue 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- On other operating systems, polling is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Sh SEE ALSO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .Xr nq 1 ,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/fq.c b/fq.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 11e176c..1a702d6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fq.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fq.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,11 +25,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define USE_INOTIFY
</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(__FreeBSD__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define USE_KEVENT
</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;'>- #ifdef USE_INOTIFY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/inotify.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char ibuf[8192];
</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;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/event.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;'>- char buf[8192];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +70,10 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_INOTIFY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ifd, wd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int kq, note;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct kevent kev;
</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;'>- close(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,6 +146,11 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ifd < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(111);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kq = kqueue();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (kq < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(111);
</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;'>- for (i = optind; i < argc; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loff = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,6 +180,20 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(111);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ note = NOTE_WRITE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ note |= NOTE_FUNLOCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ note |= NOTE_CLOSE_WRITE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EV_SET(&kev, fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, note, 0, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (kevent(kq, &kev, 1, NULL, 0, NULL) < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ perror("kevent");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(111);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</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;'>- while (1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- off = lseek(fd, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,9 +207,11 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (flock(fd, LOCK_EX | LOCK_NB) == -1 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno == EWOULDBLOCK) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef USE_INOTIFY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(USE_INOTIFY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* any inotify event is good */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- read(ifd, ibuf, sizeof ibuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(USE_KEVENT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kevent(kq, NULL, 0, &kev, 1, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* poll for size change */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (off == lseek(fd, 0, SEEK_END))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,12 +250,19 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_INOTIFY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inotify_rm_watch(ifd, wd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EV_SET(&kev, fd, EVFILT_VNODE, EV_DELETE, 0, 0, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kevent(kq, &kev, 1, NULL, 0, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</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;'>- #ifdef USE_INOTIFY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(ifd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ close(kq);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/nq/files/patch-fq-note-funlock.diff b/sysutils/nq/files/patch-fq-note-funlock.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4bd9adfc76c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/nq/files/patch-fq-note-funlock.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+NOTE_FUNLOCK did not appear until macOS Sierra.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fq.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fq.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,9 +184,6 @@ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_KEVENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ note = NOTE_WRITE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- note |= NOTE_FUNLOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ note |= NOTE_CLOSE_WRITE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>