15 files changed, 21 insertions, 21 deletions

diff --git a/net-mgmt/icingaweb2-module-businessprocess/Makefile b/net-mgmt/icingaweb2-module-businessprocess/Makefile
index 86dc9a31fdc0..0e3fb34dffc7 100644
--- a/net-mgmt/icingaweb2-module-businessprocess/Makefile
+++ b/net-mgmt/icingaweb2-module-businessprocess/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Manage Business Processes in Icinga Web 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
-		icingaweb2-module-ipl-${PHP_FLAVOR}>=0.1.1:net-mgmt/icingaweb2-module-ipl@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
+		icingaweb2-module-ipl${PHP_PKGNAMESUFFIX}>=0.1.1:net-mgmt/icingaweb2-module-ipl@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-cube/Makefile b/net-mgmt/icingaweb2-module-cube/Makefile
index fd9c0d7dbbd7..cea0ca309f3f 100644
--- a/net-mgmt/icingaweb2-module-cube/Makefile
+++ b/net-mgmt/icingaweb2-module-cube/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Drill-down view for Icinga web 2 based on custom variables
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
diff --git a/net-mgmt/icingaweb2-module-director/Makefile b/net-mgmt/icingaweb2-module-director/Makefile
index 8da81cfa3486..59413326c336 100644
--- a/net-mgmt/icingaweb2-module-director/Makefile
+++ b/net-mgmt/icingaweb2-module-director/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Configuration frontend for Icinga 2, integrated automation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-elasticsearch/Makefile b/net-mgmt/icingaweb2-module-elasticsearch/Makefile
index d3e7d2d40336..a29a4a3f2732 100644
--- a/net-mgmt/icingaweb2-module-elasticsearch/Makefile
+++ b/net-mgmt/icingaweb2-module-elasticsearch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Integrate Elasticsearch into Icinga Web 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.2:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.2:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-fileshipper/Makefile b/net-mgmt/icingaweb2-module-fileshipper/Makefile
index 5c09766175f6..2e95bada912f 100644
--- a/net-mgmt/icingaweb2-module-fileshipper/Makefile
+++ b/net-mgmt/icingaweb2-module-fileshipper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Import CSV, JSON, XML and YAML files for the Icinga Director
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-generictts/Makefile b/net-mgmt/icingaweb2-module-generictts/Makefile
index 98aa2e87f6e5..450b06e83369 100644
--- a/net-mgmt/icingaweb2-module-generictts/Makefile
+++ b/net-mgmt/icingaweb2-module-generictts/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generic ticket system integration into Icinga web 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-grafana/Makefile b/net-mgmt/icingaweb2-module-grafana/Makefile
index c79ea8f32926..7359603b3c94 100644
--- a/net-mgmt/icingaweb2-module-grafana/Makefile
+++ b/net-mgmt/icingaweb2-module-grafana/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Add Grafana graphs into Icinga Web 2 to display performance metrics
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-graphite/Makefile b/net-mgmt/icingaweb2-module-graphite/Makefile
index 652659516c90..b4e36cde74ed 100644
--- a/net-mgmt/icingaweb2-module-graphite/Makefile
+++ b/net-mgmt/icingaweb2-module-graphite/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graphite integration into Icinga Web 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.5.0:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.5.0:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-idoreports/Makefile b/net-mgmt/icingaweb2-module-idoreports/Makefile
index 0be54bffc246..7594a10d5027 100644
--- a/net-mgmt/icingaweb2-module-idoreports/Makefile
+++ b/net-mgmt/icingaweb2-module-idoreports/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Host and service availability reports for Icinga
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.6.0:net-mgmt/icingaweb2@${PHP_FLAVOR} \
-		icingaweb2-module-reporting-${PHP_FLAVOR}>=0.9:net-mgmt/icingaweb2-module-reporting@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.6.0:net-mgmt/icingaweb2@${PHP_FLAVOR} \
+		icingaweb2-module-reporting${PHP_PKGNAMESUFFIX}>=0.9:net-mgmt/icingaweb2-module-reporting@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-ipl/Makefile b/net-mgmt/icingaweb2-module-ipl/Makefile
index ab423b01ae67..06e9307c19e1 100644
--- a/net-mgmt/icingaweb2-module-ipl/Makefile
+++ b/net-mgmt/icingaweb2-module-ipl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Icinga PHP library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-map/Makefile b/net-mgmt/icingaweb2-module-map/Makefile
index 2d6daebec93d..ba5572a133ae 100644
--- a/net-mgmt/icingaweb2-module-map/Makefile
+++ b/net-mgmt/icingaweb2-module-map/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Display hosts on OpenStreetMap
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-pdfexport/Makefile b/net-mgmt/icingaweb2-module-pdfexport/Makefile
index 4a0587ffd445..822ee6312d04 100644
--- a/net-mgmt/icingaweb2-module-pdfexport/Makefile
+++ b/net-mgmt/icingaweb2-module-pdfexport/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Icinga PDF Export
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
 		chromium>0:www/chromium
 
 USES=		php:web,flavors
