Index: head/net-mgmt/icingaweb2-module-businessprocess/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-businessprocess/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-businessprocess/Makefile	(revision 520379)
@@ -1,39 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-businessprocess
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		NLS
 
 NLS_USES=	gettext php
 NLS_USE=	php=intl
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-cube/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-cube/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-cube/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-cube
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USES=		php:web,flavors
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-director/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-director/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-director/Makefile	(revision 520379)
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-director
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.2
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		NLS
 
 NLS_USES=	gettext
 NLS_USE=	php=intl
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-elasticsearch/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-elasticsearch/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-elasticsearch/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-elasticsearch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-fileshipper/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-fileshipper/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-fileshipper/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-fileshipper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-generictts/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-generictts/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-generictts/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-generictts
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-grafana/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-grafana/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-grafana/Makefile	(revision 520379)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-grafana
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.6
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mikesch-mp
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${RM} -r ${WRKSRC}/.idea ${WRKSRC}/.github
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-graphite/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-graphite/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-graphite/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-graphite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-idoreports/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-idoreports/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-idoreports/Makefile	(revision 520379)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-idoreports
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-ipl/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-ipl/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-ipl/Makefile	(revision 520379)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-ipl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-map/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-map/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-map/Makefile	(revision 520379)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-map
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nbuchwitz
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${RM} -r ${WRKSRC}/.github
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-pdfexport/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-pdfexport/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-pdfexport/Makefile	(revision 520379)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-pdfexport
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/google-chrome|${LOCALBASE}/bin/chrome|" \
 		${WRKSRC}/library/Pdfexport/ProvidedHook/Pdfexport.php
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-reactbundle/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-reactbundle/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-reactbundle/Makefile	(revision 520379)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-reactbundle
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-reporting/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-reporting/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-reporting/Makefile	(revision 520379)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-reporting
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	lme@FreeBSD.org
 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
 
 USE_GITHUB=	yes
 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
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icingaweb2-module-vsphere/Makefile
===================================================================
--- head/net-mgmt/icingaweb2-module-vsphere/Makefile	(revision 520378)
+++ head/net-mgmt/icingaweb2-module-vsphere/Makefile	(revision 520379)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	icingaweb2-module-vsphere
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 PORTREVISION=	4
 CATEGORIES=	net-mgmt www
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>