<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af84efeea2824b225f5e74100d480fbd3d68760c">https://github.com/macports/macports-ports/commit/af84efeea2824b225f5e74100d480fbd3d68760c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit af84efeea2824b225f5e74100d480fbd3d68760c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 12 08:04:30 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> collectd: use lua PG
</span>---
sysutils/collectd/Portfile | 5 ++---
sysutils/collectd/files/dep-gen.sh | 13 ++++++++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/collectd/Portfile b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67f9e352b23..ac9aa592275 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,11 +451,10 @@ variant lpar description {AIX logical partitions statistics} {
</span> }
variant lua description {Lua plugin} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup lua 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace --disable-lua \
--enable-lua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lua
</span> }
variant mbmon description {Query mbmond} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/collectd/files/dep-gen.sh b/sysutils/collectd/files/dep-gen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 51934f746ff..731d28673e1 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/collectd/files/dep-gen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/collectd/files/dep-gen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,7 +186,6 @@ PLUGIN_DEPS=(
</span> [dns]="port:libpcap"
[gmond]="port:ganglia"
[log_logstash]="port:yajl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [lua]="port:lua"
</span> [memcachec]="port:libmemcached"
[memcached]="port:libmemcached"
[mysql]="path:lib/mysql5/mysql/libmysqlclient.dylib:mysql5"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,6 +322,14 @@ OSX_STANDARD=(
</span> write_http
)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+declare -A EXTRA_PRE_CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+read -r -d '' LUA_PRE_EXTRA <<'EOF'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup lua 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+EXTRA_PRE_CODE=(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lua]="$LUA_PRE_EXTRA"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> declare -A EXTRA_CODE
read -r -d '' PERL_EXTRA <<'EOF'
configure.args-append --with-perl=${prefix}/bin/perl5.26
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,6 +380,10 @@ echo
</span> for plugin in $(printf "%s\n" ${!PLUGINS[@]} | sort); do
if [ -z "${OSX_BLACKLIST[$plugin]}" ]; then
printf "variant %s description {%s} {\n" "$plugin" "${PLUGINS[$plugin]}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -n "${EXTRA_PRE_CODE[$plugin]}" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " ${EXTRA_PRE_CODE[$plugin]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span> printf " configure.args-replace --disable-$plugin \\\\\n"
printf " --enable-$plugin\n"
if [ -n "${EXTRA_CODE[$plugin]}" ]; then
</pre><pre style='margin:0'>
</pre>