Attachment 210021 Details for Bug 242664 – fix ${PHP_PKGNAMESUFFIX} in dependency

[patch] fix ${PHP_PKGNAMESUFFIX} in dependency

icingaweb2.diff (text/plain), 9.07 KB, created by Dima Panov on 2019-12-18 02:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2019-12-18 02:35:01 UTC

Size: 9.07 KB

patch

obsolete

>Index: net-mgmt/icingaweb2-module-businessprocess/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-businessprocess/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-businessprocess/Makefile	(working copy)
>@@ -13,8 +13,8 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-cube/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-cube/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-cube/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
>Index: net-mgmt/icingaweb2-module-director/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-director/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-director/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-elasticsearch/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-elasticsearch/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-elasticsearch/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-fileshipper/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-fileshipper/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-fileshipper/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-generictts/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-generictts/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-generictts/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-grafana/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-grafana/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-grafana/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-graphite/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-graphite/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-graphite/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-idoreports/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-idoreports/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-idoreports/Makefile	(working copy)
>@@ -13,8 +13,8 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-ipl/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-ipl/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-ipl/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-map/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-map/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-map/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-pdfexport/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-pdfexport/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-pdfexport/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 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
>Index: net-mgmt/icingaweb2-module-reactbundle/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-reactbundle/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-reactbundle/Makefile	(working copy)
>@@ -10,7 +10,7 @@
> 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
> 
>Index: net-mgmt/icingaweb2-module-reporting/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-reporting/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-reporting/Makefile	(working copy)
>@@ -13,9 +13,9 @@
> 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 @@
> 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
>Index: net-mgmt/icingaweb2-module-vsphere/Makefile
>===================================================================
>--- net-mgmt/icingaweb2-module-vsphere/Makefile	(revision 520355)
>+++ net-mgmt/icingaweb2-module-vsphere/Makefile	(working copy)
>@@ -10,8 +10,8 @@
> 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

Actions: View | Diff

Attachments on bug 242664: 209994 | 210021