pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix50-server: Fix PLIST



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Tue Aug 18 16:59:01 2020 +0000
Changeset:	ae87facfd4365678b780e547f114e77544afc7dc

Modified Files:
	zabbix50-server/Makefile
	zabbix50-server/PLIST
	zabbix50-server/options.mk

Log Message:
zabbix50-server: Fix PLIST

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ae87facfd4365678b780e547f114e77544afc7dc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zabbix50-server/Makefile   |  3 +++
 zabbix50-server/PLIST      |  2 +-
 zabbix50-server/options.mk | 13 ++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs:
diff --git a/zabbix50-server/Makefile b/zabbix50-server/Makefile
index 68bbb6fd7e..46ac013e75 100644
--- a/zabbix50-server/Makefile
+++ b/zabbix50-server/Makefile
@@ -5,6 +5,9 @@
 PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	Enterprise-class Monitoring Solution for Everyone
 
+CONFLICTS+=     zabbix-server-[3-4]*
+CONFLICTS+=     zabbix-proxy-*
+
 DEPENDS+=	fping-[0-9]*:../../net/fping
 
 USE_TOOLS+=		pax pkg-config
diff --git a/zabbix50-server/PLIST b/zabbix50-server/PLIST
index 6e7b024066..33f9b829a4 100644
--- a/zabbix50-server/PLIST
+++ b/zabbix50-server/PLIST
@@ -7,7 +7,7 @@ share/zabbix/data.sql
 share/zabbix/double.sql
 share/zabbix/images.sql
 share/zabbix/schema.sql
-share/zabbix/timescaledb.sql
+${PLIST.pgsql}share/zabbix/timescaledb.sql
 @pkgdir share/zabbix/externalscripts
 @pkgdir share/zabbix/alertscripts
 @pkgdir lib/modules
diff --git a/zabbix50-server/options.mk b/zabbix50-server/options.mk
index 5a6e484f5e..c048b7847b 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 sqlite3
+PKG_OPTIONS_GROUP.database=	mysql pgsql 
 PKG_SUGGESTED_OPTIONS+=		libssh snmp pgsql
 
 .if empty(MISSING_FEATURES:Minet6)
@@ -12,6 +12,9 @@ PKG_SUGGESTED_OPTIONS+=		inet6
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		mysql
+PLIST_VARS+=		pgsql
+
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
@@ -30,6 +33,7 @@ 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)
@@ -41,10 +45,5 @@ CONFIGURE_ARGS+=	--with-net-snmp
 CONFIGURE_ARGS+=	--with-postgresql
 .include "../../mk/pgsql.buildlink3.mk"
 ZABBIX_DB_TYPE=		postgresql
-.endif
-
-.if !empty(PKG_OPTIONS:Msqlite3)
-CONFIGURE_ARGS+=	--with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
-.include "../../databases/sqlite3/buildlink3.mk"
-ZABBIX_DB_TYPE=		sqlite3
+PLIST.pgsql=		yes
 .endif


Home | Main Index | Thread Index | Old Index