From nobody Mon Jan 6 13:35:53 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YRZvF5Qsxz5kY7L; Mon, 06 Jan 2025 13:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRZvF3RsJz4dZp; Mon, 6 Jan 2025 13:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736170553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GIyD93yMM4xBDZoQwLMXQ3nq+mjPq1xmz4p76LuTBbE=; b=bh4VKOBIxZ+o+IOsxeU6fgnNrkozqWX5G2VqTumHvU2hE0xRPw7RylWoKZd/zpTD98txYx SDic8CgY3U93p29S2v51ccFAon00wjjWWu3YpO23UVsifyyTLW7VeKIXPG8KK8o+9Bpj9s IjO1IOek+YTnf5ewV076W6kvHqbA9PyV0BCk5rwLQTVeZzmTAsJPnY3t+g/CxfjCnw5203 Q5auAmF+4sOtELcVeUQ6pxxsgqj0zXBUJrEXwoWCEtzrYZlI03meJxl1Y3V1LOctOEE4MD Ns8Ry9anpidA8r6IiAyOmgFWtFql0ovexVOVBEEfh7JAI+sNPueKSACyTRax9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736170553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GIyD93yMM4xBDZoQwLMXQ3nq+mjPq1xmz4p76LuTBbE=; b=tbn6TGYvauoXlD7D1MNtEsmMvJCkly82No8f+K+8Plxe3xAMGGM/8a9xJK6fDKF1KbUoSf QFkiaB1OutrWrtl3rhzVDA7PFLtYjf0Pb2pfUv7ZCU6E/yNR9njy9Hx5PsuQ7BCj6CgoAB NiBBVVZ9gHD/JKJBP40pGBet+oe9+uFYHkVsfNqNEobs5N+Adzqjtt8jjKdCDPWQFVNP53 MblCfQmKwNzLRFSjW1xapd0kPow2NL6JZXs4xq3tZUhTsK72c6xI4DUvN3rIbjRK6rNtAJ nHAr9/bf7p9JO8ZWZcG7up6CDPKXnY4DNFHd/4BeWI3bbmLRh1FD3H+Clm4IrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736170553; a=rsa-sha256; cv=none; b=BUMnCFNDAtes1SlMWbd44tl0I9mw2ZTHpMrwUHrp64cb5pPRHdaCc+Nb/M1eoEOfqoxRFR VKcHR4WB15Fay5MH9r08doBfx6KYjHbgitYIbeCJbhtuohZcxZ2okqqocqM1UZIOgdB+hD hf/TvxTOj+CBeLwRgEvcxzSXdVnQnb8R4T5Z+IUyh2Mf3LouOD5VF6vmccpBZngFhcJqb2 M/m7hRELZx8F4uSoxcyz65hIlSHJPIPovMoWP5aqEr/ukFRT1Ej1QkOWVdwvarnnuvysHg FdQJBEfa+TzFByJ9c/NYF/5i6ky9lNcyMa6AeSk6y7PFKuIBFAu6kjPnrQPHPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YRZvF2zF2z9nQ; Mon, 06 Jan 2025 13:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 506DZrDa001323; Mon, 6 Jan 2025 13:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506DZrLd001320; Mon, 6 Jan 2025 13:35:53 GMT (envelope-from git) Date: Mon, 6 Jan 2025 13:35:53 GMT Message-Id: <202501061335.506DZrLd001320@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xavier Beaudouin Subject: git: 99eafb33adf2 - main - www/domoticz: Update to 2024.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kiwi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99eafb33adf2ca739f0eb23b2095a63c07e5ca39 Auto-Submitted: auto-generated The branch main has been updated by kiwi: URL: https://cgit.FreeBSD.org/ports/commit/?id=99eafb33adf2ca739f0eb23b2095a63c07e5ca39 commit 99eafb33adf2ca739f0eb23b2095a63c07e5ca39 Author: Xavier Beaudouin AuthorDate: 2024-12-31 10:22:35 +0000 Commit: Xavier Beaudouin CommitDate: 2025-01-06 13:34:24 +0000 www/domoticz: Update to 2024.7 This will update www/domoticz to 2024.7. Updated Makefile as www/domoticz-devel. Changelog between 2024.4 to 2024.7: Version 2024.7 (July 13th 2024) - Implemented: P1 Meter, Report, Header now also supports simple mode (No T1/T2/R1/R2 but just total) - Fixed: Google Cloud Messaging (GCM/FCM) possible crash when notification needed to be send Version 2024.6 (July 8th 2024) - Fixed: EventSystem, LOG_FORCE now always logged - Changed: Google Cloud Messaging (GCM) now uses the new v1 API of Google's Firebase Cloud Messaging (FCM) Version 2024.5 (July 7th 2024) - Implemented: Currency Symbol in Location Settings - Implemented: dzVents, Added historical data helper 'med' to calculate the median value - Implemented: dzVents, Improved logging - Implemented: Energy Dashboard - Implemented: Enever, Added Budget Energy and Eneco - Implemented: Enphase, Live storage data - Implemented: Enphase, Option for more Inverter details (ac/dc voltage, temperature, lastupdate) - Implemented: Event Editor, Close/Close All menu dropdown - Implemented: Event Editor, Storing/Loading opened events - Implemented: Hour chart for P1 log - Implemented: MQTT-AD Climate Fan Mode - Implemented: MQTT-AD Climate Swing Mode - Implemented: OpenWeatherMap, API 3.0 support - Implemented: P1 Meter, option to specify view (low/high tariff or simple (dynamic contract)) - Implemented: Possible to query a range of device states via JSON - Implemented: SolarEdge, polling Storage devices - Fixed: Data Pushers, Forecast for Weather Station subtypes - Fixed: Floorplan, better detection of switches - Fixed: Hardware Setup, hiding extra parameters when selecting a python plugin - Fixed: PythonEx framework, two notifications where send for switch type devices - Fixed: Python framework, custom image loading - Removed: Cereal Proxy (not used anymore) - Changed: EvoHome, now making use of general logging system - Changed: MQTT-AD, now also handles brightness scale number values as string - Changed: SBFSpot, disabled error 28 error - Changed: Selector switch now displays correct state in Data field (and devices overview) Approved by: 0mp (mentor) --- www/domoticz/Makefile | 61 ++++++++++++++++++++++---------------------------- www/domoticz/distinfo | 6 ++--- www/domoticz/pkg-plist | 6 +++++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile index d73da5a5e10d..d393b9539eb1 100644 --- a/www/domoticz/Makefile +++ b/www/domoticz/Makefile @@ -1,6 +1,5 @@ PORTNAME= domoticz -DISTVERSION= 2024.4 -PORTREVISION= 3 +DISTVERSION= 2024.7 CATEGORIES= www MAINTAINER= kiwi@FreeBSD.org @@ -15,47 +14,41 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libjsoncpp.so:devel/jsoncpp \ libmosquitto.so:net/mosquitto -BUILD_DEPENDS= cereal>=1.2.2:devel/cereal - USES= cmake compiler:c++11-lang cpe minizip pkgconfig ssl lua:53 sqlite +USE_GITHUB= yes +USE_RC_SUBR= domoticz -OPTIONS_SUB= YES -OPTIONS_DEFINE= PYTHON TELLDUS PRECOMP -OPTIONS_DEFAULT= PYTHON PRECOMP -PYTHON_DESC= Enable Python for Plugins and Event-Scripts -TELLDUS_DESC= Enable Tellstick Telldus support -PRECOMP_DESC= Enable usage of precompiled header to speed build time +CMAKE_OFF+= GIT_SUBMODULE \ + USE_STATIC_BOOST \ + USE_OPENSSL_STATIC \ + USE_STATIC_BOOST \ + USE_BUILTIN_SQLITE \ + USE_BUILTIN_MINIZIP \ + USE_BUILTIN_JSONCPP \ + USE_BUILTIN_MQTT \ + USE_STATIC_OPENZWAVE -.include +CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz -USE_GITHUB= yes +CONFLICTS_INSTALL= domoticz-devel-[234]* -USE_RC_SUBR= domoticz +EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-${PORTVERSION}/hardware/plugins/Include \ + --no-same-owner --no-same-permissions USERS= domoticz GROUPS= domoticz -CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz -CMAKE_OFF+= GIT_SUBMODULE USE_STATIC_BOOST USE_OPENSSL_STATIC USE_STATIC_BOOST \ - USE_BUILTIN_SQLITE USE_BUILTIN_MINIZIP USE_BUILTIN_JSONCPP \ - USE_BUILTIN_MQTT USE_STATIC_OPENZWAVE - -.if ${PORT_OPTIONS:MPYTHON} -CMAKE_ON+= USE_PYTHON -USES+= python:3.9+ -.else -CMAKE_OFF+= USE_PYTHON -.endif - -.if ${PORT_OPTIONS:MTELLDUS} -LIB_DEPENDS+= libtelldus-core.so:comms/telldus-core -.endif - -.if ${PORT_OPTIONS:MPRECOMP} -CMAKE_ON+= USE_PRECOMPILED_HEADER -.else -CMAKE_OFF+= USE_PRECOMPILED_HEADER -.endif +OPTIONS_DEFINE= PRECOMP PYTHON +OPTIONS_DEFAULT= PRECOMP PYTHON +OPTIONS_SUB= YES + +PRECOMP_DESC= Enable usage of precompiled header to speed build time +PYTHON_DESC= Enable Python for Plugins and Event-Scripts + +PRECOMP_CMAKE_BOOL= USE_PRECOMPILED_HEADER + +PYTHON_USES= python:3.9+ +PYTHON_CMAKE_BOOL= USE_PYTHON post-install: ${MKDIR} ${STAGEDIR}/var/db/domoticz ${STAGEDIR}/var/run/domoticz diff --git a/www/domoticz/distinfo b/www/domoticz/distinfo index 0d14e196ff67..9df59baa0be1 100644 --- a/www/domoticz/distinfo +++ b/www/domoticz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714821392 -SHA256 (domoticz-domoticz-2024.4_GH0.tar.gz) = d87113d7cacd0b52b9126fcc1ef24e140a4f7042d5bc6262e86e4b4752f5cf38 -SIZE (domoticz-domoticz-2024.4_GH0.tar.gz) = 13221980 +TIMESTAMP = 1735584809 +SHA256 (domoticz-domoticz-2024.7_GH0.tar.gz) = 6ceabbfe36ada4b7c2ebb42c523d723c87e6444b87db6bbb1703d92f38ee754d +SIZE (domoticz-domoticz-2024.7_GH0.tar.gz) = 13258596 diff --git a/www/domoticz/pkg-plist b/www/domoticz/pkg-plist index 850a65a40b8e..c21a1e3986e8 100644 --- a/www/domoticz/pkg-plist +++ b/www/domoticz/pkg-plist @@ -264,6 +264,7 @@ domoticz/scripts/templates/Device.dzVents domoticz/scripts/templates/ExecuteShellCommand.dzVents domoticz/scripts/templates/Group.dzVents domoticz/scripts/templates/HTTPRequest.dzVents +domoticz/scripts/templates/Logging.dzVents domoticz/scripts/templates/Scene.dzVents domoticz/scripts/templates/Security.Lua domoticz/scripts/templates/Security.dzVents @@ -288,6 +289,7 @@ domoticz/www/app/DPMQTTController.js domoticz/www/app/DashboardController.js domoticz/www/app/DeviceLightEdit.js domoticz/www/app/DummyController.js +domoticz/www/app/EnergyDashboardController.js domoticz/www/app/FloorplanController.js domoticz/www/app/FloorplanEditController.js domoticz/www/app/ForecastController.js @@ -402,6 +404,7 @@ domoticz/www/app/log/TextLog.js domoticz/www/app/log/chart-compare-temp.html domoticz/www/app/log/chart-compare.html domoticz/www/app/log/chart-day.html +domoticz/www/app/log/chart-hour.html domoticz/www/app/log/chart-month.html domoticz/www/app/log/chart-week.html domoticz/www/app/log/chart-year.html @@ -599,6 +602,7 @@ domoticz/www/images/Door48_Off.png domoticz/www/images/Door48_On.png domoticz/www/images/Down48.png domoticz/www/images/Down48_2.png +domoticz/www/images/EHome48.png domoticz/www/images/Fan48_Off.png domoticz/www/images/Fan48_On.png domoticz/www/images/Fireplace.png @@ -735,6 +739,7 @@ domoticz/www/images/doorbell48.png domoticz/www/images/down.png domoticz/www/images/edit.png domoticz/www/images/empty16.png +domoticz/www/images/energy.png domoticz/www/images/equal.png domoticz/www/images/events.png domoticz/www/images/evohome/Auto.png @@ -1138,6 +1143,7 @@ domoticz/www/views/dpgooglepubsub.html domoticz/www/views/dphttp.html domoticz/www/views/dpinflux.html domoticz/www/views/dpmqtt.html +domoticz/www/views/energy_dashboard.html domoticz/www/views/floorplanedit.html domoticz/www/views/floorplans.html domoticz/www/views/forecast.html