Attachment 168239 Details for Bug 208025 – zabbix CONFLICTS patch

[patch] zabbix CONFLICTS patch

zabbix.diff (text/plain), 2.53 KB, created by Mark Felder on 2016-03-15 14:24:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2016-03-15 14:24:11 UTC

Size: 2.53 KB

patch

obsolete

>Index: net-mgmt/zabbix2-server/Makefile
>===================================================================
>--- net-mgmt/zabbix2-server/Makefile	(revision 411162)
>+++ net-mgmt/zabbix2-server/Makefile	(working copy)
>@@ -14,14 +14,10 @@
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	${PKGBASE}-1.[0-8]*
>+CONFLICTS=	zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
> 
> IGNORE_WITH_MYSQL=	41
> 
>-.if ${PKGNAMESUFFIX} != "-agent"
>-CONFLICTS+=	${PORTNAME}-1.[0-8]*
>-.endif
>-
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
>Index: net-mgmt/zabbix22-server/Makefile
>===================================================================
>--- net-mgmt/zabbix22-server/Makefile	(revision 411162)
>+++ net-mgmt/zabbix22-server/Makefile	(working copy)
>@@ -13,15 +13,11 @@
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	${PKGBASE}-1.[0-8]*
>+CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
> 
> IGNORE_WITH_PHP=	52
> IGNORE_WITH_MYSQL=	41
> 
>-.if ${PKGNAMESUFFIX} != "-agent"
>-CONFLICTS+=	${PORTNAME}-1.[0-8]*
>-.endif
>-
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
>Index: net-mgmt/zabbix24-server/Makefile
>===================================================================
>--- net-mgmt/zabbix24-server/Makefile	(revision 411162)
>+++ net-mgmt/zabbix24-server/Makefile	(working copy)
>@@ -14,15 +14,11 @@
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	${PKGBASE}-1.[0-8]*
>+CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
> 
> IGNORE_WITH_PHP=	52
> IGNORE_WITH_MYSQL=	41
> 
>-.if ${PKGNAMESUFFIX} != "-agent"
>-CONFLICTS+=	${PORTNAME}-1.[0-8]*
>-.endif
>-
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
>Index: net-mgmt/zabbix3-server/Makefile
>===================================================================
>--- net-mgmt/zabbix3-server/Makefile	(revision 411162)
>+++ net-mgmt/zabbix3-server/Makefile	(working copy)
>@@ -14,15 +14,11 @@
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	${PKGBASE}-1.[0-8]*
>+CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]*
> 
> IGNORE_WITH_PHP=	52
> IGNORE_WITH_MYSQL=	41
> 
>-.if ${PKGNAMESUFFIX} != "-agent"
>-CONFLICTS+=	${PORTNAME}-1.[0-8]*
>-.endif
>-
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings

Actions: View | Diff

Attachments on bug 208025: 168239