<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b90071a95b585c7ed11d2767dcc1fdfca6e027d">https://github.com/macports/macports-ports/commit/6b90071a95b585c7ed11d2767dcc1fdfca6e027d</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 6b90071a95b netdata-dashboard: new subport
</span>6b90071a95b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b90071a95b585c7ed11d2767dcc1fdfca6e027d
</span>Author: Gregory Anders <greg@gpanders.com>
AuthorDate: Thu Apr 22 11:30:15 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> netdata-dashboard: new subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Netdata split out the web dashboard from the core repo, so we provide a
</span><span style='display:block; white-space:pre;color:#404040;'> subport for those files that the main port depends on.
</span>---
sysutils/netdata/Portfile | 83 ++++++++++++++++++++++++++++++++++-------------
1 file changed, 61 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/netdata/Portfile b/sysutils/netdata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 493fa63c494..c66058e336a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/netdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/netdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
github.setup netdata netdata 1.29.3 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
github.tarball_from releases
distname ${name}-v${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,10 @@ long_description Netdata's distributed, real-time monitoring Agent \
</span> containers, cloud deployments, and edge/IoT devices, and \
is perfectly safe to install on your systems mid-incident \
without any preparation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:autoconf \
port:automake \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +54,6 @@ configure.args --disable-dependency-tracking \
</span> --enable-dbengine \
--with-user=netdata
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable ${prefix}/sbin/netdata -D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set netdata_user netdata
set netdata_group netdata
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,25 +65,66 @@ set netdata_web_dir ${prefix}/share/${name}/web
</span>
add_users ${netdata_user} group=${netdata_group}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${name} eq ${subport} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${name}-dashboard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.executable ${prefix}/sbin/netdata -D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${netdata_cache_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${netdata_log_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${netdata_lib_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/system/netdata.conf ${destroot}${netdata_conf_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|web files owner = .*|web files owner = netdata|" ${destroot}${netdata_conf_dir}/netdata.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|NETDATA_USER_CONFIG_DIR=\"/|NETDATA_USER_CONFIG_DIR=\"${prefix}/|" ${destroot}${netdata_conf_dir}/edit-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|NETDATA_STOCK_CONFIG_DIR=\"/|NETDATA_STOCK_CONFIG_DIR=\"${prefix}/|" ${destroot}${netdata_conf_dir}/edit-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_cache_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_log_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_lib_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch ${destroot}${netdata_conf_dir}/.opt-out-from-anonymous-statistics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete any files provided by netdata-dashboard to avoid conflicts. We
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can't just delete the whole directory because this directory contains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some files that are not present in netdata/dashboard. This will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # hopefully change someday, see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/netdata/dashboard/issues/83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -dir ${netdata_web_dir} * **/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${f}
</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;'>+ system "chown -R ${netdata_user}:${netdata_group} ${destroot}${netdata_web_dir}"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-dashboard {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Static assets for the Netdata Agent dashboard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${netdata_cache_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${netdata_log_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${netdata_lib_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup netdata dashboard 2.16.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/system/netdata.conf ${destroot}${netdata_conf_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname dashboard
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|web files owner = .*|web files owner = netdata|" ${destroot}${netdata_conf_dir}/netdata.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|NETDATA_USER_CONFIG_DIR=\"/|NETDATA_USER_CONFIG_DIR=\"${prefix}/|" ${destroot}${netdata_conf_dir}/edit-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|NETDATA_STOCK_CONFIG_DIR=\"/|NETDATA_STOCK_CONFIG_DIR=\"${prefix}/|" ${destroot}${netdata_conf_dir}/edit-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1c0c4b221bb64a651f5f3a2bec7f80ab1535959d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5b791a3a5a5beee411877e687b0f1a852b6ed87178952402714d44c4659abdae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6315714
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_cache_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_log_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_lib_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown -R ${netdata_user}:${netdata_group} ${destroot}${netdata_web_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- touch ${destroot}${netdata_conf_dir}/.opt-out-from-anonymous-statistics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o ${netdata_user} -g ${netdata_group} ${destroot}${netdata_web_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "tar -C ${destroot}${netdata_web_dir} -xf ${distpath}/${distname}.tar.gz --strip-components 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>