From 885a1fb079c0df190257e35ba1e6e543a73e142c Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Wed, 18 Jan 2023 22:23:07 +0100 Subject: [PATCH 3/8] net-mgmt/icinga-php-thirdparty: Fix install path and dependencies Libraries should be installed in one of the Library paths not in the module path. With newer icingaweb2 versions there will be errors about non compozerized modules if the libraries are installed in the modules directory. Fix dependencies, icingaweb2 depends on icinga-php-library not the other way around. Fix portlintwarnings in pkg-descr --- net-mgmt/icinga-php-thirdparty/Makefile | 4 +--- net-mgmt/icinga-php-thirdparty/pkg-descr | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net-mgmt/icinga-php-thirdparty/Makefile b/net-mgmt/icinga-php-thirdparty/Makefile index eb66161c2149..510d7ca463bd 100644 --- a/net-mgmt/icinga-php-thirdparty/Makefile +++ b/net-mgmt/icinga-php-thirdparty/Makefile @@ -11,8 +11,6 @@ WWW= https://github.com/Icinga/icinga-php-thirdparty LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} - USES= php:web,flavors USE_GITHUB= yes @@ -21,7 +19,7 @@ GH_ACCOUNT= icinga NO_BUILD= yes NO_ARCH= yes -WWWDIR?= ${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//} +WWWDIR?= ${PREFIX}/www/icingaweb2/icinga-php/${PORTNAME:C/^.*-//} do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/net-mgmt/icinga-php-thirdparty/pkg-descr b/net-mgmt/icinga-php-thirdparty/pkg-descr index fbf8ae62eca4..60d1d94334b3 100644 --- a/net-mgmt/icinga-php-thirdparty/pkg-descr +++ b/net-mgmt/icinga-php-thirdparty/pkg-descr @@ -1,2 +1,2 @@ -This project bundles all 3rd party PHP libraries used by Icinga Web products into one piece, -which can be integrated as library into Icinga Web 2. +This project bundles all 3rd party PHP libraries used by Icinga Web products +into one piece, which can be integrated as library into Icinga Web 2. -- 2.39.0