Index: head/www/domoticz/Makefile =================================================================== --- head/www/domoticz/Makefile (revision 510731) +++ head/www/domoticz/Makefile (revision 510732) @@ -1,118 +1,112 @@ # $FreeBSD$ PORTNAME= domoticz PORTVERSION= 4.${DOMOTICZ_REL} -PORTREVISION= 6 CATEGORIES= www -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 9d226dab339f.patch:-p1 - MAINTAINER= kiwi@oav.net COMMENT= Home Automation System LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/License.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 CONFLICTS_INSTALL?= domoticz-[23]* domoticz-devel-* OPTIONS_SUB= YES OPTIONS_DEFINE= PYTHON SBOOST SLUA SMINIZIP SMQTT SSQLITE SSSL TELLDUS SBOOST_DESC= Use static Boost instead of dynamic linking SSSL_DESC= Use static OpenSSL library instead of dynamic linking SLUA_DESC= Use domoticz provided LUA instead of ports one SMQTT_DESC= Use domoticz mosquitto instead of ports one SSQLITE_DESC= Use domoticz SQLLite instead of ports one SMINIZIP_DESC= Use domoticz minizip instead of ports one PYTHON_DESC= Enable support for Python Plugins TELLDUS_DESC= Enable support for Telldus .include USES= cmake compiler:c++11-lang iconv pkgconfig ssl # This hack is to get rid of dependency of git while building # the package. -DOMOTICZ_REL= 9700 -DOMOTICZ_TS= 1529904511 +DOMOTICZ_REL= 10717 +DOMOTICZ_TS= 1565707487 USE_GITHUB= yes -GH_ACCOUNT= domoticz -GH_PROJECT= domoticz USE_RC_SUBR= domoticz USERS= domoticz GROUPS= domoticz CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/domoticz \ -DUSE_BUILTIN_ZLIB="NO" \ -DUSE_STATIC_OPENZWAVE="NO" .if ${PORT_OPTIONS:MSSSL} CMAKE_ARGS+= -DUSE_OPENSSL_STATIC="YES" .else CMAKE_ARGS+= -DUSE_OPENSSL_STATIC="NO" .endif .if ${PORT_OPTIONS:MSBOOST} CMAKE_ARGS+= -DUSE_STATIC_BOOST="YES" BUILD_DEPENDS+= boost-libs>=0:devel/boost-libs .else CMAKE_ARGS+= -DUSE_STATIC_BOOST="NO" LIB_DEPENDS+= libboost_system.so:devel/boost-libs .endif .if ${PORT_OPTIONS:MSLUA} CMAKE_ARGS+= -DUSE_BUILTIN_LUA="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_LUA="NO" USES+= lua:52 .endif .if ${PORT_OPTIONS:MSMQTT} CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="NO" LIB_DEPENDS+= libmosquitto.so:net/mosquitto .endif .if ${PORT_OPTIONS:MSSQLITE} CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="NO" USES+= sqlite .endif .if ${PORT_OPTIONS:MSMINIZIP} CMAKE_ARGS+= -DUSE_BUILTIN_MINIZIP="YES" .else CMAKE_ARGS+= -DUSE_BUILTIN_MINIZIP="NO" LIB_DEPENDS+= libminizip.so:archivers/minizip .endif .if ${PORT_OPTIONS:MPYTHON} CMAKE_ARGS+= -DUSE_PYTHON="YES" -USES+= python:3.4 +USES+= python:3.6 .else CMAKE_ARGS+= -DUSE_PYTHON="NO" .endif .if ${PORT_OPTIONS:MTELLDUS} LIB_DEPENDS+= libtelldus-core.so:comms/telldus-core .endif post-patch: @${REINPLACE_CMD} -e "s,\/opt,${PREFIX},g" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "/^ADD_PRECOMPILED_HEADER/ d" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "s/\(#define APPVERSION\)\(.*\)/\1 ${DOMOTICZ_REL}/" ${WRKSRC}/appversion.default - @${REINPLACE_CMD} -e "s/\(#define APPHASH\)\(.*\)/\1 \"27772d9f\"/" ${WRKSRC}/appversion.default + @${REINPLACE_CMD} -e "s/\(#define APPHASH\)\(.*\)/\1 \"be79a17\"/" ${WRKSRC}/appversion.default @${REINPLACE_CMD} -e "s/\(#define APPDATE\)\(.*\)/\1 ${DOMOTICZ_TS}/" ${WRKSRC}/appversion.default post-install: @${MKDIR} ${STAGEDIR}/var/db/domoticz ${STAGEDIR}/var/run/domoticz .include Index: head/www/domoticz/distinfo =================================================================== --- head/www/domoticz/distinfo (revision 510731) +++ head/www/domoticz/distinfo (revision 510732) @@ -1,5 +1,3 @@ -TIMESTAMP = 1529917548 -SHA256 (domoticz-domoticz-4.9700_GH0.tar.gz) = c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 -SIZE (domoticz-domoticz-4.9700_GH0.tar.gz) = 37443519 -SHA256 (9d226dab339f.patch) = cd9b13d1a81b1c5fa60dab26fb01ceda1b32a4806bcfa37b88bddde7aad73aa2 -SIZE (9d226dab339f.patch) = 2190 +TIMESTAMP = 1565790643 +SHA256 (domoticz-domoticz-4.10717_GH0.tar.gz) = c053a2161942529f56b748945ec297dcd67f449e68029fc886893a528891ad86 +SIZE (domoticz-domoticz-4.10717_GH0.tar.gz) = 38159517 Index: head/www/domoticz/files/patch-hardware_plugins_DelayedLink.h =================================================================== --- head/www/domoticz/files/patch-hardware_plugins_DelayedLink.h (revision 510731) +++ head/www/domoticz/files/patch-hardware_plugins_DelayedLink.h (nonexistent) @@ -1,15 +0,0 @@ ---- hardware/plugins/DelayedLink.h.orig 2018-06-23 14:18:06 UTC -+++ hardware/plugins/DelayedLink.h -@@ -143,6 +143,12 @@ namespace Plugins { - if (!shared_lib_) FindLibrary("python3.6", true); - if (!shared_lib_) FindLibrary("python3.5", true); - if (!shared_lib_) FindLibrary("python3.4", true); -+#ifdef __FreeBSD__ -+ if (!shared_lib_) FindLibrary("python3.7m", true); -+ if (!shared_lib_) FindLibrary("python3.6m", true); -+ if (!shared_lib_) FindLibrary("python3.5m", true); -+ if (!shared_lib_) FindLibrary("python3.4m", true); -+#endif /* FreeBSD */ - #endif - if (shared_lib_) - { Property changes on: head/www/domoticz/files/patch-hardware_plugins_DelayedLink.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/domoticz/pkg-message =================================================================== --- head/www/domoticz/pkg-message (revision 510731) +++ head/www/domoticz/pkg-message (revision 510732) @@ -1,19 +1,21 @@ [ { type: install message: <