diff --git a/sysutils/glances/Makefile b/sysutils/glances/Makefile index dff1909d9b8..6602be0ae38 100644 --- a/sysutils/glances/Makefile +++ b/sysutils/glances/Makefile @@ -1,10 +1,9 @@ COMMENT = cross-platform curses-based monitoring tool -MODPY_EGG_VERSION = 3.2.6.4 +MODPY_EGG_VERSION = 3.3.0.4 DISTNAME = Glances-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:L} -REVISION = 1 CATEGORIES = sysutils diff --git a/sysutils/glances/distinfo b/sysutils/glances/distinfo index d55244c6717..79945a91993 100644 --- a/sysutils/glances/distinfo +++ b/sysutils/glances/distinfo @@ -1,2 +1,2 @@ -SHA256 (Glances-3.2.6.4.tar.gz) = Q/Sr0UDj6Du81RTouIr5nDsRgDFBGX9OXeSG3XF0GGs= -SIZE (Glances-3.2.6.4.tar.gz) = 6910456 +SHA256 (Glances-3.3.0.4.tar.gz) = igpSmOpV40dz7ahsUXEKVvGcRyRgBHJicHmxw3D3nk4= +SIZE (Glances-3.3.0.4.tar.gz) = 6105673 diff --git a/sysutils/glances/patches/patch-glances_config_py b/sysutils/glances/patches/patch-glances_config_py index 443c2c9c8f4..c7109a45d67 100644 --- a/sysutils/glances/patches/patch-glances_config_py +++ b/sysutils/glances/patches/patch-glances_config_py @@ -1,7 +1,7 @@ Index: glances/config.py --- glances/config.py.orig +++ glances/config.py -@@ -75,9 +75,9 @@ def system_config_dir(): +@@ -65,9 +65,9 @@ def system_config_dir(): - *BSD, macOS: /usr/local/etc/glances - Windows: %APPDATA%\glances """ diff --git a/sysutils/glances/pkg/PLIST b/sysutils/glances/pkg/PLIST index 77826b22e0f..8280d85b864 100644 --- a/sysutils/glances/pkg/PLIST +++ b/sysutils/glances/pkg/PLIST @@ -207,6 +207,8 @@ lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_csv.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_issue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_issue.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} +lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_stdout_json.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_unicode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/glances/outputs/${MODPY_PYCACHE}glances_unicode.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_bars.py @@ -218,9 +220,12 @@ lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout.py lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_apidoc.py lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_csv.py lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_issue.py +lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_stdout_json.py lib/python${MODPY_VERSION}/site-packages/glances/outputs/glances_unicode.py lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/ +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/.eslintrc.js lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/.gitignore +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/.prettierrc.js lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/README.md lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/css/ lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/css/bootstrap.less @@ -230,144 +235,48 @@ lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/images/ lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/images/favicon.ico lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/images/glances.png lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/ +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/App.vue lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/app.js lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/glances/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/glances/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/glances/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/glances/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/help/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/help/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/help/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/help/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/index.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-alert/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-alert/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-alert/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-alert/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-amps/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-amps/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-amps/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-amps/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cloud/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cloud/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cloud/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cloud/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-connections/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-connections/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-connections/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-connections/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cpu/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cpu/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cpu/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cpu/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-diskio/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-diskio/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-diskio/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-diskio/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-docker/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-docker/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-docker/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-docker/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-folders/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-folders/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-folders/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-folders/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-fs/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-fs/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-fs/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-fs/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-gpu/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-gpu/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-gpu/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-gpu/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ip/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ip/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ip/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ip/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-irq/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-irq/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-irq/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-irq/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-load/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-load/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-load/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-load/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem-more/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem-more/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem-more/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem-more/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-memswap/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-memswap/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-memswap/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-memswap/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-network/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-network/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-network/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-network/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-percpu/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-percpu/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-percpu/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-percpu/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ports/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ports/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ports/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ports/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-process/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-process/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-process/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-process/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processcount/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processcount/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processcount/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processcount/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processlist/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processlist/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processlist/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processlist/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-quicklook/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-quicklook/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-quicklook/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-quicklook/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-raid/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-raid/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-raid/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-raid/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-sensors/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-sensors/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-sensors/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-sensors/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-system/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-system/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-system/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-system/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-uptime/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-uptime/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-uptime/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-uptime/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-wifi/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-wifi/component.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-wifi/controller.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-wifi/view.html -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/directives.js +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/help.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-alert.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-amps.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cloud.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-connections.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-cpu.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-diskio.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-docker.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-folders.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-fs.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-gpu.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ip.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-irq.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-load.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem-more.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-mem.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-memswap.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-network.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-now.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-percpu.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-ports.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-process.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processcount.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-processlist.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-quicklook.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-raid.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-sensors.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-system.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-uptime.vue +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/components/plugin-wifi.vue lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/filters.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/module.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services/ -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services/favicon.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services/index.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services/plugin_helper.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services/stats.js +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/services.js +lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/js/store.js lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/package-lock.json lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/package.json lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/public/ lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/public/87708faeed9a66b0fcdb.png lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/public/favicon.ico lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/public/glances.js -lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/public/glances.map.js lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/templates/ lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/templates/index.html.tpl lib/python${MODPY_VERSION}/site-packages/glances/outputs/static/webpack.config.js