<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/acf06846e1948bb5d88644cde5feef979ed65160">https://github.com/macports/macports-ports/commit/acf06846e1948bb5d88644cde5feef979ed65160</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 acf06846e19 influxdb: update to 2.0.4
</span>acf06846e19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit acf06846e1948bb5d88644cde5feef979ed65160
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Mar 14 06:47:32 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> influxdb: update to 2.0.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use the golang portgroup
</span>---
sysutils/influxdb/Portfile | 122 ++++++++++-----------
sysutils/influxdb/files/config.toml.example | 2 +
.../influxdb/files/org.macports.influxdb.plist | 7 +-
3 files changed, 67 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/influxdb/Portfile b/sysutils/influxdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c47b2e4cef..2433c427898 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/influxdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/influxdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +1,69 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup golang 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup influxdata influxdb 1.8.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/influxdata/influxdb 2.0.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories sysutils net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64 i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://influxdata.com
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://influxdata.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Scalable datastore for metrics, events, and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ real-time analytics
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Scalable datastore for metrics, events, and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- real-time analytics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description InfluxDB is an open source time series platform. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This includes APIs for storing and querying data, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ processing it in the background for ETL, monitoring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and/or alerting purposes, user dashboards, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ visualizing and exploring the data and more.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description InfluxDB is an open source time series platform. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This includes APIs for storing and querying data, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- processing it in the background for ETL, monitoring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and/or alerting purposes, user dashboards, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- visualizing and exploring the data and more.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories sysutils net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:herby.gillot @herbygillot} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:herby.gillot @herbygillot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span>
# Build script (build.py) requires a git checkout
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:go \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_user ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_conf_dir ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_data_dir ${prefix}/var/db/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_log_dir ${prefix}/var/log/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_share_dir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_conf_file ${influxdb_conf_dir}/config.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_conf_sample ${influxdb_share_dir}/config.sample.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_log_file ${influxdb_log_dir}/influxdb.log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set influxdb_plist_src ${workpath}/org.macports.${name}.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-installs_libs no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-add_users ${influxdb_user} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- group=${influxdb_user} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- realname=InfluxDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386 { set goarch 386 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64 { set goarch amd64 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default { set goarch {} }
</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;'>-build.env GOPATH=${workpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=${workpath}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd python3.9 ./build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args --arch ${goarch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --platform darwin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --version ${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --parallel ${build.jobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args --release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Allow fetching dependencies during build time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-delete GO111MODULE=off GOPROXY=off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append bin:node:nodejs15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:npm:npm6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cargo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yarn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_user ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_conf_dir ${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_data_dir ${prefix}/var/db/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_log_dir ${prefix}/var/log/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_share_dir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_conf_file ${influxdb_conf_dir}/config.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_example_conf ${influxdb_share_dir}/config.toml.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_log_file ${influxdb_log_dir}/influxdb.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set influxdb_plist_src ${workpath}/org.macports.${name}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add_users ${influxdb_user} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ group=${influxdb_user} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ realname=InfluxDB \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ home=${influxdb_data_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span>
post-extract {
copy ${filespath}/org.macports.influxdb.plist ${influxdb_plist_src}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/var/lib/influxdb|${influxdb_data_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/etc/config.sample.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/config.toml.example ${workpath}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DATA_DIR@|${influxdb_data_dir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/config.toml.example
</span>
reinplace "s|@NAME@|${name}|g" ${influxdb_plist_src}
reinplace "s|@USER@|${influxdb_user}|g" ${influxdb_plist_src}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +75,8 @@ post-extract {
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/build/*] ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy {*}[glob ${worksrcpath}/bin/darwin/*] ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
xinstall -d -m 755 ${destroot}${influxdb_conf_dir}
xinstall -d -m 755 ${destroot}${influxdb_share_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +84,7 @@ destroot {
</span> ${destroot}${influxdb_data_dir}
xinstall -d -m 755 -g ${influxdb_user} ${destroot}${influxdb_log_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/etc/config.sample.toml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${influxdb_conf_sample}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/config.toml.example ${destroot}${influxdb_example_conf}
</span>
touch ${destroot}${influxdb_log_file}
file attributes ${destroot}${influxdb_log_file} -owner ${influxdb_user}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +107,7 @@ destroot.keepdirs-append ${destroot}${influxdb_conf_dir} \
</span> post-activate {
if {![file exists ${influxdb_conf_file}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${influxdb_conf_sample} ${influxdb_conf_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${influxdb_example_conf} ${influxdb_conf_file}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,6 +120,10 @@ To start the InfluxDB service, use `port load`:
</span> `port unload` will stop and remove the service:
\$ sudo port unload ${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+After starting the service, you can find InfluxDB's configuration file at:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${influxdb_conf_file}
</span> "
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/influxdb/files/config.toml.example b/sysutils/influxdb/files/config.toml.example
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2afd9fd9974
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/influxdb/files/config.toml.example
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bolt-path = "@DATA_DIR@/influxd.bolt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+engine-path = "@DATA_DIR@/engine"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/influxdb/files/org.macports.influxdb.plist b/sysutils/influxdb/files/org.macports.influxdb.plist
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a601049ec1..b5947da6023 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/influxdb/files/org.macports.influxdb.plist
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/influxdb/files/org.macports.influxdb.plist
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,12 +26,15 @@
</span> <array>
<string>@PREFIX@/bin/influxd</string>
<string>run</string>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>-config</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@CONF_FILE@</string>
</span> </array>
<key>StandardErrorPath</key>
<string>@LOGFILE@</string>
<key>StandardOutPath</key>
<string>@LOGFILE@</string>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>EnvironmentVariables</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>INFLUXD_CONFIG_PATH</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@CONF_FILE@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </dict>
</span> </dict>
</plist>
</pre><pre style='margin:0'>
</pre>