<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/841ca477424cac003a602291b54e27cca1379d0a">https://github.com/macports/macports-ports/commit/841ca477424cac003a602291b54e27cca1379d0a</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 841ca477424 runit: Fix implicit declaration of functions
</span>841ca477424 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 841ca477424cac003a602291b54e27cca1379d0a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 19 22:40:59 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> runit: Fix implicit declaration of functions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61680
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add size to checksums, use MacPorts flags, add universal variant,
</span><span style='display:block; white-space:pre;color:#404040;'> don't compress manpages manually because MacPorts does so automatically,
</span><span style='display:block; white-space:pre;color:#404040;'> and use notes instead of post-install ui_msg.
</span>---
sysutils/runit/Portfile | 37 ++++++++++++++++++++++++-------------
sysutils/runit/files/implicit.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/runit/Portfile b/sysutils/runit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cdb27000987..5207e6f94ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/runit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/runit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name runit
version 2.1.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,23 +16,34 @@ homepage http://smarden.org/runit/
</span> master_sites http://smarden.org/runit/
checksums rmd160 cc9535d17e42707a2fb6e9d0a19f19596788ed77 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 110916
</span>
worksrcdir admin/${worksrcdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -Xlinker -x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd package/compile
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && echo 'cc -Xlinker -x' >src/conf-ld"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Per the installation instructions at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # http://smarden.org/runit/install.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but using the right compiler and adding MacPorts flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "echo ${configure.cc} ${configure.cflags} [get_canonical_archflags cc] > src/conf-cc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "echo ${configure.cc} ${configure.ldflags} [get_canonical_archflags ld] > src/conf-ld"
</span> reinplace "s| -static||g" ${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Force use of select() rather than broken poll()
file copy -force ${worksrcpath}/src/iopause.h1 ${worksrcpath}/src/iopause.h2
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${workpath}/${worksrcdir}/man && gzip *.8"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
startupitem.create yes
startupitem.name ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,15 +59,14 @@ destroot {
</span> svlogd.8.html upgrade.html usedietlibc.html useinit.html utmpset.8.html \
${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/man/man8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath}/man chpst.8.gz runit-init.8.gz runit.8.gz runsv.8.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runsvchdir.8.gz runsvdir.8.gz sv.8.gz svlogd.8.gz utmpset.8.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath}/man chpst.8 runit-init.8 runit.8 runsv.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runsvchdir.8 runsvdir.8 sv.8 svlogd.8 utmpset.8 \
</span> ${destroot}${prefix}/share/man/man8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-install {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nCreate ${prefix}/var/service, then add service subdirectories as required; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the startup item will then supervise these services by default."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Create ${prefix}/var/service, then add service subdirectories as required;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the startup item will then supervise these services by default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span>
livecheck.url ${homepage}install.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/runit/files/implicit.patch b/sysutils/runit/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..feb544e8593
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/runit/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pathexec_run.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pathexec_run.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Public domain. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "stralloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "str.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/prot.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/prot.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Public domain. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hasshsgr.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "prot.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/seek_set.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/seek_set.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Public domain. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "seek.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SET 0 /* sigh */
</span></pre><pre style='margin:0'>
</pre>