Page MenuHomeFreeBSD

D48266.diff
No OneTemporary

D48266.diff

diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile
--- 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 @@
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 <bsd.port.options.mk>
+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
--- 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
--- a/www/domoticz/pkg-plist
+++ b/www/domoticz/pkg-plist
@@ -264,6 +264,7 @@
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/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/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_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/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/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

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 4:36 PM (11 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16032086
Default Alt Text
D48266.diff (4 KB)

Event Timeline