pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zabbix50-server: Fix pkglint warnings
Module Name: pkgsrc-wip
Committed By: Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By: otis
Date: Tue Aug 18 21:37:12 2020 +0000
Changeset: 7f5ef15f9b224a23de610a8ff1af12ad04db6955
Modified Files:
zabbix50-server/Makefile
zabbix50-server/options.mk
Log Message:
zabbix50-server: Fix pkglint warnings
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7f5ef15f9b224a23de610a8ff1af12ad04db6955
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zabbix50-server/Makefile | 4 ++--
zabbix50-server/options.mk | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diffs:
diff --git a/zabbix50-server/Makefile b/zabbix50-server/Makefile
index 46ac013e75..dade43c02f 100644
--- a/zabbix50-server/Makefile
+++ b/zabbix50-server/Makefile
@@ -5,8 +5,8 @@
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= Enterprise-class Monitoring Solution for Everyone
-CONFLICTS+= zabbix-server-[3-4]*
-CONFLICTS+= zabbix-proxy-*
+CONFLICTS+= zabbix-server-[3-4]*
+CONFLICTS+= zabbix-proxy-[0-9]*
DEPENDS+= fping-[0-9]*:../../net/fping
diff --git a/zabbix50-server/options.mk b/zabbix50-server/options.mk
index c048b7847b..f1966a8cbe 100644
--- a/zabbix50-server/options.mk
+++ b/zabbix50-server/options.mk
@@ -3,7 +3,7 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix50-server
PKG_SUPPORTED_OPTIONS+= inet6 libssh libssh2 snmp
PKG_OPTIONS_OPTIONAL_GROUPS= database
-PKG_OPTIONS_GROUP.database= mysql pgsql
+PKG_OPTIONS_GROUP.database= mysql pgsql
PKG_SUGGESTED_OPTIONS+= libssh snmp pgsql
.if empty(MISSING_FEATURES:Minet6)
@@ -12,7 +12,6 @@ PKG_SUGGESTED_OPTIONS+= inet6
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= mysql
PLIST_VARS+= pgsql
.if !empty(PKG_OPTIONS:Minet6)
@@ -33,7 +32,6 @@ CONFIGURE_ARGS+= --with-ssh=${BUILDLINK_PREFIX.libssh}
CONFIGURE_ARGS+= --with-mysql
.include "../../mk/mysql.buildlink3.mk"
ZABBIX_DB_TYPE= mysql
-PLIST.mysql= yes
.endif
.if !empty(PKG_OPTIONS:Msnmp)
Home |
Main Index |
Thread Index |
Old Index