From nobody Sat Aug 31 08:51:21 2024 X-Original-To: dev-commits-ports-main@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 4Wwpf20fBxz5Ttbt; Sat, 31 Aug 2024 08:51:22 +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 4Wwpf15MMNz4rNP; Sat, 31 Aug 2024 08:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725094281; 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=vYFTCd0n8huYABO8Ij3NM650nIzGkwq8hSNb8sFWeSc=; b=mvpPImXxRljg+lyRp67uQttYQ0uSk70AckmGVOZA2tG3Ou3cRAYWDmsRcAAhScxMf4kTS+ COYq79mqGmD7ybh4dWEUl78cqum7D2mWbCqYHbaNuYivFmCGRUVycaqmCLd6h+fRbHoTID wWFsDEPD/2gMMzfhFcjtkHU329Ecev6TbATgUk0FNS6Bfv9khAMQtrUO2pqimrl7WPKd9l 1XDP0ECYe7MIueI6eyrt6XYw1R05EbdqAe22vsW4Qrhm5GNJz2ErHtNcGSy4ySBsP2YeVj 8L2uJVA9fGLBmi+EOW9p8B0vVW7bYbY4rXGOeLgCHHk1O1dYTOwk34fXsTN7Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725094281; a=rsa-sha256; cv=none; b=GfNFqXUxuI1BalENKaabkkwVzKtpVd/84YUeg17CUroR4TCAd/TDPmeQZDBruDXBWl9WO9 Fsqxp//1zkVu2Z6V5x2ZpBeD7vIOHft3BuqWPZ/NBqquzcP0btZIg+GZ/birtXqVYZrjlS g6+9NL779uw0aUbJlgfNa/q2Hp5eO8sm39V/9gKBgjYO43E1S0PPV3FKMHiQKM3W3aFzb4 emmYRm4wPEScR1oo/0kvm8otrs+u01xI6DPYwH5NmmH/lO3e9Be8K7MVNPPjx/cRh+VweL iLgz4DqrLeTxRjVu8IorrkzAlrQRkPsrW8nBgqmnrHVzgYjGeJWYH93fYVnyLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725094281; 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=vYFTCd0n8huYABO8Ij3NM650nIzGkwq8hSNb8sFWeSc=; b=QubPxokxfpne8N7BobYMneoUDOac5npTK7POpyJBcn3XtrKpU9d0PSheMKqpxUh7O1sbEq upTnn6s7ja0cH+F8QZcjjSMyWem9zsja6GagB1YIanXP4uys3xJOPtA5YvYLzc5/Yna0L6 x7Y/a0/7MM6r+THfXQn+orAFAs1fBeBbkVFH7yaxchUYShiKbQPZH18uJj0pmBo73OZE7r BDDXLMbdSul6ynLF/7JojLWDlMGg8MSOJpMVCi1Q1rg6k7+BAUQJGLhDtlsnyhnfQkHWCR wRHeoqmiT6RGcu9dN+E2O4R/Ac7Nw4Wr31nqhtr2MBFqzn5ON9nRDQywj33D2w== 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 4Wwpf14hYmzf5l; Sat, 31 Aug 2024 08:51:21 +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 47V8pLgY031693; Sat, 31 Aug 2024 08:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47V8pLVG031690; Sat, 31 Aug 2024 08:51:21 GMT (envelope-from git) Date: Sat, 31 Aug 2024 08:51:21 GMT Message-Id: <202408310851.47V8pLVG031690@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 571995f2f678 - main - www/domoticz-devel: Improve port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 571995f2f6780ce6b4bca86b3fb711c1f626ce94 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=571995f2f6780ce6b4bca86b3fb711c1f626ce94 commit 571995f2f6780ce6b4bca86b3fb711c1f626ce94 Author: Daniel Engberg AuthorDate: 2024-08-30 22:29:13 +0000 Commit: Daniel Engberg CommitDate: 2024-08-31 08:50:47 +0000 www/domoticz-devel: Improve port * Add --no-same-owner --no-same-permissions to EXTRACT_AFTER_ARGS https://cgit.freebsd.org/ports/tree/Mk/bsd.port.mk#n705 * Rework and sort OPTIONS See https://docs.freebsd.org/en/books/porters-handbook/book/#options-cmake_bool * Remove variables in CMAKE_OFF that are already disabled by default * Remove TELLDUS which was removed in 2023 Reference: https://cgit.freebsd.org/ports/commit/?id=55660d2e5466486b38bd437a94f5ce5d089a1e2f PR: 281016 Reviewed by: Xavier Beaudouin (maintainer) --- www/domoticz-devel/Makefile | 62 +++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/www/domoticz-devel/Makefile b/www/domoticz-devel/Makefile index 72bbb6b9fc57..288235c05e30 100644 --- a/www/domoticz-devel/Makefile +++ b/www/domoticz-devel/Makefile @@ -18,54 +18,44 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ USES= cmake compiler:c++11-lang cpe lua:53 minizip pkgconfig sqlite \ ssl -CONFLICTS_INSTALL?= domoticz-[234]* +USE_GITHUB= yes +GH_TAGNAME= a580a6b1f -# Do not extract python Includes -EXTRACT_AFTER_ARGS= --exclude hardware/plugins/Include +CONFLICTS_INSTALL= domoticz-[234]* -OPTIONS_DEFINE= PRECOMP PYTHON TELLDUS -OPTIONS_DEFAULT= PRECOMP PYTHON -OPTIONS_SUB= YES -PRECOMP_DESC= Enable usage of precompiled header to speed build time -PYTHON_DESC= Enable support for Python Plugins -TELLDUS_DESC= Enable support for Telldus - -.include +EXTRACT_AFTER_ARGS= --exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/hardware/plugins/Include \ + --no-same-owner --no-same-permissions # This hack is to get rid of dependency of git while building # the package. DOMOTICZ_REL= 16186 DOMOTICZ_TS= 1724156096 -USE_GITHUB= yes -GH_TAGNAME= a580a6b1f USE_RC_SUBR= domoticz - USERS= domoticz GROUPS= domoticz -CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz -CMAKE_OFF+= GIT_SUBMODULE USE_STATIC_BOOST USE_OPENSSL_STATIC \ - USE_STATIC_BOOST USE_BUILTIN_JSONCPP USE_BUILTIN_MINIZIP \ - USE_BUILTIN_MQTT USE_STATIC_OPENZWAVE USE_BUILTIN_SQLITE \ - USE_LUA_STATIC - -.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 +CMAKE_INSTALL_PREFIX= ${PREFIX}/domoticz + +CMAKE_OFF= GIT_SUBMODULE \ + USE_BUILTIN_JSONCPP \ + USE_BUILTIN_MINIZIP \ + USE_BUILTIN_MQTT \ + USE_LUA_STATIC \ + USE_STATIC_BOOST \ + USE_STATIC_OPENZWAVE + +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 support for Python Plugins + +PYTHON_USES= python:3.9+ +PYTHON_CMAKE_BOOL= USE_PYTHON + +PRECOMP_CMAKE_BOOL= USE_PRECOMPILED_HEADER post-patch: @${REINPLACE_CMD} -e "s,\/opt,${PREFIX},g" ${WRKSRC}/CMakeLists.txt