diff --git a/net-mgmt/icingaweb2-module-reactbundle/Makefile b/net-mgmt/icingaweb2-module-reactbundle/Makefile
index 09feb5e35f6e..ec34045d9627 100644
--- a/net-mgmt/icingaweb2-module-reactbundle/Makefile
+++ b/net-mgmt/icingaweb2-module-reactbundle/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Icinga Web 2 ReactPHP-based 3rd party libraries
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
diff --git a/net-mgmt/icingaweb2-module-reporting/Makefile b/net-mgmt/icingaweb2-module-reporting/Makefile
index 13d34f3104ad..3fadb3cc58df 100644
--- a/net-mgmt/icingaweb2-module-reporting/Makefile
+++ b/net-mgmt/icingaweb2-module-reporting/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Reporting module for Icinga Web 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.6.0:net-mgmt/icingaweb2@${PHP_FLAVOR} \
-		icingaweb2-module-reactbundle-${PHP_FLAVOR}>=0.4:net-mgmt/icingaweb2-module-reactbundle@${PHP_FLAVOR} \
-		icingaweb2-module-ipl-${PHP_FLAVOR}>=0.2.1:net-mgmt/icingaweb2-module-ipl@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.6.0:net-mgmt/icingaweb2@${PHP_FLAVOR} \
+		icingaweb2-module-reactbundle${PHP_PKGNAMESUFFIX}>=0.4:net-mgmt/icingaweb2-module-reactbundle@${PHP_FLAVOR} \
+		icingaweb2-module-ipl${PHP_PKGNAMESUFFIX}>=0.2.1:net-mgmt/icingaweb2-module-ipl@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
@@ -25,7 +25,7 @@ GH_ACCOUNT=	icinga
 OPTIONS_DEFINE=		PDF
 PDF_DESC=		Use Chromium to export PDFs
 OPTIONS_DEFAULT=	PDF
-PDF_RUN_DEPENDS=	icingaweb2-module-pdfexport-${PHP_FLAVOR}>=0.9:net-mgmt/icingaweb2-module-pdfexport@${PHP_FLAVOR}
+PDF_RUN_DEPENDS=	icingaweb2-module-pdfexport${PHP_PKGNAMESUFFIX}>=0.9:net-mgmt/icingaweb2-module-pdfexport@${PHP_FLAVOR}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/net-mgmt/icingaweb2-module-vsphere/Makefile b/net-mgmt/icingaweb2-module-vsphere/Makefile
index 9456c9fa778d..4dc839fecdcb 100644
--- a/net-mgmt/icingaweb2-module-vsphere/Makefile
+++ b/net-mgmt/icingaweb2-module-vsphere/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Automated import of your VMs and Physical Host from VMware Sphere
 
-RUN_DEPENDS=	icingaweb2-${PHP_FLAVOR}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
-		icingaweb2-module-director-${PHP_FLAVOR}>=1.6.2:net-mgmt/icingaweb2-module-director@${PHP_FLAVOR}
+RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
+		icingaweb2-module-director${PHP_PKGNAMESUFFIX}>=1.6.2:net-mgmt/icingaweb2-module-director@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 USE_PHP=	posix soap